summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLandry Breuil <landry@rhaalovely.net>2014-03-24 23:15:53 +0100
committerLandry Breuil <landry@rhaalovely.net>2014-03-24 23:15:53 +0100
commit3921a9e202e672e4c00b9e97fec15aedb1f1c21a (patch)
tree22dc15c6a6b47bb9b9e5ede8e535c9d06bc36556
parent4e1431a7f8c536f729b864f1bd6fd073348fe297 (diff)
readd sparc64 defines
-rw-r--r--patches/patch-Source_WTF_wtf_Platform_h57
1 files changed, 33 insertions, 24 deletions
diff --git a/patches/patch-Source_WTF_wtf_Platform_h b/patches/patch-Source_WTF_wtf_Platform_h
index 9b73a44..06a4add 100644
--- a/patches/patch-Source_WTF_wtf_Platform_h
+++ b/patches/patch-Source_WTF_wtf_Platform_h
@@ -1,8 +1,12 @@
$OpenBSD: patch-Source_WTF_wtf_Platform_h,v 1.3 2013/11/14 16:47:00 ajacoutot Exp $
-Add defines for sparc64*/hppa.
+Add defines for sparc64/mips64.
Disable yarr jit on anything not having a jit
https://bugs.webkit.org/show_bug.cgi?id=113638
+https://bugs.webkit.org/show_bug.cgi?id=129839
+
+sparc defines/code was removed upstream in
+http://trac.webkit.org/changeset/159817
chunk 4
https://bugs.webkit.org/show_bug.cgi?id=126502
@@ -14,11 +18,26 @@ https://bugs.webkit.org/show_bug.cgi?id=128898
https://bugs.webkit.org/show_bug.cgi?id=129963 for dfg_jit/llint
-chunk 6/7 needed to build on ppc, otherwise assembler is
-enabled (because of llint cloop) but there's no asm for ppc
+last chunk needed to build on ppc/sparc64, otherwise yarr jit and
+assembler is enabled (because of llint cloop) but there's no asm
+for those
+
--- Source/WTF/wtf/Platform.h.orig Mon Mar 3 09:11:49 2014
-+++ Source/WTF/wtf/Platform.h Thu Mar 6 20:42:02 2014
-@@ -82,9 +82,14 @@
++++ Source/WTF/wtf/Platform.h Sat Mar 8 22:59:04 2014
+@@ -71,6 +71,12 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+
++/* CPU(SPARC64) - Sun Sparc64 */
++#if defined(__sparc64__)
++#define WTF_CPU_SPARC64 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(IA64) - Itanium / IA-64 */
+ #if defined(__ia64__)
+ #define WTF_CPU_IA64 1
+@@ -82,9 +88,14 @@
/* CPU(MIPS) - MIPS 32-bit */
/* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
@@ -35,7 +54,7 @@ enabled (because of llint cloop) but there's no asm for ppc
#if defined(__MIPSEB__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
-@@ -313,7 +318,7 @@
+@@ -313,7 +324,7 @@
#endif /* ARM */
@@ -44,17 +63,16 @@ enabled (because of llint cloop) but there's no asm for ppc
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
-@@ -641,7 +646,8 @@
+@@ -641,6 +652,8 @@
|| CPU(ALPHA) \
|| CPU(ARM64) \
|| CPU(S390X) \
-- || CPU(PPC64)
-+ || CPU(PPC64) \
-+ || CPU(MIPS64)
++ || CPU(SPARC64) \
++ || CPU(MIPS64) \
+ || CPU(PPC64)
#define WTF_USE_JSVALUE64 1
#else
- #define WTF_USE_JSVALUE32_64 1
-@@ -708,7 +714,7 @@
+@@ -708,7 +721,7 @@
low-level interpreter. */
#if !defined(ENABLE_LLINT) \
&& ENABLE(JIT) \
@@ -63,7 +81,7 @@ enabled (because of llint cloop) but there's no asm for ppc
&& (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
#define ENABLE_LLINT 1
-@@ -716,7 +722,7 @@
+@@ -716,7 +729,7 @@
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC)
/* Enable the DFG JIT on X86 and X86_64. Only tested on Mac, GNU/Linux and FreeBSD. */
@@ -72,21 +90,12 @@ enabled (because of llint cloop) but there's no asm for ppc
#define ENABLE_DFG_JIT 1
#endif
/* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt/GTK+ Linux. */
-@@ -807,7 +813,7 @@
+@@ -807,7 +820,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP))
-+#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT))
++#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT)
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */
-@@ -816,7 +822,7 @@
-
- /* If either the JIT or the RegExp JIT is enabled, then the Assembler must be
- enabled as well: */
--#if ENABLE(JIT) || ENABLE(YARR_JIT)
-+#if ENABLE(JIT)
- #if defined(ENABLE_ASSEMBLER) && !ENABLE_ASSEMBLER
- #error "Cannot enable the JIT or RegExp JIT without enabling the Assembler"
- #else