earmv7hf build fixes

3 files changed, 29 insertions, 5 deletions

diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index c6032f8a8fa..7ad276478a8 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.71 2014/11/02 22:14:28 wiz Exp $
+$NetBSD: distinfo,v 1.72 2014/11/27 13:47:02 jmcneill Exp $
 
 SHA1 (webkitgtk-2.4.7.tar.xz) = 10d4cd1c1f7454adc576c6b97fa3d262b6665764
 RMD160 (webkitgtk-2.4.7.tar.xz) = 25e1732f7e04ee0e15d7292aa5ef693d5c25679d
 Size (webkitgtk-2.4.7.tar.xz) = 9826208 bytes
 SHA1 (patch-Source_JavaScriptCore_ForwardingHeaders_JavaScriptCore_JSCallbackFunction.h) = 79122450435eb12a57086d18e5410eec131c33b2
+SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2ff343ac53b14af0692754a44059e7d2ea969b96
 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_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 5ff82e77d1d5dea5514adbeede14fd4a8923dc9c
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 3247f110b23a93fdb96870dc3140690e92ac607b
 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
 SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
 SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f
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..9bc902e5f07
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.3 2014/11/27 13:47:03 jmcneill Exp $
+
+--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2014-10-21 08:06:38.000000000 +0000
++++ Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -1121,6 +1121,9 @@ namespace JSC {
+             linuxPageFlush(current, end);
+ #elif OS(WINCE)
+             CacheRangeFlush(code, size, CACHE_SYNC_ALL);
++#elif OS(NETBSD)
++            char* begin = reinterpret_cast<char*>(code);
++            __builtin___clear_cache(begin, begin + size);
+ #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
index 431998b1b87..c608f44ae8e 100644
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2014/08/03 22:30:05 wiz Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.3 2014/11/27 13:47:03 jmcneill Exp $
 
---- Source/WTF/wtf/Platform.h.orig	2014-04-14 06:40:45.000000000 +0000
+--- Source/WTF/wtf/Platform.h.orig	2014-10-22 08:16:09.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
-@@ -618,6 +618,11 @@
+@@ -632,6 +632,11 @@
  #define USE_SYSTEM_MALLOC 1
  #endif
  
@@ -14,3 +14,12 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.2 2014/08/03 22:30:05 wiz Exp $
  #if !defined(ENABLE_GLOBAL_FASTMALLOC_NEW)
  #define ENABLE_GLOBAL_FASTMALLOC_NEW 1
  #endif
+@@ -723,7 +728,7 @@
+    low-level interpreter. */
+ #if !defined(ENABLE_LLINT) \
+     && ENABLE(JIT) \
+-    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
++    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD)) \
+     && (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