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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4559c3bb15c6b5d52fd6ad84c8c064e1bb66baa7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 25 00:40:30 2010 +0000

    2010-07-24  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Darin Adler.
    
            [MSVC] Ensure 4 byte alignment on ARM
            https://bugs.webkit.org/show_bug.cgi?id=42935
    
            * jit/JITStubs.h: Added #pragma pack(4) around JITStackFrame.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4affdc8..1bcdcde 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Darin Adler.
 
+        [MSVC] Ensure 4 byte alignment on ARM
+        https://bugs.webkit.org/show_bug.cgi?id=42935
+
+        * jit/JITStubs.h: Added #pragma pack(4) around JITStackFrame.
+
+2010-07-24  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Darin Adler.
+
         [WINCE] Cleanup defines in Platform.h
         https://bugs.webkit.org/show_bug.cgi?id=42933
 
diff --git a/JavaScriptCore/jit/JITStubs.h b/JavaScriptCore/jit/JITStubs.h
index ba9e15f..306e475 100644
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@ -171,6 +171,10 @@ namespace JSC {
         ReturnAddressPtr* returnAddressSlot() { return &thunkReturnAddress; }
     };
 #elif CPU(ARM_TRADITIONAL)
+#if COMPILER(MSVC)
+#pragma pack(push)
+#pragma pack(4)
+#endif // COMPILER(MSVC)
     struct JITStackFrame {
         JITStubArg padding; // Unused
         JITStubArg args[7];
@@ -195,6 +199,9 @@ namespace JSC {
         // When JIT code makes a call, it pushes its return address just below the rest of the stack.
         ReturnAddressPtr* returnAddressSlot() { return &thunkReturnAddress; }
     };
+#if COMPILER(MSVC)
+#pragma pack(pop)
+#endif // COMPILER(MSVC)
 #elif CPU(MIPS)
     struct JITStackFrame {
         void* reserved; // Unused

-- 
WebKit Debian packaging