Wed Aug 14 22:16:54 2013 UTC ()
Build fixes for NetBSD arm


(jmcneill)
diff -r1.64 -r1.65 pkgsrc/www/webkit-gtk/distinfo
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h

cvs diff -r1.64 -r1.65 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2013/08/01 06:14:54 1.64
+++ pkgsrc/www/webkit-gtk/distinfo 2013/08/14 22:16:54 1.65
@@ -1,25 +1,29 @@ @@ -1,25 +1,29 @@
1$NetBSD: distinfo,v 1.64 2013/08/01 06:14:54 wiz Exp $ 1$NetBSD: distinfo,v 1.65 2013/08/14 22:16:54 jmcneill Exp $
2 2
3SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630 3SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630
4RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e 4RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e
5Size (webkitgtk-1.10.2.tar.xz) = 8633640 bytes 5Size (webkitgtk-1.10.2.tar.xz) = 8633640 bytes
 6SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 448d9a096d87c3ecd22899ab66f45587cf8d1a65
 7SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = c48648f62466f47dbb37d20bee01c1d0caa54b00
 8SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 08f9ca5a4adbecf7f1aea9fcbc0de17ddc125259
6SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703 9SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703
7SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372 10SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372
8SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 7b96aea5a81016b8a63c7f44839704261b39cd0d 11SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 7b96aea5a81016b8a63c7f44839704261b39cd0d
9SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ce9766427bebd4aac0b8c7fc2c12cc0ed75150d5 12SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ce9766427bebd4aac0b8c7fc2c12cc0ed75150d5
10SHA1 (patch-Source_WTF_wtf_Atomics.h) = 3cc890798e7e956b75c2a181eca4a4d05cb545fc 13SHA1 (patch-Source_WTF_wtf_Atomics.h) = 3cc890798e7e956b75c2a181eca4a4d05cb545fc
11SHA1 (patch-Source_WTF_wtf_Compiler.h) = 9e80acdbb57be1844103fe647a017ad7e46cc513 14SHA1 (patch-Source_WTF_wtf_Compiler.h) = 9e80acdbb57be1844103fe647a017ad7e46cc513
12SHA1 (patch-Source_WTF_wtf_MathExtras.h) = f922736410d49e7d7d1a459bffd3dffd0364e85a 15SHA1 (patch-Source_WTF_wtf_MathExtras.h) = f922736410d49e7d7d1a459bffd3dffd0364e85a
 16SHA1 (patch-Source_WTF_wtf_Platform.h) = 9e8f4b17619da4aa89e672c9d62a567f2f98b4bd
13SHA1 (patch-Source_WTF_wtf_RefCountedLeakCounter.h) = 3cdf53f9735675bff83b48a81db59c3512f306e3 17SHA1 (patch-Source_WTF_wtf_RefCountedLeakCounter.h) = 3cdf53f9735675bff83b48a81db59c3512f306e3
14SHA1 (patch-Source_WTF_wtf_ThreadSafeRefCounted.h) = c068f8b248b8864eeaa582fa096eca279f06890e 18SHA1 (patch-Source_WTF_wtf_ThreadSafeRefCounted.h) = c068f8b248b8864eeaa582fa096eca279f06890e
15SHA1 (patch-Source_WebCore_Modules_webaudio_AudioContext.h) = 121b67efd25af6982f02a19d0b9e1e26be89e782 19SHA1 (patch-Source_WebCore_Modules_webaudio_AudioContext.h) = 121b67efd25af6982f02a19d0b9e1e26be89e782
16SHA1 (patch-Source_WebCore_Modules_webaudio_AudioNode.h) = 1d22889087504d8fd42f38f72bde777850a4e767 20SHA1 (patch-Source_WebCore_Modules_webaudio_AudioNode.h) = 1d22889087504d8fd42f38f72bde777850a4e767
17SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = b331ad70a9c6a133c854b65452bad4ae3558e2e6 21SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = b331ad70a9c6a133c854b65452bad4ae3558e2e6
18SHA1 (patch-Source_WebCore_editing_Editor.h) = 43562577dd6432a86fd8ee0a1e7bb0db31f07d2d 22SHA1 (patch-Source_WebCore_editing_Editor.h) = 43562577dd6432a86fd8ee0a1e7bb0db31f07d2d
19SHA1 (patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp) = 76e6e3e662edcfb7e327f2e475709a105d146e50 23SHA1 (patch-Source_WebCore_platform_gtk_FileSystemGtk.cpp) = 76e6e3e662edcfb7e327f2e475709a105d146e50
20SHA1 (patch-Source_WebCore_platform_network_DNSResolveQueue.h) = ba2960eeda95189a85744112b2533e66599eb4b7 24SHA1 (patch-Source_WebCore_platform_network_DNSResolveQueue.h) = ba2960eeda95189a85744112b2533e66599eb4b7
21SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 0f33b188b242166584d5725060c5c430a819be61 25SHA1 (patch-Source_WebCore_platform_sql_SQLiteDatabase.cpp) = 0f33b188b242166584d5725060c5c430a819be61
22SHA1 (patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp) = 92f4016fe65fc6162b7f6dfcdc4c6ea2f5204b02 26SHA1 (patch-Source_WebKit2_WebProcess_WebCoreSupport_WebPlatformStrategies.cpp) = 92f4016fe65fc6162b7f6dfcdc4c6ea2f5204b02
23SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 816cecbcb8ddf4af65265f5e76745b93f1055904 27SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 816cecbcb8ddf4af65265f5e76745b93f1055904
24SHA1 (patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp) = 36013247ccbc2df274762acb49304511c06cb0f7 28SHA1 (patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp) = 36013247ccbc2df274762acb49304511c06cb0f7
25SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c 29SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c

