From owner-svn-ports-head@freebsd.org Thu Aug 27 21:09:49 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 762469C46A3; Thu, 27 Aug 2015 21:09:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CD7BD6B; Thu, 27 Aug 2015 21:09:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7RL9ngl048192; Thu, 27 Aug 2015 21:09:49 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7RL9m9x048190; Thu, 27 Aug 2015 21:09:48 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201508272109.t7RL9m9x048190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Thu, 27 Aug 2015 21:09:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395444 - in head/lang/spidermonkey170: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2015 21:09:49 -0000 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(code) + size);