diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-03-21 18:21:13 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-03-21 18:21:13 +0000 |
| commit | 1ca2d03e3e4c8b27a666676bb5b92e6f5d6f2a07 (patch) | |
| tree | 51dff15c7cbd9b0cbc5ca69c8b7483e6e7668954 | |
| parent | f7be737659813220e1f29c8850c386a9654d549a (diff) | |
| download | glibc-1ca2d03e3e4c8b27a666676bb5b92e6f5d6f2a07.tar.gz glibc-1ca2d03e3e4c8b27a666676bb5b92e6f5d6f2a07.tar.xz glibc-1ca2d03e3e4c8b27a666676bb5b92e6f5d6f2a07.zip | |
Fix -Wundef warnings for _ABI* on MIPS.
This patch fixes -Wundef warnings related to the _ABI* macros on MIPS. GCC predefines only the _ABI* macro related to the ABI actually in use, meaning that a conditional such as "#if _MIPS_SIM == _ABI64" is true only for the ABI in question (all the macros are nonzero), but produces a -Wundef warning for the other ABIs. The normal approach to using these macros is to include <sgidefs.h>, which ensures that all three _ABI* macros are defined rather than just one; this patch does so in the places that caused warnings (the bulk of the warnings arising from <bits/wordsize.h>). Tested that the warnings are fixed. * sysdeps/mips/bits/wordsize.h: Include <sgidefs.h>. * sysdeps/unix/sysv/linux/mips/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/mips/setrlimit64.c: Likewise.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/mips/bits/wordsize.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/getrlimit64.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/setrlimit64.c | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index e3601495d0..720183f4f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-03-21 Joseph Myers <joseph@codesourcery.com> + * sysdeps/mips/bits/wordsize.h: Include <sgidefs.h>. + * sysdeps/unix/sysv/linux/mips/getrlimit64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/setrlimit64.c: Likewise. + [BZ #16731] * sysdeps/i386/fpu/e_log.S (__ieee754_log): Take absolute value when x - 1 is zero. diff --git a/sysdeps/mips/bits/wordsize.h b/sysdeps/mips/bits/wordsize.h index 3f05c7d652..2c29d8181f 100644 --- a/sysdeps/mips/bits/wordsize.h +++ b/sysdeps/mips/bits/wordsize.h @@ -15,6 +15,8 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ +#include <sgidefs.h> + #define __WORDSIZE _MIPS_SZPTR #if _MIPS_SIM == _ABI64 # define __WORDSIZE_TIME64_COMPAT32 1 diff --git a/sysdeps/unix/sysv/linux/mips/getrlimit64.c b/sysdeps/unix/sysv/linux/mips/getrlimit64.c index f3b3331228..b4a449b57d 100644 --- a/sysdeps/unix/sysv/linux/mips/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/mips/getrlimit64.c @@ -15,6 +15,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#include <sgidefs.h> + #if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32 # include <shlib-compat.h> diff --git a/sysdeps/unix/sysv/linux/mips/setrlimit64.c b/sysdeps/unix/sysv/linux/mips/setrlimit64.c index 73d60950f2..26bf13854d 100644 --- a/sysdeps/unix/sysv/linux/mips/setrlimit64.c +++ b/sysdeps/unix/sysv/linux/mips/setrlimit64.c @@ -15,6 +15,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#include <sgidefs.h> #if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32 |