From 4841e6a6c2fa691201fb52dfaf6b6a8920229bac Mon Sep 17 00:00:00 2001 From: Wilco Date: Tue, 24 Jun 2014 11:04:31 +0000 Subject: Use libc calls defined by fenv_private.h to implement several fenv functions rather than duplicating functionality. To make this work for softfp builds, ensure functions in fenv_private are not conditionally compiled. 2014-06-24 Wilco * sysdeps/arm/fegetround.c (fegetround): Call get_rounding_mode. * sysdeps/arm/feholdexcpt.c (feholdexcept): Call libc_feholdexcept_vfp. * sysdeps/arm/fesetround.c (fesetround): Call libc_fesetround_vfp. * sysdeps/arm/fgetexcptflg.c (fegetexceptflag): Call libc_fetestexcept_vfp. * sysdeps/arm/ftestexcept.c (fetestexcept): Call libc_fetestexcept_vfp. * sysdeps/arm/fenv_private.h: Move libc_*_vfp functions outside of __SOFTFP__ ifdef so that they can be built for softfp. --- sysdeps/arm/feholdexcpt.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'sysdeps/arm/feholdexcpt.c') diff --git a/sysdeps/arm/feholdexcpt.c b/sysdeps/arm/feholdexcpt.c index 258ba6637f..2d79e0c46d 100644 --- a/sysdeps/arm/feholdexcpt.c +++ b/sysdeps/arm/feholdexcpt.c @@ -16,30 +16,18 @@ License along with the GNU C Library. If not, see . */ -#include -#include +#include #include int feholdexcept (fenv_t *envp) { - fpu_control_t fpscr; - /* Fail if a VFP unit isn't present. */ if (!ARM_HAVE_VFP) return 1; - _FPU_GETCW (fpscr); - envp->__cw = fpscr; - - /* Now set all exceptions to non-stop. */ - fpscr &= ~(FE_ALL_EXCEPT << FE_EXCEPT_SHIFT); - - /* And clear all exception flags. */ - fpscr &= ~FE_ALL_EXCEPT; - - _FPU_SETCW (fpscr); + libc_feholdexcept_vfp (envp); return 0; } -- cgit v1.2.3