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

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b941c822ca53c086f7e84170c84b36e6c925988d
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 03:28:34 2010 +0000

    Bug 42818 - [Qt] REGRESSION(63348): jsc is broken
    Speculative fix, need fastcall conventions on Qt/Win.
    
    Reviewed by Oliver Hunt.
    
    * jit/JITStubs.cpp:
    * jit/JITStubs.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ec8ef8a..b854377 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-22  Gavin Barraclough  <barraclough at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Bug 42818 - [Qt] REGRESSION(63348): jsc is broken
+        Speculative fix, need fastcall conventions on Qt/Win.
+
+        * jit/JITStubs.cpp:
+        * jit/JITStubs.h:
+
 2010-07-22  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index f088b6e..c257c1f 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -79,8 +79,10 @@ 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) SYMBOL_STRING(name)
+#define SYMBOL_STRING_RELOCATION(name) #name
 #endif
 
 #if OS(DARWIN)
diff --git a/JavaScriptCore/jit/JITStubs.h b/JavaScriptCore/jit/JITStubs.h
index ba9e15f..6f70660 100644
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@ -228,12 +228,14 @@ namespace JSC {
 #define STUB_ARGS_DECLARATION void** args
 #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))
-#else
-#define JIT_STUB
+#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
 #endif
 
     extern "C" void ctiVMThrowTrampoline();

-- 
WebKit Debian packaging