Changeset 84048 in webkit

Timestamp:

Apr 15, 2011 4:35:48 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-15 Fridrich Strba <​fridrich.strba@bluewin.ch>

Reviewed by Gavin Barraclough.

Correctly prefix symbols. Since gcc 4.5.0, Windows x64 symbols
are not prefixed by underscore anymore. This is consistent with
what MSVC does.
​https://bugs.webkit.org/show_bug.cgi?id=58573

• jit/JITStubs.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITStubs.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-15  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Gavin Barraclough.
+
+        Correctly prefix symbols. Since gcc 4.5.0, Windows x64 symbols
+        are not prefixed by underscore anymore. This is consistent with
+        what MSVC does.
+        https://bugs.webkit.org/show_bug.cgi?id=58573
+
+        * jit/JITStubs.cpp:
+
 2011-04-15  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -68 +68 @@
 namespace JSC {
 
-#if OS(DARWIN) || OS(WINDOWS)
+#if OS(DARWIN) || (OS(WINDOWS) && CPU(X86))
 #define SYMBOL_STRING(name) "_" #name
 #else
@@ -82 +82 @@
 #if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
 #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
-#elif OS(DARWIN)
+#elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
 #define SYMBOL_STRING_RELOCATION(name) "_" #name
 #elif CPU(X86) && COMPILER(MINGW)