xstat: only check to see if __ASSUME_ST_INO_64_BIT is defined

We define __ASSUME_ST_INO_64_BIT by default for Linux targets, and then
undef it for alpha/sh targets.  But the code that uses it looks at its
value (as 0/1) rather than whether it's defined (like all other assume
knobs).  Change the code to see if it's defined to fix build Wundef build
errors for alpha/sh.

diff --git a/ChangeLog b/ChangeLog
index d7dd24bfc4d9761d7f4d3fcfa93fcf3445e09af3..a3c4d8ef1237e6edc51b66e2eca0a8f907fa06c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2016-01-06  Paul Eggert  <eggert@cs.ucla.edu>
+2016-01-07  Mike Frysinger  <vapier@gentoo.org>
+
+       * sysdeps/unix/sysv/linux/fxstat64.c (___fxstat64): Change
+       __ASSUME_ST_INO_64_BIT == 0 to !defined __ASSUME_ST_INO_64_BIT.
+       * sysdeps/unix/sysv/linux/lxstat64.c (___lxstat64): Likewise.
+       * sysdeps/unix/sysv/linux/xstat64.c (___xstat64): Likewise.
+       * sysdeps/unix/sysv/linux/xstatconv.c (__xstat32_conv): Likewise.
+
+2016-01-07  Paul Eggert  <eggert@cs.ucla.edu>
            Joseph Myers  <joseph@codesourcery.com>
 
        * timezone/private.h: Update from tzcode 2015g.

diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index d48355fdc95e26090746a1e26fdcb7f420e7729d..5468dd6c6089f4778641886ea628febb9975dfed 100644 (file)
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -33,7 +33,7 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf)
 {
   int result;
   result = INLINE_SYSCALL (fstat64, 2, fd, buf);
-#if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0
+#if defined _HAVE_STAT64___ST_INO && !defined __ASSUME_ST_INO_64_BIT
   if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
     buf->st_ino = buf->__st_ino;
 #endif

diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index 581f0e8a8790a7821d314df4ba5c6972b1c888e9..09a678a3a93f5495f1ae62bda2951ec82d1b468e 100644 (file)
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -32,7 +32,7 @@ ___lxstat64 (int vers, const char *name, struct stat64 *buf)
 {
   int result;
   result = INLINE_SYSCALL (lstat64, 2, name, buf);
-#if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0
+#if defined _HAVE_STAT64___ST_INO && !defined __ASSUME_ST_INO_64_BIT
   if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
     buf->st_ino = buf->__st_ino;
 #endif

diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index 0a29544f347953c6c0e39fec9249229928930285..2075383ddfe4803d3b14b368d3d3d0125dba2748 100644 (file)
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -33,7 +33,7 @@ ___xstat64 (int vers, const char *name, struct stat64 *buf)
 {
   int result;
   result = INLINE_SYSCALL (stat64, 2, name, buf);
-#if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0
+#if defined _HAVE_STAT64___ST_INO && !defined __ASSUME_ST_INO_64_BIT
   if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino)
     buf->st_ino = buf->__st_ino;
 #endif

diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
index 9d775f6ca995cac8dda068cba55ec133edd9d57b..c5fbf3d8bf4c08a2130c4573b0fe8deb231db350 100644 (file)
--- a/sysdeps/unix/sysv/linux/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/xstatconv.c
@@ -190,7 +190,7 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
        buf->__pad1 = 0;
 #endif
 #ifdef _HAVE_STAT64___ST_INO
-# if __ASSUME_ST_INO_64_BIT == 0
+# ifndef __ASSUME_ST_INO_64_BIT
        if (kbuf->st_ino == 0)
          buf->st_ino = kbuf->__st_ino;
        else