svn commit: r263231 - head/lib/msun/arm

[Andrew Turner]

Author: andrew
Date: Sun Mar 16 09:40:05 2014
New Revision: 263231
URL: http://svnweb.freebsd.org/changeset/base/263231

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

Modified:
  head/lib/msun/arm/fenv.c

Modified: head/lib/msun/arm/fenv.c
==============================================================================
--- head/lib/msun/arm/fenv.c	Sun Mar 16 09:38:43 2014	(r263230)
+++ head/lib/msun/arm/fenv.c	Sun Mar 16 09:40:05 2014	(r263231)
@@ -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