summaryrefslogtreecommitdiffstats
path: root/lib/msun
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2016-05-18 06:01:18 +0000
committerimp <imp@FreeBSD.org>2016-05-18 06:01:18 +0000
commit3b518c4dc10bf43b7ae4c1d618b3853c07293818 (patch)
tree6b3be8c1f55460e86fa3d3968f0fd655e0ebd2ba /lib/msun
parent28fe011e628781e5ebbde5d9dd55d81c88382819 (diff)
downloadFreeBSD-src-3b518c4dc10bf43b7ae4c1d618b3853c07293818.zip
FreeBSD-src-3b518c4dc10bf43b7ae4c1d618b3853c07293818.tar.gz
Make armv6 hard float abi by default. Kill armv6hf.
Allow CPUTYPE=soft to build the current soft-float abi libraries. Add UPDATING entry to announce this. Approved by: re@ (gjb)
Diffstat (limited to 'lib/msun')
-rw-r--r--lib/msun/arm/Makefile.inc2
-rw-r--r--lib/msun/arm/fenv-vfp.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc
index 535d5ea..eb73e63 100644
--- a/lib/msun/arm/Makefile.inc
+++ b/lib/msun/arm/Makefile.inc
@@ -3,7 +3,7 @@
LDBL_PREC = 53
SYM_MAPS += ${.CURDIR}/arm/Symbol.map
-.if ${TARGET_ARCH} == "armv6"
+.if ${MACHINE_ARCH:Marmv6*} && defined(CPUTYPE) && ${CPUTYPE:M*soft*} != ""
ARCH_SRCS = fenv-softfp.c fenv-vfp.c
.endif
diff --git a/lib/msun/arm/fenv-vfp.c b/lib/msun/arm/fenv-vfp.c
index fd615f3..ee02ae8 100644
--- a/lib/msun/arm/fenv-vfp.c
+++ b/lib/msun/arm/fenv-vfp.c
@@ -28,6 +28,8 @@
#define FENV_MANGLE(x) __vfp_ ##x
#include "fenv-mangle.h"
-#define __ARM_PCS_VFP
+#ifndef __ARM_PCS_VFP
+#define __ARM_PCS_VFP 1
+#endif
#include "fenv.c"
OpenPOWER on IntegriCloud