[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 88ee58f9dc8b9df1dee756e5bc894a4088ec2c91
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 07:03:14 2010 +0000

    Unreviewed rolling out r63947 and r63948, because they broke Qt Windows build.
    
    * jit/JITStubs.cpp:
    * jit/JITStubs.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63954 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4ca3e9e..e0cd2cb 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-22  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed rolling out r63947 and r63948, because they broke Qt Windows build.
+
+        * jit/JITStubs.cpp:
+        * jit/JITStubs.h:
+
 2010-07-22  Gavin Barraclough  <barraclough at apple.com>
 
         Eeeep! r63947 hosed all non-x86 builds!
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index c257c1f..f088b6e 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -79,10 +79,8 @@ namespace JSC {
 
 #if OS(LINUX) && CPU(X86_64)
 #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
-#elif OS(DARWIN)
-#define SYMBOL_STRING_RELOCATION(name) "_" #name
 #else
-#define SYMBOL_STRING_RELOCATION(name) #name
+#define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name)
 #endif
 
 #if OS(DARWIN)
diff --git a/JavaScriptCore/jit/JITStubs.h b/JavaScriptCore/jit/JITStubs.h
index f836041..ba9e15f 100644
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@ -228,16 +228,12 @@ namespace JSC {
 #define STUB_ARGS_DECLARATION void** args
 #define STUB_ARGS (args)
 
-#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
+#if CPU(X86) && COMPILER(MSVC)
+#define JIT_STUB __fastcall
+#elif CPU(X86) && COMPILER(GCC) && !OS(WINDOWS)
+#define JIT_STUB  __attribute__ ((fastcall))
 #else
-    #define JIT_STUB
+#define JIT_STUB
 #endif
 
     extern "C" void ctiVMThrowTrampoline();

-- 
WebKit Debian packaging