[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-34-g43a6bb2

[Gustavo Noronha Silva]

The following commit has been merged in the webkit-1.1 branch:
commit 91c1cfc73e3f6eaf57805def0185d32e62bb02b3
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 06:10:59 2009 +0000

    2009-09-24  Gabor Loki  <loki at inf.u-szeged.hu>
    
            Reviewed by Gavin Barraclough.
    
            Avoid __clear_cache built-in function if DISABLE_BUILTIN_CLEAR_CACHE define is set
            https://bugs.webkit.org/show_bug.cgi?id=28886
    
            There are some GCC packages (for example GCC-2006q3 from CodeSourcery)
            which contain __clear_cache built-in function only for C while the C++
            version of __clear_cache is missing on ARM architectures.
    
            Fixed a small bug in the inline assembly of cacheFlush function on
            ARM_TRADITIONAL.
    
            * jit/ExecutableAllocator.h:
            (JSC::ExecutableAllocator::cacheFlush):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48702 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1766555..5630ca3 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-24  Gabor Loki  <loki at inf.u-szeged.hu>
+
+        Reviewed by Gavin Barraclough.
+
+        Avoid __clear_cache built-in function if DISABLE_BUILTIN_CLEAR_CACHE define is set
+        https://bugs.webkit.org/show_bug.cgi?id=28886
+
+        There are some GCC packages (for example GCC-2006q3 from CodeSourcery)
+        which contain __clear_cache built-in function only for C while the C++
+        version of __clear_cache is missing on ARM architectures.
+
+        Fixed a small bug in the inline assembly of cacheFlush function on
+        ARM_TRADITIONAL.
+
+        * jit/ExecutableAllocator.h:
+        (JSC::ExecutableAllocator::cacheFlush):
+
 2009-09-21  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/JavaScriptCore/jit/ExecutableAllocator.h b/JavaScriptCore/jit/ExecutableAllocator.h
index 0b25bc0..12e2a32 100644
--- a/JavaScriptCore/jit/ExecutableAllocator.h
+++ b/JavaScriptCore/jit/ExecutableAllocator.h
@@ -191,7 +191,7 @@ public:
     {
         User::IMB_Range(code, static_cast<char*>(code) + size);
     }
-#elif PLATFORM(ARM) && COMPILER(GCC) && (GCC_VERSION >= 30406)
+#elif PLATFORM(ARM) && COMPILER(GCC) && (GCC_VERSION >= 30406) && !defined(DISABLE_BUILTIN_CLEAR_CACHE)
     static void cacheFlush(void* code, size_t size)
     {
         __clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code) + size);
@@ -203,7 +203,8 @@ public:
             "push    {r7}\n"
             "mov     r0, %0\n"
             "mov     r1, %1\n"
-            "mov     r7, 0xf0002\n"
+            "mov     r7, #0xf0000\n"
+            "add     r7, r7, #0x2\n"
             "mov     r2, #0x0\n"
             "svc     0x0\n"
             "pop     {r7}\n"

-- 
WebKit Debian packaging