Merge lp:~rsalveti/webkit/arm-crash-fix into lp:~ubuntu-desktop/webkit/ubuntu

[Ricardo Salveti]

Fix for bug 728211.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-28 18:26:04 +0000
+++ debian/changelog	2011-03-10 06:24:15 +0000
@@ -1,3 +1,10 @@
+webkit (1.3.12-0ubuntu3) natty; urgency=low
+
+  * debian/patches/03_fixing_jit_arm_crashes.patch:
+    - Fixing JIT ARM crashes (LP: #728211)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Wed, 09 Mar 2011 04:48:01 -0300
+
 webkit (1.3.12-0ubuntu2) natty; urgency=low
 
   * Add bzr-builddeb configuration (merge mode).

=== added file 'debian/patches/03_fixing_jit_arm_crashes.patch'
--- debian/patches/03_fixing_jit_arm_crashes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_fixing_jit_arm_crashes.patch	2011-03-10 06:24:15 +0000
@@ -0,0 +1,45 @@
+From 262cf5629343a565db417408cb9cb104baeefe21 Mon Sep 17 00:00:00 2001
+From: [e-mail] <[e-mail]@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Wed, 23 Feb 2011 18:55:29 +0000
+Subject: [PATCH] 2011-02-23  Xan Lopez  <[e-mail]>
+
+        Reviewed by Gavin Barraclough.
+
+        latest jsc for armv7 crashes in sunspider tests
+        https://bugs.webkit.org/show_bug.cgi?id=54667
+
+        Update JIT offset values in ARMv7 after r78732. Fixes crashes in
+        SunSpider and JavaScript tests.
+
+        * jit/JIT.h: update values.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@79460 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+
+diff --git a/Source/JavaScriptCore/jit/JIT.h b/Source/JavaScriptCore/jit/JIT.h
+index 36d80af..0a7ad39 100644
+--- a/Source/JavaScriptCore/jit/JIT.h
++++ b/Source/JavaScriptCore/jit/JIT.h
+@@ -402,14 +402,14 @@ namespace JSC {
+ #elif CPU(ARM_THUMB2)
+         // These architecture specific value are used to enable patching - see comment on op_put_by_id.
+         static const int patchOffsetPutByIdStructure = 10;
+-        static const int patchOffsetPutByIdPropertyMapOffset1 = 46;
+-        static const int patchOffsetPutByIdPropertyMapOffset2 = 58;
++        static const int patchOffsetPutByIdPropertyMapOffset1 = 36;
++        static const int patchOffsetPutByIdPropertyMapOffset2 = 48;
+         // These architecture specific value are used to enable patching - see comment on op_get_by_id.
+         static const int patchOffsetGetByIdStructure = 10;
+         static const int patchOffsetGetByIdBranchToSlowCase = 26;
+-        static const int patchOffsetGetByIdPropertyMapOffset1 = 46;
+-        static const int patchOffsetGetByIdPropertyMapOffset2 = 58;
+-        static const int patchOffsetGetByIdPutResult = 62;
++        static const int patchOffsetGetByIdPropertyMapOffset1 = 36;
++        static const int patchOffsetGetByIdPropertyMapOffset2 = 48;
++        static const int patchOffsetGetByIdPutResult = 52;
+ #if ENABLE(OPCODE_SAMPLING)
+         #error "OPCODE_SAMPLING is not yet supported"
+ #else
+-- 
+1.7.4.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-28 14:15:11 +0000
+++ debian/patches/series	2011-03-10 06:24:15 +0000
@@ -1,2 +1,3 @@
 01_expose_less_symbols.patch
 02_no_amd64_overcommit.patch
+03_fixing_jit_arm_crashes.patch