Revert "ARM: Improve fenv implementation"

This reverts commit c0c08d02c82275353f5c556f935a1a01714d9d7f.

1 files changed, 8 insertions, 16 deletions

diff --git a/sysdeps/arm/feupdateenv.c b/sysdeps/arm/feupdateenv.c
index 2a7b3ec894..55a15025c6 100644
--- a/sysdeps/arm/feupdateenv.c
+++ b/sysdeps/arm/feupdateenv.c
@@ -17,35 +17,27 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <fenv_private.h>
+#include <fenv.h>
+#include <fpu_control.h>
 #include <arm-features.h>
 
 
 int
 feupdateenv (const fenv_t *envp)
 {
-  fenv_t fenv;
+  fpu_control_t fpscr;
 
   /* Fail if a VFP unit isn't present.  */
   if (!ARM_HAVE_VFP)
     return 1;
 
-  if ((envp == FE_DFL_ENV) || (envp == FE_NOMASK_ENV))
-    {
-      fpu_control_t fpscr;
+  _FPU_GETCW (fpscr);
 
-      _FPU_GETCW (fpscr);
+  /* Install new environment.  */
+  fesetenv (envp);
 
-      /* Preserve the reserved FPSCR flags.  */
-      fpscr &= _FPU_RESERVED;
-      fpscr |= (envp == FE_DFL_ENV) ? _FPU_DEFAULT : _FPU_IEEE;
-
-      /* Create a valid fenv to pass to libc_feupdateenv_vfp.  */
-      fenv.__cw = fpscr;
-      envp = &fenv;
-    }
-
-  libc_feupdateenv_vfp (envp);
+  /* Raise the saved exceptions.  */
+  feraiseexcept (fpscr & FE_ALL_EXCEPT);
   return 0;
 }
 libm_hidden_def (feupdateenv)