Always define XSTAT_IS_XSTAT64

* sysdeps/unix/sysv/linux/generic/kernel_stat.h: Set XSTAT_IS_XSTAT64
	to 0 when in 32 bit mode.
	* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Set XSTAT_IS_XSTAT64 to 0.
	* 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/sparc/sparc32/kernel_stat.h: Ditto.
	* sysdeps/unix/sysv/linux/fxstat.c: Replace #ifdef with #if on
	XSTAT_IS_XSTAT64 test.
	* sysdeps/unix/sysv/linux/fxstatat.c: Ditto.
	* sysdeps/unix/sysv/linux/generic/lxstat.c: Ditto.
	* sysdeps/unix/sysv/linux/generic/xstat.c: Ditto.
	* sysdeps/unix/sysv/linux/i386/fxstat.c: Ditto.
	* sysdeps/unix/sysv/linux/i386/fxstatat.c: Ditto.
	* sysdeps/unix/sysv/linux/i386/lxstat.c: Ditto.
	* sysdeps/unix/sysv/linux/i386/xstat.c: Ditto.
	* sysdeps/unix/sysv/linux/lxstat.c: Ditto.
	* sysdeps/unix/sysv/linux/mips/xstatconv.c: Ditto.
	* sysdeps/unix/sysv/linux/xstat.c: Ditto.
	* sysdeps/unix/sysv/linux/xstatconv.c: Ditto.
This commit is contained in:
Steve Ellcey 2016-11-21 08:23:12 -08:00
parent eb3c12c784
commit d2e1e97332
20 changed files with 51 additions and 13 deletions

View File

@ -1,3 +1,27 @@
2016-11-21 Steve Ellcey <sellcey@caviumnetworks.com>
* sysdeps/unix/sysv/linux/generic/kernel_stat.h: Set XSTAT_IS_XSTAT64
to 0 when in 32 bit mode.
* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Set XSTAT_IS_XSTAT64 to 0.
* 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/sparc/sparc32/kernel_stat.h: Ditto.
* sysdeps/unix/sysv/linux/fxstat.c: Replace #ifdef with #if on
XSTAT_IS_XSTAT64 test.
* sysdeps/unix/sysv/linux/fxstatat.c: Ditto.
* sysdeps/unix/sysv/linux/generic/lxstat.c: Ditto.
* sysdeps/unix/sysv/linux/generic/xstat.c: Ditto.
* sysdeps/unix/sysv/linux/i386/fxstat.c: Ditto.
* sysdeps/unix/sysv/linux/i386/fxstatat.c: Ditto.
* sysdeps/unix/sysv/linux/i386/lxstat.c: Ditto.
* sysdeps/unix/sysv/linux/i386/xstat.c: Ditto.
* sysdeps/unix/sysv/linux/lxstat.c: Ditto.
* sysdeps/unix/sysv/linux/mips/xstatconv.c: Ditto.
* sysdeps/unix/sysv/linux/xstat.c: Ditto.
* sysdeps/unix/sysv/linux/xstatconv.c: Ditto.
2016-11-19 Joseph Myers <joseph@codesourcery.com>
* math/bits/mathcalls.h [__GLIBC_USE (IEC_60559_BFP_EXT)]

View File

@ -54,7 +54,7 @@ __fxstat (int vers, int fd, struct stat *buf)
hidden_def (__fxstat)
weak_alias (__fxstat, _fxstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __fxstat64
strong_alias (__fxstat, __fxstat64);
hidden_ver (__fxstat, __fxstat64)

View File

@ -58,7 +58,7 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
err));
}
libc_hidden_def (__fxstatat)
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
# undef __fxstatat64
strong_alias (__fxstatat, __fxstatat64);
libc_hidden_def (__fxstatat64)

View File

@ -23,4 +23,6 @@
/* We provide separate 32-bit API versions that check for EOVERFLOW. */
#if __WORDSIZE == 64
# define XSTAT_IS_XSTAT64 1
#else
# define XSTAT_IS_XSTAT64 0
#endif

