d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define CRTARCH to armhf when TARGET/TARGET_ARCH are set to arm/armv[67]

Browse Source 
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
This commit is contained in:
Enji Cooper 2017-11-05 07:36:11 +00:00
parent cc5f0ba05b
commit 7efeac5c18
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libclang_rt/Makefile.inc
View File

@ -2,7 +2,16 @@
.include <src.opts.mk> .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 CRTSRC= ${SRCTOP}/contrib/compiler-rt
.PATH: ${CRTSRC}/lib .PATH: ${CRTSRC}/lib