From 47e888f8363dff61b48befcfb79161abee65b1d1 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 20 Apr 2023 11:00:46 -0700
Subject: [PATCH] Remove a few more references to riscv64sf.

Fixes:		1ca12bd927d7 Remove the riscv64sf architecture.
---
 lib/libc/Makefile               | 3 +--
 lib/libcompiler_rt/Makefile.inc | 4 ----
 share/mk/bsd.cpu.mk             | 7 +------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 2c6f2da361b3..e2a8f1473bf3 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -125,8 +125,7 @@ NOASM=
 .include "${LIBC_SRCTOP}/rpc/Makefile.inc"
 .include "${LIBC_SRCTOP}/uuid/Makefile.inc"
 .include "${LIBC_SRCTOP}/xdr/Makefile.inc"
-.if (${LIBC_ARCH} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*})) || \
-    (${LIBC_ARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != "")
+.if (${LIBC_ARCH} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*}))
 .include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
 .endif
 .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64"
diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc
index 519ff0943ff3..2ceab5f12d8d 100644
--- a/lib/libcompiler_rt/Makefile.inc
+++ b/lib/libcompiler_rt/Makefile.inc
@@ -246,7 +246,3 @@ SRCS+=		switch8.S
 SRCS+=		switchu8.S
 SRCS+=		sync_synchronize.S
 .endif
-
-.if ${MACHINE_ARCH:Mriscv*sf}
-CFLAGS+=	-D__SOFT_FP__
-.endif
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 693a9b5209da..dbd58a385b23 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -317,12 +317,8 @@ CFLAGS.gcc+= -mabi=spe -mfloat-gprs=double -Wa,-me500
 .endif
 
 .if ${MACHINE_CPUARCH} == "riscv"
-.if ${MACHINE_ARCH:Mriscv*sf}
-CFLAGS += -march=rv64imac -mabi=lp64
-.else
 CFLAGS += -march=rv64imafdc -mabi=lp64d
 .endif
-.endif
 
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk
 
@@ -367,8 +363,7 @@ CXXFLAGS += ${CXXFLAGS.${MACHINE_ARCH}}
 # Size of time_t:		time32, time64
 #
 .if (${MACHINE} == "arm" && (defined(CPUTYPE) && ${CPUTYPE:M*soft*})) || \
-    (${MACHINE_ARCH} == "powerpc" && (defined(CPUTYPE) && ${CPUTYPE} == "e500")) || \
-    ${MACHINE_ARCH:Mriscv*sf*}
+    (${MACHINE_ARCH} == "powerpc" && (defined(CPUTYPE) && ${CPUTYPE} == "e500"))
 MACHINE_ABI+=	soft-float
 .else
 MACHINE_ABI+=	hard-float