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

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

diff --git a/ChangeLog b/ChangeLog
index ea29be22913..2302d7ef5e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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):
diff --git a/sysdeps/aarch64/fpu/feenablxcpt.c b/sysdeps/aarch64/fpu/feenablxcpt.c
index 70e413c9f6c..763248f4e18 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;
 }