From cbc120b22cb0732f0f528581329734d98b053c84 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Wed, 24 Jun 2015 18:29:34 +0000 Subject: [PATCH] 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. --- lib/msun/arm/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc index 09f08d887915..e86997c99081 100644 --- a/lib/msun/arm/Makefile.inc +++ b/lib/msun/arm/Makefile.inc @@ -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}}