From 02343a67c22dff0d190d34004d71570352b53e76 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 27 Apr 2020 21:51:22 +0000
Subject: [PATCH] Retire the GENERICSF kernel config.

Now that hw.machine_arch handles soft-float vs hard-float there is no
longer a reason for this config.

Submitted by:	mhorne (kern.mk hunk)
Reviewed by:	imp (earlier version), kp
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D24544
---
 sys/conf/Makefile.riscv  | 2 +-
 sys/conf/kern.mk         | 4 ----
 sys/riscv/conf/GENERICSF | 9 ---------
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 sys/riscv/conf/GENERICSF

diff --git a/sys/conf/Makefile.riscv b/sys/conf/Makefile.riscv
index 00746104eb3a..183fa6dd4482 100644
--- a/sys/conf/Makefile.riscv
+++ b/sys/conf/Makefile.riscv
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600017
+%VERSREQ=	600012
 
 .if !defined(S)
 S=	../../..
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 9180b31c5206..23c98de879b7 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -150,11 +150,7 @@ INLINE_LIMIT?=	8000
 # code model as "medium" and "medany" respectively.
 #
 .if ${MACHINE_CPUARCH} == "riscv"
-.if ${MACHINE_ARCH:Mriscv*sf}
-CFLAGS+=	-march=rv64imac
-.else
 CFLAGS+=	-march=rv64imafdc
-.endif
 CFLAGS+=	-mabi=lp64
 CFLAGS.clang+=	-mcmodel=medium
 CFLAGS.gcc+=	-mcmodel=medany
diff --git a/sys/riscv/conf/GENERICSF b/sys/riscv/conf/GENERICSF
deleted file mode 100644
index 683e48bcf7aa..000000000000
--- a/sys/riscv/conf/GENERICSF
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-# Just like generic, but with a riscv64sf MACHINE_ARCH. Override machine set in
-# DEFAULTS.
-machine riscv riscv64sf
-
-include		"GENERIC"
-ident		GENERICSF
-nooptions	FPE			# for systems without FPE