about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-02-16 22:25:02 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-02-16 22:25:02 +0000
commitbe802953a103bfd502d696f1418e2bef1b450be2 (patch)
tree5be8df139f9f155b594f81fcbf03a89320cc89ef
parente5e72fe9cd17857c198020e847b253045d957e72 (diff)
downloadglibc-be802953a103bfd502d696f1418e2bef1b450be2.tar.gz
glibc-be802953a103bfd502d696f1418e2bef1b450be2.tar.xz
glibc-be802953a103bfd502d696f1418e2bef1b450be2.zip
Fix MIPS _ABIO64 -Werror=undef build.
I see an error

../sysdeps/mips/memcpy.S:209:68: error: "_ABIO64" is not defined [-Werror=undef]
 #if defined(_MIPS_SIM) && ((_MIPS_SIM == _ABIO32) || (_MIPS_SIM == _ABIO64))
                                                                    ^
cc1: some warnings being treated as errors

in MIPS builds.  This patch arranges for _ABIO64 to be defined with
the same value as GCC uses when building for O64 (the ABI itself isn't
supported by glibc, but defining the macro seems the simplest way of
avoiding the error in code that may be shared with other C libraries).

	* sysdeps/mips/sgidefs.h [!_ABIO64] (_ABIO64): New macro.
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/mips/sgidefs.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b7926c458a..c09d9f8148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-02-16  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/mips/sgidefs.h [!_ABIO64] (_ABIO64): New macro.
+
 	* sysdeps/mips/memcpy.S [_COMPILING_NEWLIB]: Change condition to
 	[defined _COMPILING_NEWLIB].
 	* sysdeps/mips/memset.S [_COMPILING_NEWLIB]: Likewise.
diff --git a/sysdeps/mips/sgidefs.h b/sysdeps/mips/sgidefs.h
index 1a9f7b0311..9fb3b37d48 100644
--- a/sysdeps/mips/sgidefs.h
+++ b/sysdeps/mips/sgidefs.h
@@ -69,4 +69,8 @@
 #endif
 #define _MIPS_SIM_ABI64		_ABI64
 
+#ifndef _ABIO64
+# define _ABIO64		4
+#endif
+
 #endif /* sgidefs.h */