Bug#754358: fix mips64(el) build of webkitgtk
Package: qtwebkit
Version: 2.4.3-2
Tags: patch
Control: forwarded -1 https://bugs.webkit.org/show_bug.cgi?id=124370
With this patch, It can build now.
in debian/rules, jit is also need to disable for mips64 mips64el
mipsn32 mipsn32el.
--
YunQiang Su
Index: webkitgtk-2.4.3/Source/WTF/wtf/Platform.h
===================================================================
--- webkitgtk-2.4.3.orig/Source/WTF/wtf/Platform.h 2014-07-03 18:53:22.279158467 +0800
+++ webkitgtk-2.4.3/Source/WTF/wtf/Platform.h 2014-07-03 18:53:21.895158459 +0800
@@ -80,16 +80,20 @@
#endif
#endif
-/* CPU(MIPS) - MIPS 32-bit */
-/* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
- && defined(_ABIO32)
+/* CPU(MIPS) - MIPS 32-bit and 64-bit */
+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
+ || defined(__mips64))
+#if defined(__mips64)
+#define WTF_CPU_MIPS64 1
+#define WTF_MIPS_ARCH __mips64
+#else
#define WTF_CPU_MIPS 1
+#define WTF_MIPS_ARCH __mips
+#endif
#if defined(__MIPSEB__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
#define WTF_MIPS_PIC (defined __PIC__)
-#define WTF_MIPS_ARCH __mips
#define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
#define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
#define WTF_MIPS_ARCH_REV __mips_isa_rev
@@ -663,7 +667,8 @@
|| CPU(ARM64) \
|| CPU(SPARC64) \
|| CPU(S390X) \
- || CPU(PPC64)
+ || CPU(PPC64) \
+ || CPU(MIPS64)
#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
Index: webkitgtk-2.4.3/Source/WTF/wtf/dtoa/utils.h
===================================================================
--- webkitgtk-2.4.3.orig/Source/WTF/wtf/dtoa/utils.h 2014-07-03 18:46:49.000000000 +0800
+++ webkitgtk-2.4.3/Source/WTF/wtf/dtoa/utils.h 2014-07-09 09:53:21.720934325 +0800
@@ -49,7 +49,7 @@
defined(__ARMEL__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)
#if defined(_WIN32)
Reply to: