svn commit: r395444 - in head/lang/spidermonkey170: . files

[Brad Davis]

Author: brd
Date: Thu Aug 27 21:09:48 2015
New Revision: 395444
URL: https://svnweb.freebsd.org/changeset/ports/395444

Log:
  Fix ARM build of lang/spidermoney170 by using GCC until clang is fixed.
  
  Approved by:	kwm (maintainer), bdrewery (mentor)

Modified:
  head/lang/spidermonkey170/Makefile
  head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h

Modified: head/lang/spidermonkey170/Makefile
==============================================================================
--- head/lang/spidermonkey170/Makefile	Thu Aug 27 19:39:14 2015	(r395443)
+++ head/lang/spidermonkey170/Makefile	Thu Aug 27 21:09:48 2015	(r395444)
@@ -66,6 +66,11 @@ BROKEN=			dtrace -G crashes with C++ obj
 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 \

Modified: head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h
==============================================================================
--- head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h	Thu Aug 27 19:39:14 2015	(r395443)
+++ head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h	Thu Aug 27 21:09:48 2015	(r395444)
@@ -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);