aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/spidermonkey170/Makefile5
-rw-r--r--lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
index 01b51ff2f7cb..07af65fe7980 100644
--- a/lang/spidermonkey170/Makefile
+++ b/lang/spidermonkey170/Makefile
@@ -66,6 +66,11 @@ BROKEN= dtrace -G crashes with C++ object files
STRIP_CMD= ${TRUE}
.endif
+# ARM needs GCC until https://llvm.org/bugs/show_bug.cgi?id=23244 is fixed
+.if ${ARCH} == "armv6"
+USE_GCC= yes
+.endif
+
regression-test: build
@${ECHO_MSG} -n "===> Running jstests.py: "
@cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \
diff --git a/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h b/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h
index 21c71cee6d1f..c7d6bd14d57e 100644
--- a/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h
+++ b/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h
@@ -1,10 +1,10 @@
---- assembler/jit/ExecutableAllocator.h.orig 2013-10-29 20:40:26 UTC
-+++ assembler/jit/ExecutableAllocator.h
-@@ -477,6 +477,11 @@ public:
+--- assembler/jit/ExecutableAllocator.h.orig 2013-02-11 15:33:22.000000000 -0700
++++ assembler/jit/ExecutableAllocator.h 2015-08-26 11:42:27.133593000 -0600
+@@ -468,6 +468,11 @@
{
sync_instruction_memory((caddr_t)code, size);
}
-+#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
++#elif WTF_CPU_ARM_TRADITIONAL && WTF_OS_FREEBSD
+ static void cacheFlush(void* code, size_t size)
+ {
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);