From 70b2b492001f0d16684fac67a7a9728eaa2bf752 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Mon, 24 Aug 2015 00:03:51 +0000
Subject: [PATCH] We need to add the soft float to the CFLAGS always, not just
 when NO_CPUCFLAGS is not defined since it is part of the ABI as we've defined
 it, not just a nice optimization.

---
 share/mk/bsd.cpu.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 7d776bce5637..60f775f85c82 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -273,7 +273,9 @@ CFLAGS += -G0
 .endif
 
 .if ${MACHINE_ARCH} == "armv6"
-_CPUCFLAGS += -mfloat-abi=softfp
+# Needs to be CFLAGS not _CPUCFLAGS because it's needed for the ABI
+# not a nice optimization.
+CFLAGS += -mfloat-abi=softfp
 .endif
 
 # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk