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

Stop stripping 'sf' suffixes from architecture names.

Browse Source 
riscv64sf was the only architecture with an 'sf' suffix.

Reviewed by:	imp, emaste
Differential Revision:	https://reviews.freebsd.org/D39497
This commit is contained in:
John Baldwin 2023-04-12 11:11:02 -07:00
parent d27cc06838
commit 10172ce32c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -136,9 +136,9 @@ TARGET_TRIPLE_ABI= gnueabi
.endif .endif
.endif .endif
MACHINE_TRIPLE_ABI?= unknown MACHINE_TRIPLE_ABI?= unknown
MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION} MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION}
TARGET_TRIPLE_ABI?= unknown TARGET_TRIPLE_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_TRIPLE_ABI}-freebsd${OS_REVISION} TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/}-${TARGET_TRIPLE_ABI}-freebsd${OS_REVISION}
KNOWN_ARCHES?= aarch64/arm64 \ KNOWN_ARCHES?= aarch64/arm64 \
amd64 \ amd64 \
armv6/arm \ armv6/arm \

4
lib/clang/llvm.build.mk
View File

@ -49,8 +49,8 @@ TARGET_TRIPLE_ABI=
.endif .endif
VENDOR= unknown VENDOR= unknown
LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI}
LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION} LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-${VENDOR}-freebsd${OS_REVISION}
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\"
CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\"

2
lib/libclang_rt/compiler-rt-vars.mk
View File

@ -9,7 +9,7 @@ SANITIZER_SHAREDIR= ${CLANGDIR}/share
(!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
CRTARCH?= armhf CRTARCH?= armhf
.else .else
CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//} CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/}
.endif .endif
.if ${COMPILER_TYPE} == "clang" .if ${COMPILER_TYPE} == "clang"