File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $

--- ./Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2012-11-23 20:12:15.000000000 +0000
+++ ./Source/JavaScriptCore/assembler/ARMAssembler.h
@@ -27,6 +27,10 @@
 #ifndef ARMAssembler_h
 #define ARMAssembler_h
 
+#if OS(NETBSD)
+#include <machine/sysarch.h>
+#endif
+
 #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
 #include "AssemblerBufferWithConstantPool.h"
@@ -1041,6 +1045,11 @@ namespace JSC {
             UNUSED_PARAM(size);
 #elif OS(QNX)
             msync(code, size, MS_INVALIDATE_ICACHE);
+#elif OS(NETBSD)
+            struct arm_sync_icache_args args;
+            args.addr = reinterpret_cast<uintptr_t>(code);
+            args.len = size;
+            sysarch(ARM_SYNC_ICACHE, &args);
 #else
 #error "The cacheFlush support is missing on this platform."
 #endif

File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.1 2013/08/14 22:16:54 jmcneill Exp $

--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig	2012-11-23 20:12:15.000000000 +0000
+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -37,6 +37,8 @@
 #include <unistd.h>
 #include <elf.h>
 #include <asm/hwcap.h>
+#elif OS(NETBSD)
+#include <sys/sysctl.h>
 #endif
 
 namespace JSC {
@@ -57,6 +59,16 @@ static bool isVFPPresent()
     }
 #endif
 
+#if OS(NETBSD)
+    size_t len;
+    int flag;
+
+    len = sizeof(flag);
+    if (sysctlbyname("machdep.fpu_present", &flag, &len, NULL, 0) == 0) {
+        return flag == 1;
+    }
+#endif
+
 #if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
     return true;
 #else

File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h
$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $

--- Source/JavaScriptCore/dfg/DFGNode.h.orig	2012-11-23 20:12:15.000000000 +0000
+++ Source/JavaScriptCore/dfg/DFGNode.h
@@ -65,7 +65,7 @@ struct StructureTransitionData {
 struct OpInfo {
     explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
     explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }
-#if OS(DARWIN) || USE(JSVALUE64)
+#if OS(DARWIN) || (CPU(ARM) && OS(NETBSD)) || USE(JSVALUE64)
     explicit OpInfo(size_t value) : m_value(static_cast<uintptr_t>(value)) { }
 #endif
     explicit OpInfo(void* value) : m_value(reinterpret_cast<uintptr_t>(value)) { }

File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_Platform.h
$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.1 2013/08/14 22:16:54 jmcneill Exp $

--- Source/WTF/wtf/Platform.h.orig	2012-11-23 20:12:16.000000000 +0000
+++ Source/WTF/wtf/Platform.h
@@ -484,6 +484,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
+
 #if PLATFORM(BLACKBERRY)
 #define WTF_USE_MERSENNE_TWISTER_19937 1
 #define WTF_USE_SKIA 1