This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-81-ge5e72fe
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 Feb 2015 22:19:36 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-81-ge5e72fe
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 e5e72fe9cd17857c198020e847b253045d957e72 (commit)
from 86c56b164ced14cadd054a37613fbddf896194da (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=e5e72fe9cd17857c198020e847b253045d957e72
commit e5e72fe9cd17857c198020e847b253045d957e72
Author: Joseph Myers <joseph@codesourcery.com>
Date: Mon Feb 16 22:18:53 2015 +0000
Fix MIPS _COMPILING_NEWLIB -Werror=undef build.
I see an error
../sysdeps/mips/strcmp.S:25:7: error: "_COMPILING_NEWLIB" is not defined [-Werror=undef]
#elif _COMPILING_NEWLIB
^
cc1: some warnings being treated as errors
in MIPS builds. (This is with GCC 4.9; it's possible that the DR#412
change in GCC 5 - see
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60570> - means that
-Wundef diagnostics no longer occur for #elif conditions where a
previous group's condition was true, just as with other errors there.)
This patch duly adjusts the conditionals to test whether
_COMPILING_NEWLIB is defined.
* sysdeps/mips/memcpy.S [_COMPILING_NEWLIB]: Change condition to
[defined _COMPILING_NEWLIB].
* sysdeps/mips/memset.S [_COMPILING_NEWLIB]: Likewise.
* sysdeps/mips/strcmp.S [_COMPILING_NEWLIB]: Likewise.
diff --git a/ChangeLog b/ChangeLog
index d4a72d8..b7926c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2015-02-16 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/mips/memcpy.S [_COMPILING_NEWLIB]: Change condition to
+ [defined _COMPILING_NEWLIB].
+ * sysdeps/mips/memset.S [_COMPILING_NEWLIB]: Likewise.
+ * sysdeps/mips/strcmp.S [_COMPILING_NEWLIB]: Likewise.
+
* sysdeps/mips/sys/asm.h [__mips_isa_rev < 6]: Change condition to
[!defined __mips_isa_rev || __mips_isa_rev < 6].
diff --git a/sysdeps/mips/memcpy.S b/sysdeps/mips/memcpy.S
index 715abcf..a9ac059 100644
--- a/sysdeps/mips/memcpy.S
+++ b/sysdeps/mips/memcpy.S
@@ -27,7 +27,7 @@
# include <sys/asm.h>
# define PREFETCH_LOAD_HINT PREFETCH_HINT_LOAD_STREAMED
# define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
-#elif _COMPILING_NEWLIB
+#elif defined _COMPILING_NEWLIB
# include "machine/asm.h"
# include "machine/regdef.h"
# define PREFETCH_LOAD_HINT PREFETCH_HINT_LOAD_STREAMED
diff --git a/sysdeps/mips/memset.S b/sysdeps/mips/memset.S
index 940a225..cf16b26 100644
--- a/sysdeps/mips/memset.S
+++ b/sysdeps/mips/memset.S
@@ -24,7 +24,7 @@
# include <regdef.h>
# include <sys/asm.h>
# define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
-#elif _COMPILING_NEWLIB
+#elif defined _COMPILING_NEWLIB
# include "machine/asm.h"
# include "machine/regdef.h"
# define PREFETCH_STORE_HINT PREFETCH_HINT_PREPAREFORSTORE
diff --git a/sysdeps/mips/strcmp.S b/sysdeps/mips/strcmp.S
index 66fe06c..7ba79e7 100644
--- a/sysdeps/mips/strcmp.S
+++ b/sysdeps/mips/strcmp.S
@@ -22,7 +22,7 @@
# include <sysdep.h>
# include <regdef.h>
# include <sys/asm.h>
-#elif _COMPILING_NEWLIB
+#elif defined _COMPILING_NEWLIB
# include "machine/asm.h"
# include "machine/regdef.h"
#else
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/mips/memcpy.S | 2 +-
sysdeps/mips/memset.S | 2 +-
sysdeps/mips/strcmp.S | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources