summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2014-10-24 13:07:17 +0000
committerWilco Dijkstra <wdijkstr@arm.com>2014-10-24 13:07:17 +0000
commita7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3 (patch)
tree1b3e38b674587e4acb75d693fb5703aed8cc4788
parent3a84f1a6516e3b22507f9c03fbd36a5559c3df94 (diff)
downloadglibc-a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3.tar.gz
glibc-a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3.tar.xz
glibc-a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3.zip
Cleanup feenableexcept to use the same logic as the ARM version. No functional changes.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/aarch64/fpu/feenablxcpt.c7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ea29be2291..2302d7ef5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-10-24  Wilco Dijkstra  <wdijkstr@arm.com>
 
+	* sysdeps/aarch64/fpu/feenablxcpt.c (feenableexcept):
+	Simplify logic.
+
+2014-10-24  Wilco Dijkstra  <wdijkstr@arm.com>
+
 	* sysdeps/aarch64/fpu/fedisblxcpt.c (fedisableexcept):
 	Simplify logic.
 
diff --git a/sysdeps/aarch64/fpu/feenablxcpt.c b/sysdeps/aarch64/fpu/feenablxcpt.c
index 70e413c9f6..763248f4e1 100644
--- a/sysdeps/aarch64/fpu/feenablxcpt.c
+++ b/sysdeps/aarch64/fpu/feenablxcpt.c
@@ -24,14 +24,9 @@ feenableexcept (int excepts)
 {
   fpu_control_t fpcr;
   fpu_control_t fpcr_new;
-  int original_excepts;
 
   _FPU_GETCW (fpcr);
-
-  original_excepts = (fpcr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
-
   excepts &= FE_ALL_EXCEPT;
-
   fpcr_new = fpcr | (excepts << FE_EXCEPT_SHIFT);
 
   if (fpcr != fpcr_new)
@@ -50,5 +45,5 @@ feenableexcept (int excepts)
 	return -1;
     }
 
-  return original_excepts;
+  return (fpcr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
 }