Bug#700093: patch update
Hi!
Well... it looks like upstream efforts to add x32 JIT have been stalled for
two years already. So let's just disable the JIT, like it's disabled on
most architectures. Could you please upload fixed qtwebkit? It's in
build-dependency chain for a lot of packages.
Daniel's patch requires updating:
1. Source/JavaScriptCore/wtf/Platform.h is now Source/WTF/wtf/Platform.h
2. some defines need to be set by hand (which you do from debian/rules,
I just had to add x32 to the list of architectures)
Updated patch attached.
During testing, I kept randomly getting "recipe for target 'incremental'
failed" during roughly 2/3 build attempts, but a glance at current build
status show this is unrelated.
--
// If you believe in so-called "intellectual property", please immediately
// cease using counterfeit alphabets. Instead, contact the nearest temple
// of Amon, whose priests will provide you with scribal services for all
// your writing needs, for Reasonable and Non-Discriminatory prices.
diff -urd qtwebkit-2.3.2.dfsg.0/Source/WTF/wtf/Platform.h qtwebkit-2.3.2.dfsg/Source/WTF/wtf/Platform.h
--- qtwebkit-2.3.2.dfsg.0/Source/WTF/wtf/Platform.h 2013-07-10 14:34:26.000000000 +0200
+++ qtwebkit-2.3.2.dfsg/Source/WTF/wtf/Platform.h 2014-09-05 08:19:01.061759253 +0200
@@ -159,8 +159,12 @@
/* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
#if defined(__x86_64__) \
|| defined(_M_X64)
+#ifdef __ILP32__
+#define WTF_CPU_X86_64_32 1
+#else
#define WTF_CPU_X86_64 1
#endif
+#endif
/* CPU(ARM) - ARM, any version*/
#if defined(arm) \
diff -urd qtwebkit-2.3.2.dfsg.0/debian/rules qtwebkit-2.3.2.dfsg/debian/rules
--- qtwebkit-2.3.2.dfsg.0/debian/rules 2014-09-03 17:53:27.000000000 +0200
+++ qtwebkit-2.3.2.dfsg/debian/rules 2014-09-05 08:44:52.150856020 +0200
@@ -31,7 +31,7 @@
#disable JIT assembler on archs where it doesn't compile
#disable WTF_USE_3D_GRAPHICS on ARM where it doesn't compile
#disable forcing SSE2 on all other platforms
-ifneq (,$(filter arm64 armel mips mipsel powerpc ppc64el,$(DEB_HOST_ARCH)))
+ifneq (,$(filter arm64 armel mips mipsel powerpc ppc64el x32,$(DEB_HOST_ARCH)))
./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_CXXFLAGS)
else ifeq ($(DEB_HOST_ARCH),armhf)
./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_CXXFLAGS)
Reply to: