svn commit: r353932 - head

[John Baldwin]

Author: jhb
Date: Wed Oct 23 16:43:51 2019
New Revision: 353932
URL: https://svnweb.freebsd.org/changeset/base/353932

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Oct 23 16:41:31 2019	(r353931)
+++ head/Makefile.inc1	Wed Oct 23 16:43:51 2019	(r353932)
@@ -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 \