Make it buildable on sparc64 (and probably sparc)

4 files changed, 84 insertions, 21 deletions

diff --git a/www/webkit24-gtk/distinfo b/www/webkit24-gtk/distinfo
index 261e70f6c17..e67af3604b0 100644
--- a/www/webkit24-gtk/distinfo
+++ b/www/webkit24-gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2016/04/11 06:45:01 leot Exp $
+$NetBSD: distinfo,v 1.5 2016/12/03 16:30:05 martin Exp $
 
 SHA1 (webkitgtk-2.4.11.tar.xz) = e425ae86084ab6335dadb368c9e8f53600665d54
 RMD160 (webkitgtk-2.4.11.tar.xz) = e1f72498f911465f5ba152313dd9c62ae8d5eee6
@@ -9,9 +9,11 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2ff343ac53b14af069
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = fdd31fcf6c745394499570397c82fe3dfce02e1d
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 67f66ca254f958c0650249485a64982b40f92621
+SHA1 (patch-Source_JavaScriptCore_runtime_VM.cpp) = ddc2a6edfc43df78b06e215412b2d1af1cf5777a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 6471907359806a180df3e2082b0e54109cb40955
+SHA1 (patch-Source_WTF_wtf_Platform.h) = a2357c134c0e8ad1df7f0ef949ed8fa3cfc4c5fa
+SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 3e00331ef4ea5dd71a07f0952da089ccd67a9e66
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9
 SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
diff --git a/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_runtime_VM.cpp b/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_runtime_VM.cpp
new file mode 100644
index 00000000000..eceb784ba3c
--- /dev/null
+++ b/www/webkit24-gtk/patches/patch-Source_JavaScriptCore_runtime_VM.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_JavaScriptCore_runtime_VM.cpp,v 1.1 2016/12/03 16:30:05 martin Exp $
+
+Allow this to build without ENABLE(ASSEMBLER)
+
+--- Source/JavaScriptCore/runtime/VM.cpp.orig	2016-04-10 08:48:36.000000000 +0200
++++ Source/JavaScriptCore/runtime/VM.cpp	2016-12-02 15:53:07.033628829 +0100
+@@ -205,6 +205,8 @@
+     , m_newStringsSinceLastHashCons(0)
+ #if ENABLE(ASSEMBLER)
+     , m_canUseAssembler(enableAssembler(executableAllocator))
++#else
++#define	m_canUseAssembler	false
+ #endif
+ #if ENABLE(JIT)
+     , m_canUseJIT(m_canUseAssembler && Options::useJIT())
diff --git a/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h
index 06ba75d6c74..d1ae57c2881 100644
--- a/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ b/www/webkit24-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -1,25 +1,56 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2015/07/12 00:37:47 wiz Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2016/12/03 16:30:05 martin Exp $
 
---- Source/WTF/wtf/Platform.h.orig	2015-01-07 09:45:42.000000000 +0000
-+++ Source/WTF/wtf/Platform.h
-@@ -632,6 +632,11 @@
- #define USE_SYSTEM_MALLOC 1
+Add support for sparc and sparc64, disable ASSEMBLER and YARR_JIT for now
+
+--- Source/WTF/wtf/Platform.h.orig	2016-04-10 08:48:36.000000000 +0200
++++ Source/WTF/wtf/Platform.h	2016-12-02 18:12:33.703875988 +0100
+@@ -153,6 +153,18 @@
+ #define WTF_CPU_BIG_ENDIAN 1
  #endif
  
-+/* Workaround an alignment issue with fastMalloc on NetBSD/arm */
-+#if OS(NETBSD) && CPU(ARM)
-+#define USE_SYSTEM_MALLOC 1
++/* CPU(SPARC) - SPARC 32-bit */
++#if defined(__sparc__) && !defined(_LP64)
++#define WTF_CPU_SPARC 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
++/* CPU(SPARC64) - SPARC 64-bit */
++#if defined(__sparc__) && defined(_LP64)
++#define WTF_CPU_SPARC64 1
++#define WTF_CPU_BIG_ENDIAN 1
 +#endif
 +
- #if !defined(ENABLE_GLOBAL_FASTMALLOC_NEW)
- #define ENABLE_GLOBAL_FASTMALLOC_NEW 1
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -656,6 +668,7 @@
+     || CPU(ALPHA) \
+     || CPU(ARM64) \
+     || CPU(S390X) \
++    || CPU(SPARC64) \
+     || CPU(MIPS64) \
+     || CPU(PPC64) \
+     || CPU(PPC64LE)
+@@ -824,7 +837,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) || ENABLE(LLINT_C_LOOP)) && !CPU(SPARC64) && !CPU(SPARC)
+ #define ENABLE_YARR_JIT 1
+ 
+ /* Setting this flag compares JIT results with interpreter results. */
+@@ -837,10 +850,12 @@
+ #if defined(ENABLE_ASSEMBLER) && !ENABLE_ASSEMBLER
+ #error "Cannot enable the JIT or RegExp JIT without enabling the Assembler"
+ #else
++#if !CPU(SPARC) && !CPU(SPARC64)
+ #undef ENABLE_ASSEMBLER
+ #define ENABLE_ASSEMBLER 1
  #endif
-@@ -723,7 +728,7 @@
-    low-level interpreter. */
- #if !defined(ENABLE_LLINT) \
-     && ENABLE(JIT) \
--    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(HURD)) \
-+    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(HURD)) \
-     && (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
+ #endif
++#endif
+ 
+ /* If the Disassembler is enabled, then the Assembler must be enabled as well: */
+ #if ENABLE(DISASSEMBLER)
+
diff --git a/www/webkit24-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h b/www/webkit24-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
new file mode 100644
index 00000000000..3816b16ba0f
--- /dev/null
+++ b/www/webkit24-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WTF_wtf_dtoa_utils.h,v 1.1 2016/12/03 16:30:05 martin Exp $
+
+Add support for sparc and sparc64
+
+--- Source/WTF/wtf/dtoa/utils.h.orig	2016-04-10 08:48:36.000000000 +0200
++++ Source/WTF/wtf/dtoa/utils.h	2016-12-01 17:15:30.400636439 +0100
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(SPARC) || CPU(SPARC64)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)