summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2014-10-24 12:59:44 +0000
committerWilco Dijkstra <wdijkstr@arm.com>2014-10-24 13:03:09 +0000
commite226de337216d54c1aa3b90c4b960a72a223eba6 (patch)
tree29adc8c640fe408c519c315d3f29c52a50f2c212
parent6e3d8ed3605e845274e29aa3b62a1dfb7f420353 (diff)
downloadglibc-e226de337216d54c1aa3b90c4b960a72a223eba6.tar.gz
glibc-e226de337216d54c1aa3b90c4b960a72a223eba6.tar.xz
glibc-e226de337216d54c1aa3b90c4b960a72a223eba6.zip
Cleanup fesetexceptflag to use the same logic as the ARM version. No functional changes.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/aarch64/fpu/fsetexcptflg.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87fbfd86e5..bcf4636b0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,11 @@
 2014-10-23  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* sysdeps/aarch64/fpu/fsetexcptflg.c (fsetexceptflag):
+	Cleanup logic.
+
+2014-10-23  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* sysdeps/aarch64/fpu/fsetexcptflg.c (fsetexceptflag):
 	Remove unused include.
 
 2014-10-23  Wilco Dijkstra  <wdijkstr@arm.com>
diff --git a/sysdeps/aarch64/fpu/fsetexcptflg.c b/sysdeps/aarch64/fpu/fsetexcptflg.c
index 316fbd68b7..77e6cae9ed 100644
--- a/sysdeps/aarch64/fpu/fsetexcptflg.c
+++ b/sysdeps/aarch64/fpu/fsetexcptflg.c
@@ -27,10 +27,11 @@ fesetexceptflag (const fexcept_t *flagp, int excepts)
 
   /* Get the current environment.  */
   _FPU_GETFPSR (fpsr);
+  excepts &= FE_ALL_EXCEPT;
 
   /* Set the desired exception mask.  */
-  fpsr_new = fpsr & ~(excepts & FE_ALL_EXCEPT);
-  fpsr_new |= (*flagp & excepts & FE_ALL_EXCEPT);
+  fpsr_new = fpsr & ~excepts;
+  fpsr_new |= *flagp & excepts;
 
   /* Save state back to the FPU.  */
   if (fpsr != fpsr_new)