Add a Makefile.float to centralize soft vs hard float logic.

lib/libc/Makefile

@@ -112,10 +112,8 @@ NOASM=
 .include "${LIBC_SRCTOP}/rpc/Makefile.inc"
 .include "${LIBC_SRCTOP}/uuid/Makefile.inc"
 .include "${LIBC_SRCTOP}/xdr/Makefile.inc"
-.if (${LIBC_ARCH} == "arm" && \
-	(${MACHINE_ARCH:Marmv[67]*} == "" || (defined(CPUTYPE) && ${CPUTYPE:M*soft*}))) || \
-    (${LIBC_ARCH} == "mips" && ${MACHINE_ARCH:Mmips*hf} == "") || \
-    (${LIBC_ARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != "")
+.include "${LIBC_SRCTOP}/Makefile.float"
+.if ${SOFTFLOAT} == "yes"
 .include "${LIBC_SRCTOP}/softfloat/Makefile.inc"
 .endif
 .if ${LIBC_ARCH} == "i386" || ${LIBC_ARCH} == "amd64"

lib/libc/Makefile.float

@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+# Architectures which use soft-float:
+# - armv4/5
+# - armv6/7 with "soft" in CPUTYPE.
+# - mips without "hf" in MACHINE_ARCH.
+# - riscv without "sf" in MACHINE_ARCH.
+.if ((${MACHINE_CPUARCH} == "arm" && \
+	(${MACHINE_ARCH:Marmv[67]*} == "" || \
+	    (defined(CPUTYPE) && ${CPUTYPE:M*soft*}))) || \
+    (${MACHINE_CPUARCH} == "mips" && ${MACHINE_ARCH:Mmips*hf} == "") || \
+    (${MACHINE_CPUARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != ""))
+SOFTFLOAT=yes
+.else
+SOFTFLOAT=no
+.endif

lib/libcompiler_rt/Makefile.inc

@@ -171,10 +171,8 @@ SRCF+=		trunctfsf2
 
 # These are provided via the softfloat support in libc.a on some
 # architectures.
-.if !((${MACHINE_CPUARCH} == "arm" && \
-	(${MACHINE_ARCH:Marmv[67]*} == "" || (defined(CPUTYPE) && ${CPUTYPE:M*soft*}))) || \
-    (${MACHINE_CPUARCH} == "mips" && ${MACHINE_ARCH:Mmips*hf} == "") || \
-    (${MACHINE_CPUARCH} == "riscv" && ${MACHINE_ARCH:Mriscv*sf} != ""))
+.include "${SRCTOP}/lib/libc/Makefile.float"
+.if ${SOFTFLOAT} == "no"
 SRCF+=		adddf3
 SRCF+=		addsf3
 SRCF+=		divdf3