GNU C Library master sources branch master updated. glibc-2.20-117-ga7b00c1

[wilco at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3 (commit)
       via  3a84f1a6516e3b22507f9c03fbd36a5559c3df94 (commit)
      from  ea9a7c8b066accc408402fc00c946db7d8eb9764 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3

commit a7b00c110132b4cb64a7f6b7b23a1c0ebbe54cd3
Author: Wilco Dijkstra <wdijkstr@arm.com>
Date:   Fri Oct 24 13:07:17 2014 +0000

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

diff --git a/ChangeLog b/ChangeLog
index ea29be2..2302d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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):
 	Simplify logic.
 
diff --git a/sysdeps/aarch64/fpu/feenablxcpt.c b/sysdeps/aarch64/fpu/feenablxcpt.c
index 70e413c..763248f 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;
 }

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3a84f1a6516e3b22507f9c03fbd36a5559c3df94

commit 3a84f1a6516e3b22507f9c03fbd36a5559c3df94
Author: Wilco Dijkstra <wdijkstr@arm.com>
Date:   Fri Oct 24 13:06:04 2014 +0000

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

diff --git a/ChangeLog b/ChangeLog
index fa7bcf3..ea29be2 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 c43335c..1ea6e10 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;
 }

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |   10 ++++++++++
 sysdeps/aarch64/fpu/fedisblxcpt.c |    7 +------
 sysdeps/aarch64/fpu/feenablxcpt.c |    7 +------
 3 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources