From d2e1e973322fa02ae8d005236f1a25fb2cc3b6a8 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Mon, 21 Nov 2016 08:23:12 -0800 Subject: 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. --- sysdeps/unix/sysv/linux/fxstat.c | 2 +- sysdeps/unix/sysv/linux/fxstatat.c | 2 +- sysdeps/unix/sysv/linux/generic/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/generic/lxstat.c | 2 +- sysdeps/unix/sysv/linux/generic/xstat.c | 2 +- sysdeps/unix/sysv/linux/hppa/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/i386/fxstat.c | 2 +- sysdeps/unix/sysv/linux/i386/fxstatat.c | 2 +- sysdeps/unix/sysv/linux/i386/lxstat.c | 2 +- sysdeps/unix/sysv/linux/i386/xstat.c | 2 +- sysdeps/unix/sysv/linux/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/lxstat.c | 2 +- sysdeps/unix/sysv/linux/microblaze/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/mips/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/mips/xstatconv.c | 2 +- sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h | 2 ++ sysdeps/unix/sysv/linux/xstat.c | 2 +- sysdeps/unix/sysv/linux/xstatconv.c | 4 ++-- 19 files changed, 27 insertions(+), 13 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index e33023bc67..d7a8064664 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index f716bf31c2..2e28f615fd 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/generic/kernel_stat.h b/sysdeps/unix/sysv/linux/generic/kernel_stat.h index be12819d36..5d5f04b402 100644 --- a/sysdeps/unix/sysv/linux/generic/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/generic/kernel_stat.h @@ -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 diff --git a/sysdeps/unix/sysv/linux/generic/lxstat.c b/sysdeps/unix/sysv/linux/generic/lxstat.c index f97c2d5fe1..653f6e9a34 100644 --- a/sysdeps/unix/sysv/linux/generic/lxstat.c +++ b/sysdeps/unix/sysv/linux/generic/lxstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/generic/xstat.c b/sysdeps/unix/sysv/linux/generic/xstat.c index 3d82b87e4a..5808b1a0e1 100644 --- a/sysdeps/unix/sysv/linux/generic/xstat.c +++ b/sysdeps/unix/sysv/linux/generic/xstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h index e3ea72402f..9ffa3ba638 100644 --- a/sysdeps/unix/sysv/linux/hppa/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/hppa/kernel_stat.h @@ -29,3 +29,5 @@ struct kernel_stat { #define _HAVE_STAT_NSEC #define _HAVE_STAT64_NSEC + +#define XSTAT_IS_XSTAT64 0 diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c index b21dced00a..6fd0c76330 100644 --- a/sysdeps/unix/sysv/linux/i386/fxstat.c +++ b/sysdeps/unix/sysv/linux/i386/fxstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c b/sysdeps/unix/sysv/linux/i386/fxstatat.c index 5f7ac56acc..2466e6c29a 100644 --- a/sysdeps/unix/sysv/linux/i386/fxstatat.c +++ b/sysdeps/unix/sysv/linux/i386/fxstatat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c index 445d154f46..b6e9259879 100644 --- a/sysdeps/unix/sysv/linux/i386/lxstat.c +++ b/sysdeps/unix/sysv/linux/i386/lxstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c index 915a80e820..788d458286 100644 --- a/sysdeps/unix/sysv/linux/i386/xstat.c +++ b/sysdeps/unix/sysv/linux/i386/xstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h index dcdab48dbb..4354d14f76 100644 --- a/sysdeps/unix/sysv/linux/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/kernel_stat.h @@ -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 diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index c8bf06d1eb..59aceb4301 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h index edcc15d7fa..b6ae8c3699 100644 --- a/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h @@ -47,3 +47,5 @@ struct kernel_stat #define _HAVE_STAT___UNUSED5 #define _HAVE_STAT64___UNUSED5 }; + +#define XSTAT_IS_XSTAT64 0 diff --git a/sysdeps/unix/sysv/linux/mips/kernel_stat.h b/sysdeps/unix/sysv/linux/mips/kernel_stat.h index e785bcd8cf..a41d15f95c 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/mips/kernel_stat.h @@ -55,3 +55,5 @@ struct kernel_stat unsigned int st_gen; }; #endif + +#define XSTAT_IS_XSTAT64 0 diff --git a/sysdeps/unix/sysv/linux/mips/xstatconv.c b/sysdeps/unix/sysv/linux/mips/xstatconv.c index 4f056304fd..8d20080e00 100644 --- a/sysdeps/unix/sysv/linux/mips/xstatconv.c +++ b/sysdeps/unix/sysv/linux/mips/xstatconv.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h index 75f7bcddd9..0fbde98406 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h @@ -46,3 +46,5 @@ struct kernel_stat #define _HAVE_STAT64___UNUSED5 #define _HAVE_STAT64___PAD2 #define _HAVE_STAT64_NSEC + +#define XSTAT_IS_XSTAT64 0 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h index 5b894b83f9..eb60236929 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h @@ -30,3 +30,5 @@ struct kernel_stat #define _HAVE_STAT64___PAD2 #define _HAVE_STAT_NSEC #define _HAVE_STAT64_NSEC + +#define XSTAT_IS_XSTAT64 0 diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index cbd5aeb1d2..41e4b35e4a 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -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) diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c index 27b528ca11..fd4d87453f 100644 --- a/sysdeps/unix/sysv/linux/xstatconv.c +++ b/sysdeps/unix/sysv/linux/xstatconv.c @@ -31,7 +31,7 @@ struct kernel_stat; #include -#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) -- cgit 1.4.1