Allow [f]statfs64 to alias [f]statfs
Commit Message
On Thu, 2016-11-17 at 09:53 +0100, Andreas Schwab wrote:
>
> Since it is a new symbol it should follow the policy of always being
> defined.
>
> >
> > * sysdeps/unix/sysv/linux/fstatfs64.c: Make __fstatfs and
> > fstatfs
> > aliases of __fstatfs64 if __STATFS_IS_STATFS64 is set.
> > * sysdeps/unix/sysv/linux/statfs64.c: Ditto for __statfs, statfs,
> > and __statfs64.
> > * sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c: Do not
> > define __fstatfs and fstatfs if __STATFS_IS_STATFS64 is set.
> > * sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c: Ditto
> > for __statfs and statfs.
> It's STATFS_IS_STATFS64, not __STATFS_IS_STATFS64.
>
> Andreas.
Here is my updated patch, retested on x86 and aarch64. It defines
STATFS_IS_STATFS64 to 0 on all platforms, when the ILP32 aarch code is
checked in it will have a new kernel_stat.h file and that will set it
to 1. I also fixed and upated the ChangeLog entry.
Steve Ellcey
sellcey@caviumnetworks.com
2016-11-21 Steve Ellcey <sellcey@caviumnetworks.com>
* sysdeps/unix/sysv/linux/fstatfs64.c: Hide prototypes for fstatfs
and __fstatfs. Make them aliases of __fstatfs64 if
STATFS_IS_STATFS64 is set to non-zero.
* sysdeps/unix/sysv/linux/statfs64.c: Ditto for __statfs, statfs,
and __statfs64.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c: Do not
define __fstatfs and fstatfs if STATFS_IS_STATFS64 is non-zero.
* sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c: Ditto
for __statfs and statfs.
* sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Set STATFS_IS_STATFS64
to 0.
* sysdeps/unix/sysv/linux/generic/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/ia64/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/microblaze/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/mips/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/x86_64/kernel_stat.h: Ditto.
Comments
On Nov 21 2016, Steve Ellcey <sellcey@caviumnetworks.com> wrote:
> 2016-11-21 Steve Ellcey <sellcey@caviumnetworks.com>
>
> * sysdeps/unix/sysv/linux/fstatfs64.c: Hide prototypes for fstatfs
> and __fstatfs. Make them aliases of __fstatfs64 if
> STATFS_IS_STATFS64 is set to non-zero.
> * sysdeps/unix/sysv/linux/statfs64.c: Ditto for __statfs, statfs,
> and __statfs64.
> * sysdeps/unix/sysv/linux/generic/wordsize-32/fstatfs.c: Do not
> define __fstatfs and fstatfs if STATFS_IS_STATFS64 is non-zero.
> * sysdeps/unix/sysv/linux/generic/wordsize-32/statfs.c: Ditto
> for __statfs and statfs.
> * sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Set STATFS_IS_STATFS64
> to 0.
> * sysdeps/unix/sysv/linux/generic/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/ia64/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/microblaze/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/mips/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/powerpc/powerpc64/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/s390/s390-64/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Ditto.
> * sysdeps/unix/sysv/linux/x86_64/kernel_stat.h: Ditto.
Ok.
Andreas.
I'm seeing a build failure for alpha with build-many-glibcs.py that seems
likely related to this change:
/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc/libc_pic.os: In function `__statfs64':
/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc-src/io/../sysdeps/unix/sysv/linux/statfs64.c:65: undefined reference to `__GI___statfs_disable'
/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc/libc_pic.os: In function `__fstatfs64':
/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc-src/io/../sysdeps/unix/sysv/linux/fstatfs64.c:63: undefined reference to `__fstatfs_disable'
/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc-src/io/../sysdeps/unix/sysv/linux/fstatfs64.c:63: undefined reference to `__fstatfs_disable'
collect2: error: ld returned 1 exit status
../Makerules:703: recipe for target '/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc/libc.so' failed
On Wed, 2016-11-23 at 00:01 +0000, Joseph Myers wrote:
> I'm seeing a build failure for alpha with build-many-glibcs.py that
> seems
> likely related to this change:
>
> /scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-
> gnu/glibc/libc_pic.os: In function `__statfs64':
> /scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc-
> src/io/../sysdeps/unix/sysv/linux/statfs64.c:65: undefined reference
> to `__GI___statfs_disable'
> /scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-
> gnu/glibc/libc_pic.os: In function `__fstatfs64':
> /scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc-
> src/io/../sysdeps/unix/sysv/linux/fstatfs64.c:63: undefined reference
> to `__fstatfs_disable'
> /scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-gnu/glibc-
> src/io/../sysdeps/unix/sysv/linux/fstatfs64.c:63: undefined reference
> to `__fstatfs_disable'
> collect2: error: ld returned 1 exit status
> ../Makerules:703: recipe for target
> '/scratch/jmyers/glibc/many6/build/glibcs/alpha-linux-
> gnu/glibc/libc.so' failed
Yes, this is due to my patch. I have reproduced the problem and am
working on a patch. I failed to notice that on alpha, the only
platform where __ASSUME_STATFS64 is 0, __statfs64 will call __statfs
and if we have renamed __statfs with a define to __statfs_disable then
it breaks. I am looking at putting the define under '#if
STATFS_IS_STATFS64', but I can't do that until after I have included
kernel_stat.h and I have to do it before including sys/stat.h for the
define to have any effect. Hopefully that will fix things, but I am
still testing.
Steve Ellcey
sellcey@caviumnetworks.com
@@ -86,3 +86,4 @@ struct glibc21_stat
};
#define XSTAT_IS_XSTAT64 1
+#define STATFS_IS_STATFS64 0
@@ -16,9 +16,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* Hide the prototypes for __fstatfs and fstatfs so that GCC will not
+ complain about the different function signatures if they are aliased
+ to __fstat64. If STATFS_IS_STATFS64 is not zero then the statfs and
+ statfs64 structures have an identical layout but different type names. */
+
+#define __fstatfs __fstatfs_disable
+#define fstatfs fstatfs_disable
+
#include <errno.h>
#include <string.h>
#include <sys/statfs.h>
+#include <kernel_stat.h>
#include <stddef.h>
#include <sysdep.h>
#include <kernel-features.h>
@@ -70,3 +79,11 @@ __fstatfs64 (int fd, struct statfs64 *buf)
#endif
}
weak_alias (__fstatfs64, fstatfs64)
+
+#undef __fstatfs
+#undef fstatfs
+
+#if STATFS_IS_STATFS64
+weak_alias (__fstatfs64, __fstatfs)
+weak_alias (__fstatfs64, fstatfs)
+#endif
@@ -26,3 +26,5 @@
#else
# define XSTAT_IS_XSTAT64 0
#endif
+
+#define STATFS_IS_STATFS64 0
@@ -18,8 +18,10 @@
#include <errno.h>
#include <sys/statfs.h>
+#include <kernel_stat.h>
#include <stddef.h>
+#if !STATFS_IS_STATFS64
#include "overflow.h"
/* Return information about the filesystem on which FD resides. */
@@ -30,3 +32,4 @@ __fstatfs (int fd, struct statfs *buf)
return rc ?: statfs_overflow (buf);
}
weak_alias (__fstatfs, fstatfs)
+#endif
@@ -18,8 +18,10 @@
#include <errno.h>
#include <sys/statfs.h>
+#include <kernel_stat.h>
#include <stddef.h>
+#if !STATFS_IS_STATFS64
#include "overflow.h"
/* Return information about the filesystem on which FILE resides. */
@@ -31,3 +33,4 @@ __statfs (const char *file, struct statfs *buf)
}
libc_hidden_def (__statfs)
weak_alias (__statfs, statfs)
+#endif
@@ -31,3 +31,4 @@ struct kernel_stat {
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0
+#define STATFS_IS_STATFS64 0
@@ -18,3 +18,4 @@
#define STAT_IS_KERNEL_STAT 1
#define XSTAT_IS_XSTAT64 1
+#define STATFS_IS_STATFS64 0
@@ -35,3 +35,4 @@ struct kernel_stat
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0
+#define STATFS_IS_STATFS64 0
@@ -49,3 +49,4 @@ struct kernel_stat
};
#define XSTAT_IS_XSTAT64 0
+#define STATFS_IS_STATFS64 0
@@ -57,3 +57,4 @@ struct kernel_stat
#endif
#define XSTAT_IS_XSTAT64 0
+#define STATFS_IS_STATFS64 0
@@ -48,3 +48,4 @@ struct kernel_stat
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0
+#define STATFS_IS_STATFS64 0
@@ -18,3 +18,4 @@
#define STAT_IS_KERNEL_STAT 1
#define XSTAT_IS_XSTAT64 1
+#define STATFS_IS_STATFS64 0
@@ -18,3 +18,4 @@
#define STAT_IS_KERNEL_STAT 1
#define XSTAT_IS_XSTAT64 1
+#define STATFS_IS_STATFS64 0
@@ -32,3 +32,4 @@ struct kernel_stat
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0
+#define STATFS_IS_STATFS64 0
@@ -45,3 +45,4 @@ struct kernel_stat64
};
#define XSTAT_IS_XSTAT64 1
+#define STATFS_IS_STATFS64 0
@@ -16,9 +16,18 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* Hide the prototypes for __statfs and statfs so that GCC will not
+ complain about the different function signatures if they are aliased
+ to __stat64. If STATFS_IS_STATFS64 is not zero then the statfs and
+ statfs64 structures have an identical layout but different type names. */
+
+#define __statfs __statfs_disable
+#define statfs statfs_disable
+
#include <errno.h>
#include <string.h>
#include <sys/statfs.h>
+#include <kernel_stat.h>
#include <stddef.h>
#include <sysdep.h>
#include <kernel-features.h>
@@ -72,3 +81,12 @@ __statfs64 (const char *file, struct statfs64 *buf)
#endif
}
weak_alias (__statfs64, statfs64)
+
+#undef __statfs
+#undef statfs
+
+#if STATFS_IS_STATFS64
+weak_alias (__statfs64, __statfs)
+weak_alias (__statfs64, statfs)
+libc_hidden_ver (__statfs64, __statfs)
+#endif
@@ -18,3 +18,4 @@
#define STAT_IS_KERNEL_STAT 1
#define XSTAT_IS_XSTAT64 1
+#define STATFS_IS_STATFS64 0