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

[loki at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 968535cf9312dc9b42b3703aa42ea7113fe8914c
Author: loki at webkit.org <loki at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 06:54:40 2010 +0000

    [WINCE] Buildfix for GeneratedJITStubs after r64818
    https://bugs.webkit.org/show_bug.cgi?id=44469
    
    Patch by Patrick Gansterer <paroga at paroga.com> on 2010-08-23
    Rubber-stamped by Gabor Loki.
    
    Use " THUNK_RETURN_ADDRESS_OFFSET" instead of "#offset#".
    
    * jit/JITStubs.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8f38b29..548c924 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-23  Patrick Gansterer  <paroga at paroga.com>
+
+        Rubber-stamped by Gabor Loki.
+
+        [WINCE] Buildfix for GeneratedJITStubs after r64818
+        https://bugs.webkit.org/show_bug.cgi?id=44469
+
+        Use " THUNK_RETURN_ADDRESS_OFFSET" instead of "#offset#".
+
+        * jit/JITStubs.cpp:
+
 2010-08-23  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index f1808d5..b53e655 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -1164,13 +1164,13 @@ MSVC_BEGIN()
 MSVC_BEGIN(ctiTrampoline PROC)
 MSVC_BEGIN(    stmdb sp!, {r1-r3})
 MSVC_BEGIN(    stmdb sp!, {r4-r8, lr})
-MSVC_BEGIN(    sub sp, sp, ##offset#+4)
+MSVC_BEGIN(    sub sp, sp, # THUNK_RETURN_ADDRESS_OFFSET + 4)
 MSVC_BEGIN(    mov r4, r2)
 MSVC_BEGIN(    mov r5, #512)
 MSVC_BEGIN(    ; r0 contains the code)
 MSVC_BEGIN(    mov lr, pc)
 MSVC_BEGIN(    bx r0)
-MSVC_BEGIN(    add sp, sp, ##offset#+4)
+MSVC_BEGIN(    add sp, sp, # THUNK_RETURN_ADDRESS_OFFSET + 4)
 MSVC_BEGIN(    ldmia sp!, {r4-r8, lr})
 MSVC_BEGIN(    add sp, sp, #12)
 MSVC_BEGIN(    bx lr)
@@ -1181,7 +1181,7 @@ MSVC_BEGIN(    mov r0, sp)
 MSVC_BEGIN(    mov lr, pc)
 MSVC_BEGIN(    bl cti_vm_throw)
 MSVC_BEGIN(ctiOpThrowNotCaught)
-MSVC_BEGIN(    add sp, sp, ##offset#+4)
+MSVC_BEGIN(    add sp, sp, # THUNK_RETURN_ADDRESS_OFFSET + 4)
 MSVC_BEGIN(    ldmia sp!, {r4-r8, lr})
 MSVC_BEGIN(    add sp, sp, #12)
 MSVC_BEGIN(    bx lr)
@@ -1191,9 +1191,9 @@ MSVC_BEGIN()
 MSVC(    EXPORT cti_#op#)
 MSVC(    IMPORT JITStubThunked_#op#)
 MSVC(cti_#op# PROC)
-MSVC(    str lr, [sp, ##offset#])
+MSVC(    str lr, [sp, # THUNK_RETURN_ADDRESS_OFFSET])
 MSVC(    bl JITStubThunked_#op#)
-MSVC(    ldr lr, [sp, ##offset#])
+MSVC(    ldr lr, [sp, # THUNK_RETURN_ADDRESS_OFFSET])
 MSVC(    bx lr)
 MSVC(cti_#op# ENDP)
 MSVC()

-- 
WebKit Debian packaging