From 849b2363e4c2b0597f3dd895bee26228e1996c9e Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 18 Jan 2018 06:17:41 +0000 Subject: [PATCH] Make further unsuccesful changes to offlineasm Disable JIT. --- Source/JavaScriptCore/offlineasm/arm.rb | 2 +- debian/changelog | 3 ++- debian/rules | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/JavaScriptCore/offlineasm/arm.rb b/Source/JavaScriptCore/offlineasm/arm.rb index 91162c56..933e3288 100644 --- a/Source/JavaScriptCore/offlineasm/arm.rb +++ b/Source/JavaScriptCore/offlineasm/arm.rb @@ -502,7 +502,7 @@ class Instruction $asm.puts "mov #{armFlippedOperands(operands)}" end when "mvlbl" - raise "cant use this on armv6, #{codeorigin}" + $asm.puts "ldr #{operands[1].armOperand}, \=:#{operands[0].value}" #$asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}" #$asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}" when "nop" diff --git a/debian/changelog b/debian/changelog index 035b25d0..f0d8ec13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,8 @@ qtwebkit-opensource-src (5.212.0~alpha2-6+rpi1) buster-staging; urgency=medium * 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 + * Try unsuccessfully to hack offlineasm to prevent generation of movw/movt + * Disable JIT -- Peter Michael Green Thu, 18 Jan 2018 03:09:26 +0000 diff --git a/debian/rules b/debian/rules index caebf344..d6d2878f 100755 --- a/debian/rules +++ b/debian/rules @@ -26,9 +26,9 @@ ifneq ($(DEB_HOST_ARCH),x32) endif # JIT is only supported on x86 / armhf / aarch64 / mips32 -ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)) +#ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel)) EXTRA_CMAKE_ARGUMENTS += -DENABLE_JIT=OFF -endif +#endif # Copied from Fedora; see also https://github.com/annulen/webkit/issues/480 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),ppc64el s390x)) -- 2.30.2