View File

@ -41,7 +41,7 @@ __lxstat (int vers, const char *name, struct stat *buf)
hidden_def (__lxstat)
weak_alias (__lxstat, _lxstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __lxstat64
strong_alias (__lxstat, __lxstat64);
hidden_ver (__lxstat, __lxstat64)

View File

@ -41,7 +41,7 @@ __xstat (int vers, const char *name, struct stat *buf)
hidden_def (__xstat)
weak_alias (__xstat, _xstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __xstat64
strong_alias (__xstat, __xstat64);
hidden_ver (__xstat, __xstat64)

View File

@ -29,3 +29,5 @@ struct kernel_stat {
#define _HAVE_STAT_NSEC
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0

View File

@ -54,7 +54,7 @@ __fxstat (int vers, int fd, struct stat *buf)
hidden_def (__fxstat)
weak_alias (__fxstat, _fxstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __fxstat64
strong_alias (__fxstat, __fxstat64);
hidden_ver (__fxstat, __fxstat64)

View File

@ -49,7 +49,7 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag)
return __xstat32_conv (vers, &st64, st);
}
libc_hidden_def (__fxstatat)
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
# undef __fxstatat64
strong_alias (__fxstatat, __fxstatat64);
libc_hidden_ver (__fxstatat, __fxstatat64)

View File

@ -55,7 +55,7 @@ __lxstat (int vers, const char *name, struct stat *buf)
hidden_def (__lxstat)
weak_alias (__lxstat, _lxstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __lxstat64
strong_alias (__lxstat, __lxstat64);
hidden_ver (__lxstat, __lxstat64)

View File

@ -54,7 +54,7 @@ __xstat (int vers, const char *name, struct stat *buf)
}
hidden_def (__xstat)
weak_alias (__xstat, _xstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
# undef __xstat64
strong_alias (__xstat, __xstat64);
hidden_ver (__xstat, __xstat64)

View File

@ -33,3 +33,5 @@ struct kernel_stat
#define _HAVE_STAT64___PAD2
#define _HAVE_STAT64___ST_INO
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0

View File

@ -53,7 +53,7 @@ __lxstat (int vers, const char *name, struct stat *buf)
hidden_def (__lxstat)
weak_alias (__lxstat, _lxstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __lxstat64
strong_alias (__lxstat, __lxstat64);
hidden_ver (__lxstat, __lxstat64)

View File

@ -47,3 +47,5 @@ struct kernel_stat
#define _HAVE_STAT___UNUSED5
#define _HAVE_STAT64___UNUSED5
};
#define XSTAT_IS_XSTAT64 0

View File

@ -55,3 +55,5 @@ struct kernel_stat
unsigned int st_gen;
};
#endif
#define XSTAT_IS_XSTAT64 0

View File

@ -91,7 +91,7 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
int
__xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
{
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
return xstat_conv (vers, kbuf, ubuf);
#else
switch (vers)

View File

@ -46,3 +46,5 @@ struct kernel_stat
#define _HAVE_STAT64___UNUSED5
#define _HAVE_STAT64___PAD2
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0

View File

@ -30,3 +30,5 @@ struct kernel_stat
#define _HAVE_STAT64___PAD2
#define _HAVE_STAT_NSEC
#define _HAVE_STAT64_NSEC
#define XSTAT_IS_XSTAT64 0

View File

@ -52,7 +52,7 @@ __xstat (int vers, const char *name, struct stat *buf)
}
hidden_def (__xstat)
weak_alias (__xstat, _xstat);
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
#undef __xstat64
strong_alias (__xstat, __xstat64);
hidden_ver (__xstat, __xstat64)

View File

@ -31,7 +31,7 @@ struct kernel_stat;
#include <string.h>
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
int
__xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
{
@ -106,7 +106,7 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
int
__xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
{
#ifdef XSTAT_IS_XSTAT64
#if XSTAT_IS_XSTAT64
return __xstat_conv (vers, kbuf, ubuf);
#else
switch (vers)