diff options
author | Warner Losh <imp@FreeBSD.org> | 2020-03-20 15:07:21 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2020-03-20 15:07:21 +0000 |
commit | 6f7bbb26611320f8399fe4dd1adb50c3d13fa9dd (patch) | |
tree | 7aaa23534eadc7edcdeb2692871348d49807989f /share/mk/src.opts.mk | |
parent | 3b7fd87cbfb4d52aef7e59e4eda250e7a32e9863 (diff) | |
download | src-6f7bbb26611320f8399fe4dd1adb50c3d13fa9dd.tar.gz src-6f7bbb26611320f8399fe4dd1adb50c3d13fa9dd.zip |
Eliminate misuse of $MACHINE for userland things.
Use TARGET_ARCH and/or MACHINE_ARCH exclusively. Change all __TT uses to __T
with appropriate translations. MACHINE/TARGET is to be used only for kernel
things.
Notes
Notes:
svn path=/head/; revision=359164
Diffstat (limited to 'share/mk/src.opts.mk')
-rw-r--r-- | share/mk/src.opts.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index e32d10d9a1e6..653e0bc5a3fa 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -256,11 +256,6 @@ __T=${TARGET_ARCH} .else __T=${MACHINE_ARCH} .endif -.if defined(TARGET) -__TT=${TARGET} -.else -__TT=${MACHINE} -.endif # All supported backends for LLVM_TARGET_XXX __LLVM_TARGETS= \ @@ -270,13 +265,13 @@ __LLVM_TARGETS= \ powerpc \ riscv \ x86 -__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:S/arm64/aarch64/:S/powerpc64/powerpc/ +__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:S/powerpc64/powerpc/:S/powerpcspe/powerpc/ .for __llt in ${__LLVM_TARGETS} # Default enable the given TARGET's LLVM_TARGET support -.if ${__TT:${__LLVM_TARGET_FILT}} == ${__llt} +.if ${__T:${__LLVM_TARGET_FILT}} == ${__llt} __DEFAULT_YES_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu} # aarch64 needs arm for -m32 support. -.elif ${__TT} == "arm64" && ${__llt} == "arm" +.elif ${__T} == "aarch64" && ${__llt:Marm*} != "" __DEFAULT_DEPENDENT_OPTIONS+= LLVM_TARGET_ARM/LLVM_TARGET_AARCH64 # Default the rest of the LLVM_TARGETs to the value of MK_LLVM_TARGET_ALL. .else @@ -288,7 +283,7 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF .include <bsd.compiler.mk> -.if ${__TT} != "mips" +.if ${__T:Mmips*} == "" # Clang is installed as the default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC .else @@ -307,7 +302,7 @@ __DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=OFED .endif -.if ${__TT} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" +.if ${__T:Mmips*} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD .else __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD |