From 4196949c0158711fb101e5459ea41fc4370b736a Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 23 Oct 2019 16:43:51 +0000 Subject: [PATCH] Strip "sf" suffix when generating a target triple. This fixes the target triple used when compiling riscv64sf with clang. Discussed with: mhorne MFC after: 2 weeks Sponsored by: DARPA --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 92c5ef489b0..7f8192e8d27 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -129,9 +129,9 @@ TARGET_ABI= gnueabi .endif .endif MACHINE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0 KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ arm \