From 71881a8216b3e804efcf41fbaa6b61caf93a5679 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 18 Jan 2018 05:44:17 +0000 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (3.13) quilt-fixup] --- ...-offlineasm-to-prevent-generation-of.patch | 39 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 debian/patches/hack-offlineasm-to-prevent-generation-of.patch diff --git a/debian/patches/hack-offlineasm-to-prevent-generation-of.patch b/debian/patches/hack-offlineasm-to-prevent-generation-of.patch new file mode 100644 index 00000000..9993e6bf --- /dev/null +++ b/debian/patches/hack-offlineasm-to-prevent-generation-of.patch @@ -0,0 +1,39 @@ +From: Peter Michael Green +Date: Thu, 18 Jan 2018 05:43:19 +0000 +X-Dgit-Generated: 5.212.0~alpha2-6+rpi1 606e469962abb31adcae85807b29f23418b47e25 +Subject: hack offlineasm to prevent generation of movw/movt + + +--- + +--- qtwebkit-opensource-src-5.212.0~alpha2.orig/Source/JavaScriptCore/offlineasm/arm.rb ++++ qtwebkit-opensource-src-5.212.0~alpha2/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/patches/series b/debian/patches/series index a5c41f91..a8834afe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ fix_ftbfs_x32.diff path_max.diff fix_ftbfs_alpha.diff pkgconfig_description.diff +hack-offlineasm-to-prevent-generation-of.patch -- 2.30.2