svn commit: r325427 - projects/runtime-coverage/lib/libclang_rt

[Ngie Cooper]

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