From 0a902e4261bb2c10a148f1dab5f3e1f4ae8741f8 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 25 Jan 2022 11:31:17 -0800 Subject: [PATCH] Stop trimming 'hf' suffixes from MACHINE_ARCH. This was only used for MIPS hard-float architectures. Reviewed by: imp Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D34018 --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9a9d6586ddfc..dc102d63e4ae 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -138,9 +138,9 @@ TARGET_ABI= gnueabi .endif .endif MACHINE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${MACHINE_ABI}-freebsd14.0 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_ABI}-freebsd14.0 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//}-${TARGET_ABI}-freebsd14.0 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_ABI}-freebsd14.0 KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ armv6/arm \