diff options
| -rw-r--r-- | lib/clang/llvm.build.mk | 12 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 2 | ||||
| -rw-r--r-- | usr.bin/clang/Makefile.inc | 5 |
3 files changed, 3 insertions, 16 deletions
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 575b6b2d9c62..d958a4becc63 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -49,8 +49,8 @@ TARGET_TRIPLE_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} -LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" @@ -73,9 +73,6 @@ CFLAGS+= -DLLVM_TARGET_ENABLE_BPF .endif .if ${MK_LLVM_TARGET_MIPS} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_MIPS -. if ${MACHINE_CPUARCH} == "mips" -LLVM_NATIVE_ARCH= Mips -. endif .endif .if ${MK_LLVM_TARGET_POWERPC} != "no" CFLAGS+= -DLLVM_TARGET_ENABLE_POWERPC @@ -126,8 +123,3 @@ CFLAGS+= -DBOOTSTRAPPING_WANT_NATIVE_SYSCTL .if defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Linux" LIBADD+= dl .endif - -.if ${MACHINE_ARCH:Mmips64} -STATIC_CFLAGS+= -mxgot -STATIC_CXXFLAGS+= -mxgot -.endif diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c0491d6e8769..8032284d964e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -263,7 +263,7 @@ __LLVM_TARGETS= \ powerpc \ riscv \ x86 -__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:C/powerpc.*/powerpc/:C/armv[67]/arm/:C/riscv.*/riscv/:C/mips.*/mips/ +__LLVM_TARGET_FILT= C/(amd64|i386)/x86/:C/powerpc.*/powerpc/:C/armv[67]/arm/:C/riscv.*/riscv/ .for __llt in ${__LLVM_TARGETS} # Default enable the given TARGET's LLVM_TARGET support .if ${__T:${__LLVM_TARGET_FILT}} == ${__llt} diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index a257b795b7af..ba32f0c1032d 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -12,9 +12,4 @@ DEBUG_FILES_CFLAGS= -gline-tables-only DEBUG_FILES_CFLAGS= -g1 .endif -.if ${MACHINE_ARCH:Mmips*} && ${MACHINE_ARCH:Mmips64*} == "" -CFLAGS+= -mxgot -CXXFLAGS+= -mxgot -.endif - .include "../Makefile.inc" |