Index: head/lang/spidermonkey170/Makefile
===================================================================
--- head/lang/spidermonkey170/Makefile	(revision 395443)
+++ head/lang/spidermonkey170/Makefile	(revision 395444)
@@ -1,84 +1,89 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		spidermonkey170
 PORTVERSION=		17.0.0
 PORTREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		MOZILLA/js
 DISTNAME=		mozjs${PORTVERSION}
 
 MAINTAINER=		kwm@FreeBSD.org
 COMMENT=		Standalone JavaScript based from Mozilla 17-esr
 
 BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
 GNU_CONFIGURE=		yes
 USES=			gmake pathfix perl5 python:2,build
 USE_PERL5=		build
 USE_LDCONFIG=		yes
 
 WRKSRC=			${WRKDIR}/mozjs${PORTVERSION}/js/src
 
 CONFIGURE_ARGS=		--with-pthreads \
 			--with-system-nspr
 
 OPTIONS_DEFINE=		DEBUG DTRACE GCZEAL JEMALLOC METHODJIT OPTIMIZE READLINE \
 			THREADSAFE TRACEJIT UTF8
 OPTIONS_DEFAULT=	METHODJIT OPTIMIZE READLINE THREADSAFE TRACEJIT
 OPTIONS_SUB=		yes
 
 DEBUG_DESC=		Enable Debug build
 DEBUG_CONFIGURE_ENABLE=	debug debug-symbols
 DEBUG_CONFIGURE_DISABLE=debug
 DTRACE_DESC=		Build with DTrace probes # move to bsd.options.desc.mk
 DTRACE_CONFIGURE_ENABLE=dtrace profiling
 DTRACE_LIBS=		-lelf
 GCZEAL_DESC=		Enable Zealous garbage collecting
 GCZEAL_CONFIGURE_ENABLE=gczeal
 JEMALLOC_DESC=		Use jemalloc as memory allocator
 JEMALLOC_CONFIGURE_ENABLE=	jemalloc
 METHODJIT_DESC=		Enable method JIT support
 METHODJIT_CONFIGURE_ENABLE=	methodjit
 OPTIMIZE_DESC=		Enable compiler optimizations
 OPTIMIZE_CONFIGURE_ENABLE=	optimize
 READLINE_DESC=		Link js shell to system readline library
 READLINE_CONFIGURE_ENABLE=	readline
 READLINE_USES=		readline
 THREADSAFE_DESC=	Enable multiple thread support
 THREADSAFE_CONFIGURE_ENABLE=	threadsafe
 TRACEJIT_DESC=		Enable tracing JIT support
 TRACEJIT_CONFIGURE_ENABLE=	tracejit
 UTF8_DESC=		Treat strings as UTF8 instead of ISO-8859-1
 UTF8_CFLAGS=		-DJS_C_STRINGS_ARE_UTF8
 
 .include <bsd.port.pre.mk>
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 
 .if ${PORT_OPTIONS:MDTRACE}
 . if ${OSVERSION} < 1000510
 BROKEN=			dtrace -G crashes with C++ object files
 . endif
 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 \
 	--no-progress ./js17
 .if ${PORT_OPTIONS:MMETHODJIT} || ${PORT_OPTIONS:MTRACEJIT}
 	@${ECHO_MSG} -n "===> Running jit_test.py: "
 	@cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} jit-test/jit_test.py \
 	--no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js17
 .endif
 
 post-install:
 	${LN} -s libmozjs-17.0.so ${STAGEDIR}${PREFIX}/lib/libmozjs-17.0.so.1
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js17
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-17.0.*
 
 .include <bsd.port.post.mk>
Index: head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h
===================================================================
--- head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h	(revision 395443)
+++ head/lang/spidermonkey170/files/patch-assembler_jit_ExecutableAllocator.h	(revision 395444)
@@ -1,14 +1,14 @@
---- 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);
 +    }
  #endif
  
  private: