svn commit: r360397 - in head/sys: conf riscv/conf

[John Baldwin]

Author: jhb
Date: Mon Apr 27 21:51:22 2020
New Revision: 360397
URL: https://svnweb.freebsd.org/changeset/base/360397

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

Deleted:
  head/sys/riscv/conf/GENERICSF
Modified:
  head/sys/conf/Makefile.riscv
  head/sys/conf/kern.mk

Modified: head/sys/conf/Makefile.riscv
==============================================================================
--- head/sys/conf/Makefile.riscv	Mon Apr 27 21:44:02 2020	(r360396)
+++ head/sys/conf/Makefile.riscv	Mon Apr 27 21:51:22 2020	(r360397)
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600017
+%VERSREQ=	600012
 
 .if !defined(S)
 S=	../../..

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Mon Apr 27 21:44:02 2020	(r360396)
+++ head/sys/conf/kern.mk	Mon Apr 27 21:51:22 2020	(r360397)
@@ -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