From 8b35d5ac4c02f2e2cc79054d261f860f906cce21 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Sun, 16 Mar 2014 09:40:05 +0000 Subject: [PATCH] Only build the vfp/softfp switching code on armv6 as we don't support vfp on anything earlier than this. This should fix the armeb and arm builds when using gcc. --- lib/msun/arm/fenv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c index 574b79ec1578..2dd1933f1605 100644 --- a/lib/msun/arm/fenv.c +++ b/lib/msun/arm/fenv.c @@ -30,6 +30,10 @@ #define __fenv_static #include "fenv.h" +#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#define FENV_ARMv6 +#endif + /* When SOFTFP_ABI is defined we are using the softfp ABI. */ #if defined(__VFP_FP__) && !defined(__ARM_PCS_VFP) #define SOFTFP_ABI @@ -46,7 +50,7 @@ const fenv_t __fe_dfl_env = 0; /* If this is a non-mangled softfp version special processing is required */ -#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) +#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) || !defined(FENV_ARMv6) /* * The following macros map between the softfloat emulator's flags and