Author: jhb
Date: Fri Jan 17 22:02:35 2020
New Revision: 356851
URL: https://svnweb.freebsd.org/changeset/base/356851

Log:
  MFC 353932: Strip "sf" suffix when generating a target triple.
  
  This fixes the target triple used when compiling riscv64sf with clang.
  
  Sponsored by: DARPA

Modified:
  stable/12/Makefile.inc1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1     Fri Jan 17 21:57:05 2020        (r356850)
+++ stable/12/Makefile.inc1     Fri Jan 17 22:02:35 2020        (r356851)
@@ -126,9 +126,9 @@ TARGET_ABI= gnueabi
 .endif
 .endif
 MACHINE_ABI?=  unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.1
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.1
 TARGET_ABI?=   unknown
-TARGET_TRIPLE?=        
${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.1
+TARGET_TRIPLE?=        
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.1
 KNOWN_ARCHES?= aarch64/arm64 \
                amd64 \
                arm \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to