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

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

diff --git a/ChangeLog b/ChangeLog
index bcf4636b0f9..fa7bcf32efb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,11 @@
 	(lchown): Likewise.
 	(fchown): Likewise.
 
+2014-10-23  Wilco Dijkstra  <wdijkstr@arm.com>
+
+	* sysdeps/aarch64/fpu/fclrexcpt.c (feclearexcept):
+	Simplify logic.
+
 2014-10-23  Wilco Dijkstra  <wdijkstr@arm.com>
 
 	* sysdeps/aarch64/fpu/fsetexcptflg.c (fsetexceptflag):
diff --git a/sysdeps/aarch64/fpu/fclrexcpt.c b/sysdeps/aarch64/fpu/fclrexcpt.c
index b24f0ffbbc2..4471373237b 100644
--- a/sysdeps/aarch64/fpu/fclrexcpt.c
+++ b/sysdeps/aarch64/fpu/fclrexcpt.c
@@ -28,7 +28,7 @@ feclearexcept (int excepts)
   excepts &= FE_ALL_EXCEPT;
 
   _FPU_GETFPSR (fpsr);
-  fpsr_new = (fpsr & ~FE_ALL_EXCEPT) | (fpsr & FE_ALL_EXCEPT & ~excepts);
+  fpsr_new = fpsr & ~excepts;
 
   if (fpsr != fpsr_new)
     _FPU_SETFPSR (fpsr_new);