From owner-svn-src-head@freebsd.org  Mon Aug 24 00:03:52 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2CDE49C1BEC;
 Mon, 24 Aug 2015 00:03:52 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1118A1D58;
 Mon, 24 Aug 2015 00:03:52 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7O03pu0096384;
 Mon, 24 Aug 2015 00:03:51 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7O03pGp096383;
 Mon, 24 Aug 2015 00:03:51 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201508240003.t7O03pGp096383@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 24 Aug 2015 00:03:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287086 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Aug 2015 00:03:52 -0000

Author: imp
Date: Mon Aug 24 00:03:51 2015
New Revision: 287086
URL: https://svnweb.freebsd.org/changeset/base/287086

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

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Sun Aug 23 23:12:30 2015	(r287085)
+++ head/share/mk/bsd.cpu.mk	Mon Aug 24 00:03:51 2015	(r287086)
@@ -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