diff options
author | jmcneill <jmcneill> | 2013-08-14 22:16:54 +0000 |
---|---|---|
committer | jmcneill <jmcneill> | 2013-08-14 22:16:54 +0000 |
commit | 596ceba39c3ed3b56d77047ce26cdfd24fa1c806 (patch) | |
tree | 03e77e081da467ba0e6dc4d8d2f275b675c5381e | |
parent | d5f2b94f8b9f0fc8ac392baf612519c747278245 (diff) | |
download | pkgsrc-596ceba39c3ed3b56d77047ce26cdfd24fa1c806.tar.gz |
Build fixes for NetBSD arm
5 files changed, 91 insertions, 1 deletions
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 7bf407d1818..e295c08e6b7 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.64 2013/08/01 06:14:54 wiz Exp $ +$NetBSD: distinfo,v 1.65 2013/08/14 22:16:54 jmcneill Exp $ SHA1 (webkitgtk-1.10.2.tar.xz) = 733ca23157eb8dd072d57becf325799c00bde630 RMD160 (webkitgtk-1.10.2.tar.xz) = 91e6b8bcd4bb8234271dd6c6ebdba63dd1c0840e Size (webkitgtk-1.10.2.tar.xz) = 8633640 bytes +SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 448d9a096d87c3ecd22899ab66f45587cf8d1a65 +SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = c48648f62466f47dbb37d20bee01c1d0caa54b00 +SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 08f9ca5a4adbecf7f1aea9fcbc0de17ddc125259 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703 SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 7b96aea5a81016b8a63c7f44839704261b39cd0d @@ -10,6 +13,7 @@ SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ce976 SHA1 (patch-Source_WTF_wtf_Atomics.h) = 3cc890798e7e956b75c2a181eca4a4d05cb545fc SHA1 (patch-Source_WTF_wtf_Compiler.h) = 9e80acdbb57be1844103fe647a017ad7e46cc513 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = f922736410d49e7d7d1a459bffd3dffd0364e85a +SHA1 (patch-Source_WTF_wtf_Platform.h) = 9e8f4b17619da4aa89e672c9d62a567f2f98b4bd SHA1 (patch-Source_WTF_wtf_RefCountedLeakCounter.h) = 3cdf53f9735675bff83b48a81db59c3512f306e3 SHA1 (patch-Source_WTF_wtf_ThreadSafeRefCounted.h) = c068f8b248b8864eeaa582fa096eca279f06890e SHA1 (patch-Source_WebCore_Modules_webaudio_AudioContext.h) = 121b67efd25af6982f02a19d0b9e1e26be89e782 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..20eeab94bc7 --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h @@ -0,0 +1,27 @@ +$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 diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp new file mode 100644 index 00000000000..4cfaa864c23 --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp @@ -0,0 +1,30 @@ +$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 diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h new file mode 100644 index 00000000000..7bfc21704b0 --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h @@ -0,0 +1,13 @@ +$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)) { } diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h new file mode 100644 index 00000000000..df14d442f0f --- /dev/null +++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h @@ -0,0 +1,16 @@ +$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 |