Changeset 67062 in webkit

Timestamp:

Sep 8, 2010 10:35:29 PM (14 years ago)

Author:

Csaba Osztrogonác

Message:

2010-09-08 Csaba Osztrogonác <Csaba Osztrogonác>

Reviewed by Oliver Hunt.

[Qt] REGRESSION(63348): jsc is broken
​https://bugs.webkit.org/show_bug.cgi?id=42818

Need fastcall conventions on Qt/Win/MinGW.
Based on patches of Gavin Barraclough: r63947 and r63948.

• jit/JITStubs.cpp:
• jit/JITStubs.h:

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-09-08  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        [Qt] REGRESSION(63348): jsc is broken
+        https://bugs.webkit.org/show_bug.cgi?id=42818
+
+        Need fastcall conventions on Qt/Win/MinGW.
+        Based on patches of Gavin Barraclough: r63947 and r63948.
+
+        * jit/JITStubs.cpp:
+        * jit/JITStubs.h:
+
 2010-09-08  Robert Hogan  <robert@webkit.org>
 

trunk/JavaScriptCore/jit/JITStubs.cpp

@@ -81 +81 @@
 #if OS(LINUX) && CPU(X86_64)
 #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
+#elif OS(DARWIN)
+#define SYMBOL_STRING_RELOCATION(name) "_" #name
+#elif CPU(X86) && COMPILER(MINGW)
+#define SYMBOL_STRING_RELOCATION(name) "@" #name "@4"
 #else
-#define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name)
+#define SYMBOL_STRING_RELOCATION(name) #name
 #endif
 

trunk/JavaScriptCore/jit/JITStubs.h

@@ -240 +240 @@
 #define STUB_ARGS (args)
 
-#if CPU(X86) && COMPILER(MSVC)
-#define JIT_STUB __fastcall
-#elif CPU(X86) && COMPILER(GCC) && !OS(WINDOWS)
-#define JIT_STUB  __attribute__ ((fastcall))
+#if CPU(X86)
+    #if COMPILER(MSVC)
+    #define JIT_STUB __fastcall
+    #elif COMPILER(GCC)
+    #define JIT_STUB  __attribute__ ((fastcall))
+    #else
+    #error "JIT_STUB function calls require fastcall conventions on x86, add appropriate directive/attribute here for your compiler!"
+    #endif
 #else
-#define JIT_STUB
+    #define JIT_STUB
 #endif