From owner-svn-src-projects@freebsd.org  Sun Nov  5 07:36:13 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 3239BE6457B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun,  5 Nov 2017 07:36:13 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 F3804714AC;
 Sun,  5 Nov 2017 07:36:12 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA57aCJD030000;
 Sun, 5 Nov 2017 07:36:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA57aBDY029999;
 Sun, 5 Nov 2017 07:36:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201711050736.vA57aBDY029999@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sun, 5 Nov 2017 07:36:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r325427 - projects/runtime-coverage/lib/libclang_rt
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage/lib/libclang_rt
X-SVN-Commit-Revision: 325427
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Nov 2017 07:36:13 -0000

Author: ngie
Date: Sun Nov  5 07:36:11 2017
New Revision: 325427
URL: https://svnweb.freebsd.org/changeset/base/325427

Log:
  Define CRTARCH to armhf when TARGET/TARGET_ARCH are set to arm/armv[67]
  
  TARGET_ABI/TARGET_CPU in Makefile.inc1 sets the ABI to gnueabihf, which affects
  the clang lookup path per getArchNameForCompilerRTLib(..) in
  contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp .
  
  This is a follow up to r324873.
  
  PR:		222925

Modified:
  projects/runtime-coverage/lib/libclang_rt/Makefile.inc

Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc
==============================================================================
--- projects/runtime-coverage/lib/libclang_rt/Makefile.inc	Sun Nov  5 05:08:16 2017	(r325426)
+++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc	Sun Nov  5 07:36:11 2017	(r325427)
@@ -2,7 +2,16 @@
 
 .include <src.opts.mk>
 
-CRTARCH=	${TARGET_CPUARCH:C/amd64/x86_64/}
+# NOTE: based on TARGET_ABI/TARGET_CPUTYPE, set in Makefile.inc1 .
+.if defined(TARGET) && defined(TARGET_ARCH)
+.if ${TARGET} == "arm"
+.if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == ""
+CRTARCH=	armhf
+.endif
+.endif
+.endif
+
+CRTARCH?=	${TARGET_CPUARCH:C/amd64/x86_64/}
 CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib