26c26
< * $FreeBSD: head/lib/msun/arm/fenv.h 226218 2011-10-10 15:43:09Z das $
---
> * $FreeBSD: head/lib/msun/arm/fenv.h 230192 2012-01-16 04:09:17Z das $
67c67,83
< #ifdef ARM_HARD_FLOAT
---
> #ifndef ARM_HARD_FLOAT
> /*
> * The following macros map between the softfloat emulator's flags and
> * the hardware's FPSR. The hardware this file was written for doesn't
> * have rounding control bits, so we stick those in the system ID byte.
> */
> #define __set_env(env, flags, mask, rnd) env = ((flags) \
> | (mask)<<_FPUSW_SHIFT \
> | (rnd) << 24)
> #define __env_flags(env) ((env) & FE_ALL_EXCEPT)
> #define __env_mask(env) (((env) >> _FPUSW_SHIFT) \
> & FE_ALL_EXCEPT)
> #define __env_round(env) (((env) >> 24) & _ROUND_MASK)
> #include <fenv-softfloat.h>
>
> #else /* ARM_HARD_FLOAT */
>
70,73d85
< #else
< #define __rfs(__fpsr)
< #define __wfs(__fpsr)
< #endif
220a233,234
> #endif /* ARM_HARD_FLOAT */
>
< * $FreeBSD: head/lib/msun/arm/fenv.h 226218 2011-10-10 15:43:09Z das $
---
> * $FreeBSD: head/lib/msun/arm/fenv.h 230192 2012-01-16 04:09:17Z das $
67c67,83
< #ifdef ARM_HARD_FLOAT
---
> #ifndef ARM_HARD_FLOAT
> /*
> * The following macros map between the softfloat emulator's flags and
> * the hardware's FPSR. The hardware this file was written for doesn't
> * have rounding control bits, so we stick those in the system ID byte.
> */
> #define __set_env(env, flags, mask, rnd) env = ((flags) \
> | (mask)<<_FPUSW_SHIFT \
> | (rnd) << 24)
> #define __env_flags(env) ((env) & FE_ALL_EXCEPT)
> #define __env_mask(env) (((env) >> _FPUSW_SHIFT) \
> & FE_ALL_EXCEPT)
> #define __env_round(env) (((env) >> 24) & _ROUND_MASK)
> #include <fenv-softfloat.h>
>
> #else /* ARM_HARD_FLOAT */
>
70,73d85
< #else
< #define __rfs(__fpsr)
< #define __wfs(__fpsr)
< #endif
220a233,234
> #endif /* ARM_HARD_FLOAT */
>