hack offlineasm to prevent generation of movw/movt

diff --git a/Source/JavaScriptCore/offlineasm/arm.rb b/Source/JavaScriptCore/offlineasm/arm.rb
index c8064a59196127007c6378880a452b9e1301f0b3..91162c568ea5fe2f872e4142acea3fb352db10c3 100644 (file)
--- a/Source/JavaScriptCore/offlineasm/arm.rb
+++ b/Source/JavaScriptCore/offlineasm/arm.rb
@@ -103,11 +103,11 @@ def armMoveImmediate(value, register)
         $asm.puts "mov #{register.armOperand}, \##{value}"
     elsif (~value) >= 0 && (~value) < 256
         $asm.puts "mvn #{register.armOperand}, \##{~value}"
-    elsif isARMv7 or isARMv7Traditional
-        $asm.puts "movw #{register.armOperand}, \##{value & 0xffff}"
-        if (value & 0xffff0000) != 0
-            $asm.puts "movt #{register.armOperand}, \##{(value >> 16) & 0xffff}"
-        end
+    #elsif isARMv7 or isARMv7Traditional
+    #    $asm.puts "movw #{register.armOperand}, \##{value & 0xffff}"
+    #    if (value & 0xffff0000) != 0
+    #        $asm.puts "movt #{register.armOperand}, \##{(value >> 16) & 0xffff}"
+    #    end
     else
         $asm.puts "ldr #{register.armOperand}, =#{value}"
     end
@@ -502,8 +502,9 @@ class Instruction
                 $asm.puts "mov #{armFlippedOperands(operands)}"
             end
         when "mvlbl"
-                $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
-                $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
+                raise "cant use this on armv6, #{codeorigin}"
+                #$asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
+                #$asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
         when "nop"
             $asm.puts "nop"
         when "bieq", "bpeq", "bbeq"

diff --git a/debian/changelog b/debian/changelog
index 563160b04c39792be8691aad1b4d4689715dc2b7..035b25d0f9e7235c65813cd704657d9ec0cc79f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ qtwebkit-opensource-src (5.212.0~alpha2-6+rpi1) buster-staging; urgency=medium
   [changes brought forward from 5.212.0~alpha2-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Dec 2017 00:03:30 +0000]
   * Update symbols file for raspbian.
   * Fix clean target.
+  [changes introduced in 5.212.0~alpha2-6+rpi1] by Peter Michael Green
+  * hack offlineasm to prevent generation of movw/movt
 
- -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2018 03:09:26 +0000
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 18 Jan 2018 03:09:26 +0000
 
 qtwebkit-opensource-src (5.212.0~alpha2-6) unstable; urgency=medium