The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=10172ce32c8f2f419ede51b675ed4d30036ef339
commit 10172ce32c8f2f419ede51b675ed4d30036ef339
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2023-04-12 18:11:02 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2023-04-12 18:11:02 +0000
Stop stripping 'sf' suffixes from architecture names.
riscv64sf was the only architecture with an 'sf' suffix.
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D39497
---
Makefile.inc1 | 4 ++--
lib/clang/llvm.build.mk | 4 ++--
lib/libclang_rt/compiler-rt-vars.mk | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index e131cc463bc8..60956d58fd9b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -136,9 +136,9 @@ TARGET_TRIPLE_ABI= gnueabi
.endif
.endif
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?=
${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 \
amd64 \
armv6/arm \
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index d958a4becc63..609f729430fa 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/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI}
-LLVM_BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}
+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/}-${VENDOR}-freebsd${OS_REVISION}
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\"
CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\"
diff --git a/lib/libclang_rt/compiler-rt-vars.mk
b/lib/libclang_rt/compiler-rt-vars.mk
index 5658b94b312d..4515d8c98a28 100644
--- a/lib/libclang_rt/compiler-rt-vars.mk
+++ b/lib/libclang_rt/compiler-rt-vars.mk
@@ -9,7 +9,7 @@ SANITIZER_SHAREDIR= ${CLANGDIR}/share
(!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
CRTARCH?= armhf
.else
-CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}
+CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/}
.endif
.if ${COMPILER_TYPE} == "clang"
