summary refs log tree commit diff
path: root/sysdeps/arm/feenablxcpt.c
diff options
context:
space:
mode:
authorMarcus Shawcroft <marcus.shawcroft@arm.com>2014-05-19 09:08:59 +0100
committerMarcus Shawcroft <marcus.shawcroft@arm.com>2014-05-19 09:08:59 +0100
commit18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4 (patch)
tree92b5d3167160de1067a52ba0fec81393f8e196cf /sysdeps/arm/feenablxcpt.c
parent834caf06f33d79be54cff63c274fba2845513593 (diff)
downloadglibc-18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4.tar.gz
glibc-18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4.tar.xz
glibc-18f8524d2cf5e9f699055ed2c2cdeb56cd3b4cc4.zip
Revert "ARM: Improve fenv implementation"
This reverts commit c0c08d02c82275353f5c556f935a1a01714d9d7f.
Diffstat (limited to 'sysdeps/arm/feenablxcpt.c')
-rw-r--r--sysdeps/arm/feenablxcpt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/arm/feenablxcpt.c b/sysdeps/arm/feenablxcpt.c
index e649b2f1e1..afd8943638 100644
--- a/sysdeps/arm/feenablxcpt.c
+++ b/sysdeps/arm/feenablxcpt.c
@@ -35,15 +35,15 @@ feenableexcept (int excepts)
   excepts &= FE_ALL_EXCEPT;
   new_fpscr = fpscr | (excepts << FE_EXCEPT_SHIFT);
 
-  if (new_fpscr != fpscr)
-    {
-      _FPU_SETCW (new_fpscr);
+  _FPU_SETCW (new_fpscr);
 
+  if (excepts != 0)
+    {
       /* Not all VFP architectures support trapping exceptions, so
 	 test whether the relevant bits were set and fail if not.  */
       _FPU_GETCW (new_fpscr);
-
-      if (((new_fpscr >> FE_EXCEPT_SHIFT) & excepts) != excepts)
+      if ((new_fpscr & (excepts << FE_EXCEPT_SHIFT))
+	  != (excepts << FE_EXCEPT_SHIFT))
 	return -1;
     }