From: Wilco Dijkstra <wdijkstr@arm.com>
Date: Fri, 24 Oct 2014 13:06:04 +0000 (+0000)
Subject: Cleanup fedisableexcept to use the same logic as the ARM version. No functional changes.
X-Git-Tag: glibc-2.21~467
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a84f1a6516e3b22507f9c03fbd36a5559c3df94;p=thirdparty%2Fglibc.git

Cleanup fedisableexcept to use the same logic as the ARM version. No functional changes.
---

diff --git a/ChangeLog b/ChangeLog
index fa7bcf32efb..ea29be22913 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 c43335c4e5d..1ea6e1040c0 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;
 }