From owner-svn-src-all@freebsd.org  Wed Jun 24 18:29:35 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 40AF6916726;
 Wed, 24 Jun 2015 18:29:35 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org (svn.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 32471186F;
 Wed, 24 Jun 2015 18:29:35 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5OITZ4I001319;
 Wed, 24 Jun 2015 18:29:35 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5OITZrT001318;
 Wed, 24 Jun 2015 18:29:35 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201506241829.t5OITZrT001318@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Wed, 24 Jun 2015 18:29:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284772 - head/lib/msun/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jun 2015 18:29:35 -0000

Author: ian
Date: Wed Jun 24 18:29:34 2015
New Revision: 284772
URL: https://svnweb.freebsd.org/changeset/base/284772

Log:
  Fix compilation when the armv6 world is being compiled without hw floating
  point support.  The fenv-vfp.c file overrides -mfloat-abi so it can use
  floating point instructions if it detects support at runtime.  Make it also
  override -mfpu in case the user has set -mfpu=none.

Modified:
  head/lib/msun/arm/Makefile.inc

Modified: head/lib/msun/arm/Makefile.inc
==============================================================================
--- head/lib/msun/arm/Makefile.inc	Wed Jun 24 18:26:04 2015	(r284771)
+++ head/lib/msun/arm/Makefile.inc	Wed Jun 24 18:29:34 2015	(r284772)
@@ -7,6 +7,6 @@ SYM_MAPS += ${.CURDIR}/arm/Symbol.map
 ARCH_SRCS = fenv-softfp.c fenv-vfp.c
 .endif
 
-CFLAGS.fenv-vfp.c=	-mfloat-abi=softfp
+CFLAGS.fenv-vfp.c=	-mfpu=vfp -mfloat-abi=softfp
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}