aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2014-10-24 13:06:04 +0000
committerWilco Dijkstra <wdijkstr@arm.com>2014-10-24 13:06:04 +0000
commit3a84f1a6516e3b22507f9c03fbd36a5559c3df94 (patch)
tree953550cbdddaa55e4dbaa0e9b9299eabc5f79981
parentea9a7c8b066accc408402fc00c946db7d8eb9764 (diff)
downloadglibc-3a84f1a6516e3b22507f9c03fbd36a5559c3df94.tar
glibc-3a84f1a6516e3b22507f9c03fbd36a5559c3df94.tar.gz
glibc-3a84f1a6516e3b22507f9c03fbd36a5559c3df94.tar.bz2
glibc-3a84f1a6516e3b22507f9c03fbd36a5559c3df94.zip
Cleanup fedisableexcept to use the same logic as the ARM version. No functional changes.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/aarch64/fpu/fedisblxcpt.c7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fa7bcf32ef..ea29be2291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-24 Wilco Dijkstra <wdijkstr@arm.com>
+
+ * sysdeps/aarch64/fpu/fedisblxcpt.c (fedisableexcept):
+ Simplify logic.
+
2014-10-24 Joseph Myers <joseph@codesourcery.com>
[BZ #14138]
diff --git a/sysdeps/aarch64/fpu/fedisblxcpt.c b/sysdeps/aarch64/fpu/fedisblxcpt.c
index c43335c4e5..1ea6e1040c 100644
--- a/sysdeps/aarch64/fpu/fedisblxcpt.c
+++ b/sysdeps/aarch64/fpu/fedisblxcpt.c
@@ -24,18 +24,13 @@ fedisableexcept (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)
_FPU_SETCW (fpcr_new);
- return original_excepts;
+ return (fpcr >> FE_EXCEPT_SHIFT) & FE_ALL_EXCEPT;
}