From b2951abd7d6454b1b7f1f72a04f3cd8bd011eea0 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 9 Jan 2025 14:19:01 -0500
Subject: [PATCH] bsd.compat.mk: Drop support for riscv64sf

This was removed by upstream FreeBSD and CheriBSD a while ago
---
 share/mk/bsd.compat.mk | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index fd624fdd811b..e7a87ba9ed1f 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -113,10 +113,7 @@ LIB64CPUFLAGS+=	-march=morello -mabi=aapcs
 
 .if ${COMPAT_ARCH:Mriscv*c*}
 HAS_COMPAT+=	64
-LIB64_RISCV_ABI=	lp64
-.if !${COMPAT_ARCH:Mriscv*sf}
-LIB64_RISCV_ABI:=	${LIB64_RISCV_ABI}d
-.endif
+LIB64_RISCV_ABI=	lp64d
 LIB64_MACHINE=	riscv
 LIB64_MACHINE_ARCH=riscv64
 LIB64WMAKEENV=	MACHINE_CPU="riscv cheri"
@@ -147,10 +144,7 @@ LIB64C_MACHINE=	riscv
 LIB64C_MACHINE_ARCH=	${COMPAT_ARCH}c
 LIB64CWMAKEFLAGS=	CPUTYPE=cheri
 LIB64CCPUFLAGS=	-target riscv64-unknown-freebsd13.0
-LIB64C_RISCV_ABI=	l64pc128
-.if !${MACHINE_ARCH:Mriscv*sf}
-LIB64C_RISCV_ABI:=	${LIB64C_RISCV_ABI}d
-.endif
+LIB64C_RISCV_ABI=	l64pc128d
 LIB64CCPUFLAGS+=	-march=${LIB64C_RISCV_MARCH} -mabi=${LIB64C_RISCV_ABI}
 .endif	# ${COMPAT_ARCH:Mriscv64*}
 .endif # ${MK_LIB64C} != "no"
@@ -158,11 +152,7 @@ LIB64CCPUFLAGS+=	-march=${LIB64C_RISCV_MARCH} -mabi=${LIB64C_RISCV_ABI}
 .if ${COMPAT_ARCH:Mriscv*}
 .for _LIBCOMPAT in ${HAS_COMPAT}
 # See bsd.cpu.mk
-LIB${_LIBCOMPAT}_RISCV_MARCH=	rv64ima
-.if !${COMPAT_ARCH:Mriscv*sf*}
-LIB${_LIBCOMPAT}_RISCV_MARCH:=	${LIB${_LIBCOMPAT}_RISCV_MARCH}fd
-.endif
-LIB${_LIBCOMPAT}_RISCV_MARCH:=	${LIB${_LIBCOMPAT}_RISCV_MARCH}c
+LIB${_LIBCOMPAT}_RISCV_MARCH=	rv64imafdc
 .if ${COMPAT_ARCH:Mriscv*c*} || ${_LIBCOMPAT:M64C}
 LIB${_LIBCOMPAT}_RISCV_MARCH:=	${LIB${_LIBCOMPAT}_RISCV_MARCH}xcheri
 .endif