[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

paroga at webkit.org paroga at webkit.org
Sun Feb 20 23:48:45 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 9bff4bef433d68de3d0f26baa7a224e8bbefe9cf
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 16:48:44 2011 +0000

    2011-01-25  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Add missing defines for COMPILER(RVCT) && CPU(ARM_THUMB2)
            https://bugs.webkit.org/show_bug.cgi?id=52949
    
            * jit/JITStubs.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index a7f05f4..858b096 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-25  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Add missing defines for COMPILER(RVCT) && CPU(ARM_THUMB2)
+        https://bugs.webkit.org/show_bug.cgi?id=52949
+
+        * jit/JITStubs.cpp:
+
 2011-01-24  Adam Roben  <aroben at apple.com>
 
         Windows Production build fix
diff --git a/Source/JavaScriptCore/jit/JITStubs.cpp b/Source/JavaScriptCore/jit/JITStubs.cpp
index 408556b..f521aa5 100644
--- a/Source/JavaScriptCore/jit/JITStubs.cpp
+++ b/Source/JavaScriptCore/jit/JITStubs.cpp
@@ -221,7 +221,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
     "ret" "\n"
 );
 
-#elif COMPILER(GCC) && CPU(ARM_THUMB2)
+#elif (COMPILER(GCC) || COMPILER(RVCT)) && CPU(ARM_THUMB2)
 
 #define THUNK_RETURN_ADDRESS_OFFSET      0x38
 #define PRESERVED_RETURN_ADDRESS_OFFSET  0x3C

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list