Date: Fri, 20 Mar 2020 16:00:26 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359167 - head/share/mk Message-ID: <202003201600.02KG0Q7C059997@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Mar 20 16:00:26 2020 New Revision: 359167 URL: https://svnweb.freebsd.org/changeset/base/359167 Log: Revert r359164. This was in my staging tree by mistake when I pushed. Revert until it's ready. Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Fri Mar 20 15:50:37 2020 (r359166) +++ head/share/mk/src.opts.mk Fri Mar 20 16:00:26 2020 (r359167) @@ -256,6 +256,11 @@ __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= \ @@ -265,13 +270,13 @@ __LLVM_TARGETS= \ powerpc \ riscv \ x86 -__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:S/powerpc64/powerpc/:S/powerpcspe/powerpc/ +__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:S/arm64/aarch64/:S/powerpc64/powerpc/ .for __llt in ${__LLVM_TARGETS} # Default enable the given TARGET's LLVM_TARGET support -.if ${__T:${__LLVM_TARGET_FILT}} == ${__llt} +.if ${__TT:${__LLVM_TARGET_FILT}} == ${__llt} __DEFAULT_YES_OPTIONS+= LLVM_TARGET_${__llt:${__LLVM_TARGET_FILT}:tu} # aarch64 needs arm for -m32 support. -.elif ${__T} == "aarch64" && ${__llt:Marm*} != "" +.elif ${__TT} == "arm64" && ${__llt} == "arm" __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 @@ -283,7 +288,7 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF .include <bsd.compiler.mk> -.if ${__T:Mmips*} == "" +.if ${__TT} != "mips" # Clang is installed as the default /usr/bin/cc. __DEFAULT_YES_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC .else @@ -302,7 +307,7 @@ __DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP .if ${__T:Mriscv*} != "" BROKEN_OPTIONS+=OFED .endif -.if ${__T:Mmips*} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" +.if ${__TT} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe" __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD .else __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003201600.02KG0Q7C059997>