Fix build on NetBSD/arm.

5 files changed, 47 insertions, 21 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 724ee97c02d..9c25186af0a 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2015/10/25 16:48:23 leot Exp $
+# $NetBSD: Makefile,v 1.103 2015/10/26 10:53:24 jmcneill Exp $
 
 DISTNAME=	webkitgtk-2.10.2
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -69,8 +69,8 @@ CXXFLAGS.SunOS+=	-fpermissive
 CXXFLAGS+=	-std=c++11 -Wno-c++11-narrowing
 .endif
 
-.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64)
-CMAKE_ARGS+=	-DUSE_SYSTEM_MALLOC=ON	# XXX: not completely sure (was --disable-fast-malloc)
+.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+CMAKE_ARGS+=	-DUSE_SYSTEM_MALLOC=ON
 .endif
 
 .include "options.mk"
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 52f17c2f128..92e3bcf6cf4 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.83 2015/10/25 16:48:23 leot Exp $
+$NetBSD: distinfo,v 1.84 2015/10/26 10:53:24 jmcneill Exp $
 
 SHA1 (webkitgtk-2.10.2.tar.xz) = 34743186985299355eb84c04a944c7decf21a8e6
 RMD160 (webkitgtk-2.10.2.tar.xz) = 768d1a1e3af7497369af9392815101b7004139ce
 SHA512 (webkitgtk-2.10.2.tar.xz) = a83f1774c0ad65def6c90ba6117579477bd37fc7d0683a72887ec688e25fd84c3930cdf8538e6bbf8f2f57cf4515553eb29fb43679cffe35bdf108b04c08a387
 Size (webkitgtk-2.10.2.tar.xz) = 11011532 bytes
+SHA1 (patch-CMakeLists.txt) = e5834d3935c4a25ab4aeb7210d0ccbffc012b670
+SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2b1eadc7a11b37dc36a7491f30bf72a6dddf5725
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 9b36b50f28bcb9421ac8b0ed17bba02de6d34e16
 SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = f8244c0f22bdb1ad29cb9abcfe0654173cedbe04
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75
-SHA1 (patch-Source_WTF_wtf_Platform.h) = cbf239e3b05909b63a33fbe5ced4f8b8743ce4aa
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29
 SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 620bfd4bae3eaf638fda0a1da3707e842a34adab
diff --git a/www/webkit-gtk/patches/patch-CMakeLists.txt b/www/webkit-gtk/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..12b1044e09b
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/26 10:53:25 jmcneill Exp $
+
+--- CMakeLists.txt.orig	2015-10-25 17:30:21.000000000 +0000
++++ CMakeLists.txt
+@@ -87,6 +87,8 @@ else ()
+ endif ()
+ if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+     set(WTF_CPU_ARM 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm")
++    set(WTF_CPU_ARM 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+     set(WTF_CPU_ARM64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
new file mode 100644
index 00000000000..1519857b179
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
@@ -0,0 +1,28 @@
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.5 2015/10/26 10:53:25 jmcneill Exp $
+
+--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2015-10-15 08:20:12.000000000 +0000
++++ Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -29,6 +29,11 @@
+ 
+ #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
+ 
++#if defined(__NetBSD__)
++#include <sys/types.h>
++#include <machine/sysarch.h>
++#endif
++
+ #include "AssemblerBufferWithConstantPool.h"
+ #include "JITCompilationEffort.h"
+ #include <wtf/Assertions.h>
+@@ -1128,6 +1133,11 @@ namespace JSC {
+                 linuxPageFlush(current, current + page);
+ 
+             linuxPageFlush(current, end);
++#elif defined(__NetBSD__)
++            struct arm_sync_icache_args arg;
++            arg.addr = reinterpret_cast<uintptr_t>(code);
++            arg.len = size;
++            sysarch(ARM_SYNC_ICACHE, (void *)&arg);
+ #else
+ #error "The cacheFlush support is missing on this platform."
+ #endif
diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
deleted file mode 100644
index f2406b3fa24..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.7 2015/09/26 10:16:38 leot Exp $
-
---- Source/WTF/wtf/Platform.h.orig	2015-09-21 07:29:46.000000000 +0000
-+++ Source/WTF/wtf/Platform.h
-@@ -667,6 +667,11 @@
- #define USE_SYSTEM_MALLOC 1
- #endif
- 
-+/* Workaround an alignment issue with fastMalloc on NetBSD/arm */
-+#if OS(NETBSD) && CPU(ARM)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- #define ENABLE_DEBUG_WITH_BREAKPOINT 0
- #define ENABLE_SAMPLING_COUNTERS 0
- #define ENABLE_SAMPLING_FLAGS 0