[05/16] linux: Consolidate fxstat{64}
Commit Message
The LFS support is implemented on fxstat64.c, instead of fxstat.c for
64-bit architectures. The fxstat.c implements the non-LFS and it is
a no-op for !XSTAT_IS_XSTAT64.
The generic non-LFS implementation handles two cases:
1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and
nios): it issuess __NR_fstat64 plus handle the overflow on st_ino,
st_size, or st_blocks. It only handles _STAT_VER_KERNEL.
2. Old KABIs with old non-LFS support (arm, i386, hppa, m68k,
microblaze, s390, sh, powerpc, and sparc32). For _STAT_VER_KERNEL
it issues __NR_fstat, otherwise it calls __NR_fstat64 and convert
to non-LFS stat struct and handle possible overflows on st_ino,
st_size, or st_blocks.
Also non-LFS mips is an outlier and it has its own implementation since
_STAT_VER_LINUX requires a different conversion function (it uses the
kernel_stat as the sysissues argument since its exported ABI is
different than the kernel one for both non-LFS and LFS implementation).
The generic LFS implementation handles multiple cases:
1. XSTAT_IS_XSTAT64 being 1:
1.1. 64-bit kABI (aarch64, ia64, powerpc64*, s390x, sparc64,
riscv64, and x86_64): it issuess __NR_fstat for
_STAT_VER_KERNEL or _STAT_VER_LINUX.
1.2. New 32-bit kABIs with only 64-bit time_t support (arc and
riscv32): it issuess __NR_statx and covert to struct stat64.
2. Old ABIs with XSTAT_IS_XSTAT64 being 0 (arm, csky, i386, hppa,
m68k, microblaze, mips32, nios2, sh, powerpc32, and sparc32): it
issues __NR_fstat64.
Also, two special cases requires specific implementations:
1. alpha: it requires to handle _STAT_VER_KERNEL64 to issues
__NR_fstat64 and use the kernel_stat with __NR_fstat otherwise.
2. mips64: as for non-LFS implementation its ABIs differ from
glibc exported one, which requires an specific conversion
function to handle the kernel_stat.
Checked with a build for all affected ABIs. I also checked on x86_64,
i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x.
---
.../sysv/linux/alpha/{fxstat.c => fxstat64.c} | 48 ++++++--------
sysdeps/unix/sysv/linux/arm/fxstat.c | 1 -
sysdeps/unix/sysv/linux/fxstat.c | 62 +++++++++----------
sysdeps/unix/sysv/linux/fxstat64.c | 43 ++++++++-----
.../sysv/linux/generic/wordsize-32/fxstat.c | 57 -----------------
.../sysv/linux/generic/wordsize-32/fxstat64.c | 36 -----------
sysdeps/unix/sysv/linux/hppa/fxstat.c | 1 -
sysdeps/unix/sysv/linux/i386/fxstat.c | 59 ------------------
sysdeps/unix/sysv/linux/m68k/fxstat.c | 1 -
sysdeps/unix/sysv/linux/microblaze/fxstat.c | 1 -
.../sysv/linux/{wordsize-64 => mips}/fxstat.c | 37 +++++------
.../unix/sysv/linux/mips/mips64/fxstat64.c | 13 +---
.../sysv/linux/powerpc/powerpc32/fxstat.c | 1 -
sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c | 1 -
sysdeps/unix/sysv/linux/sh/fxstat.c | 1 -
.../unix/sysv/linux/sparc/sparc32/fxstat.c | 1 -
.../unix/sysv/linux/sparc/sparc64/fxstat.c | 1 -
.../unix/sysv/linux/wordsize-64/fxstat64.c | 1 -
18 files changed, 97 insertions(+), 268 deletions(-)
rename sysdeps/unix/sysv/linux/alpha/{fxstat.c => fxstat64.c} (53%)
delete mode 100644 sysdeps/unix/sysv/linux/arm/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c
delete mode 100644 sysdeps/unix/sysv/linux/hppa/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/i386/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/m68k/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/microblaze/fxstat.c
rename sysdeps/unix/sysv/linux/{wordsize-64 => mips}/fxstat.c (60%)
delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/sh/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fxstat64.c
Comments
On Thu, 23 Jul 2020 16:46:30 -0300
Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:
> The LFS support is implemented on fxstat64.c, instead of fxstat.c for
> 64-bit architectures. The fxstat.c implements the non-LFS and it is
> a no-op for !XSTAT_IS_XSTAT64.
>
> The generic non-LFS implementation handles two cases:
>
> 1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and
> nios): it issuess __NR_fstat64 plus handle the overflow on
> st_ino, st_size, or st_blocks. It only handles _STAT_VER_KERNEL.
>
> 2. Old KABIs with old non-LFS support (arm, i386, hppa, m68k,
> microblaze, s390, sh, powerpc, and sparc32). For
> _STAT_VER_KERNEL it issues __NR_fstat, otherwise it calls
> __NR_fstat64 and convert to non-LFS stat struct and handle possible
> overflows on st_ino, st_size, or st_blocks.
>
> Also non-LFS mips is an outlier and it has its own implementation
> since _STAT_VER_LINUX requires a different conversion function (it
> uses the kernel_stat as the sysissues argument since its exported ABI
> is different than the kernel one for both non-LFS and LFS
> implementation).
>
> The generic LFS implementation handles multiple cases:
>
> 1. XSTAT_IS_XSTAT64 being 1:
>
> 1.1. 64-bit kABI (aarch64, ia64, powerpc64*, s390x, sparc64,
> riscv64, and x86_64): it issuess __NR_fstat for
> _STAT_VER_KERNEL or _STAT_VER_LINUX.
>
> 1.2. New 32-bit kABIs with only 64-bit time_t support (arc and
> riscv32): it issuess __NR_statx and covert to struct stat64.
>
> 2. Old ABIs with XSTAT_IS_XSTAT64 being 0 (arm, csky, i386, hppa,
> m68k, microblaze, mips32, nios2, sh, powerpc32, and sparc32): it
> issues __NR_fstat64.
>
> Also, two special cases requires specific implementations:
>
> 1. alpha: it requires to handle _STAT_VER_KERNEL64 to issues
> __NR_fstat64 and use the kernel_stat with __NR_fstat otherwise.
>
> 2. mips64: as for non-LFS implementation its ABIs differ from
> glibc exported one, which requires an specific conversion
> function to handle the kernel_stat.
>
> Checked with a build for all affected ABIs. I also checked on x86_64,
> i686, powerpc, powerpc64le, sparcv9, sparc64, s390, and s390x.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
> ---
> .../sysv/linux/alpha/{fxstat.c => fxstat64.c} | 48 ++++++--------
> sysdeps/unix/sysv/linux/arm/fxstat.c | 1 -
> sysdeps/unix/sysv/linux/fxstat.c | 62
> +++++++++---------- sysdeps/unix/sysv/linux/fxstat64.c |
> 43 ++++++++----- .../sysv/linux/generic/wordsize-32/fxstat.c | 57
> ----------------- .../sysv/linux/generic/wordsize-32/fxstat64.c | 36
> ----------- sysdeps/unix/sysv/linux/hppa/fxstat.c | 1 -
> sysdeps/unix/sysv/linux/i386/fxstat.c | 59 ------------------
> sysdeps/unix/sysv/linux/m68k/fxstat.c | 1 -
> sysdeps/unix/sysv/linux/microblaze/fxstat.c | 1 -
> .../sysv/linux/{wordsize-64 => mips}/fxstat.c | 37 +++++------
> .../unix/sysv/linux/mips/mips64/fxstat64.c | 13 +---
> .../sysv/linux/powerpc/powerpc32/fxstat.c | 1 -
> sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c | 1 -
> sysdeps/unix/sysv/linux/sh/fxstat.c | 1 -
> .../unix/sysv/linux/sparc/sparc32/fxstat.c | 1 -
> .../unix/sysv/linux/sparc/sparc64/fxstat.c | 1 -
> .../unix/sysv/linux/wordsize-64/fxstat64.c | 1 -
> 18 files changed, 97 insertions(+), 268 deletions(-)
> rename sysdeps/unix/sysv/linux/alpha/{fxstat.c => fxstat64.c} (53%)
> delete mode 100644 sysdeps/unix/sysv/linux/arm/fxstat.c
> delete mode 100644
> sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c delete mode
> 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c delete
> mode 100644 sysdeps/unix/sysv/linux/hppa/fxstat.c delete mode 100644
> sysdeps/unix/sysv/linux/i386/fxstat.c delete mode 100644
> sysdeps/unix/sysv/linux/m68k/fxstat.c delete mode 100644
> sysdeps/unix/sysv/linux/microblaze/fxstat.c rename
> sysdeps/unix/sysv/linux/{wordsize-64 => mips}/fxstat.c (60%) delete
> mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstat.c delete
> mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c delete mode
> 100644 sysdeps/unix/sysv/linux/sh/fxstat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c delete mode 100644
> sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c delete mode 100644
> sysdeps/unix/sysv/linux/wordsize-64/fxstat64.c
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/fxstat.c
> b/sysdeps/unix/sysv/linux/alpha/fxstat64.c similarity index 53%
> rename from sysdeps/unix/sysv/linux/alpha/fxstat.c
> rename to sysdeps/unix/sysv/linux/alpha/fxstat64.c
> index 0978610bf0..286a2f0a6c 100644
> --- a/sysdeps/unix/sysv/linux/alpha/fxstat.c
> +++ b/sysdeps/unix/sysv/linux/alpha/fxstat64.c
> @@ -1,4 +1,4 @@
> -/* fxstat using old-style Unix stat system call.
> +/* fxstat64 using old-style Unix stat system call.
> Copyright (C) 2004-2020 Free Software Foundation, Inc.
> This file is part of the GNU C Library.
>
> @@ -16,42 +16,32 @@
> License along with the GNU C Library. If not, see
> <https://www.gnu.org/licenses/>. */
>
> -#define __fxstat64 __fxstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> +#define __fxstat __redirect___fxstat64
> #include <sys/stat.h>
> +#undef __fxstat
> #include <kernel_stat.h>
> #include <sysdep.h>
> -#include <sys/syscall.h>
> #include <xstatconv.h>
>
> -#undef __fxstat64
> -
> -
> /* Get information about the file NAME in BUF. */
> int
> -__fxstat (int vers, int fd, struct stat *buf)
> +__fxstat64 (int vers, int fd, struct stat64 *buf)
> {
> - int result;
> - struct kernel_stat kbuf;
> -
> - if (vers == _STAT_VER_KERNEL64)
> + switch (vers)
> {
> - result = INTERNAL_SYSCALL_CALL (fstat64, fd, buf);
> - if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> - return result;
> - __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> - return -1;
> + case _STAT_VER_KERNEL64:
> + return INLINE_SYSCALL_CALL (fstat64, fd, buf);
> +
> + default:
> + {
> + struct kernel_stat kbuf;
> + int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
> + if (r == 0)
> + return __xstat_conv (vers, &kbuf, buf);
> + return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r);
> + }
> }
> -
> - result = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
> - if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
> - return __xstat_conv (vers, &kbuf, buf);
> - __set_errno (INTERNAL_SYSCALL_ERRNO (result));
> - return -1;
> }
> -hidden_def (__fxstat)
> -weak_alias (__fxstat, _fxstat);
> -strong_alias (__fxstat, __fxstat64);
> -hidden_ver (__fxstat, __fxstat64)
> +hidden_def (__fxstat64)
> +strong_alias (__fxstat64, __fxstat);
> +hidden_ver (__fxstat64, __fxstat)
> diff --git a/sysdeps/unix/sysv/linux/arm/fxstat.c
> b/sysdeps/unix/sysv/linux/arm/fxstat.c deleted file mode 100644
> index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/arm/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/fxstat.c
> b/sysdeps/unix/sysv/linux/fxstat.c index a88404b5c3..b46e344d0e 100644
> --- a/sysdeps/unix/sysv/linux/fxstat.c
> +++ b/sysdeps/unix/sysv/linux/fxstat.c
> @@ -16,46 +16,46 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -/* Ho hum, if xstat == xstat64 we must get rid of the prototype or
> gcc
> - will complain since they don't strictly match. */
> -#define __fxstat64 __fxstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sys/types.h>
> #include <sys/stat.h>
> +#include <fcntl.h>
> #include <kernel_stat.h>
> -
> #include <sysdep.h>
> -#include <sys/syscall.h>
>
> -#include <xstatconv.h>
> +#if !XSTAT_IS_XSTAT64
> +# include <xstatconv.h>
> +# include <xstatover.h>
>
> /* Get information about the file FD in BUF. */
> int
> __fxstat (int vers, int fd, struct stat *buf)
> {
> - if (vers == _STAT_VER_KERNEL)
> - return INLINE_SYSCALL (fstat, 2, fd, buf);
> -
> -#if STAT_IS_KERNEL_STAT
> - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> -#else
> - struct kernel_stat kbuf;
> - int result;
> -
> - result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
> - if (result == 0)
> - result = __xstat_conv (vers, &kbuf, buf);
> -
> - return result;
> + switch (vers)
> + {
> + case _STAT_VER_KERNEL:
> + {
> +# if STAT_IS_KERNEL_STAT
> + /* New kABIs which uses generic pre 64-bit time Linux ABI,
> + e.g. csky, nios2 */
> + int r = INLINE_SYSCALL_CALL (fstat64, fd, buf);
> + return r ?: stat_overflow (buf);
> +# else
> + /* Old kABIs with old non-LFS support, e.g. arm, i386, hppa,
> m68k,
> + microblaze, s390, sh, powerpc, and sparc. */
> + return INLINE_SYSCALL_CALL (fstat, fd, buf);
> +# endif
> + }
> +
> + default:
> + {
> +# if STAT_IS_KERNEL_STAT
> + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> +# else
> + struct stat64 buf64;
> + int r = INLINE_SYSCALL_CALL (fstat64, fd, &buf64);
> + return r ?: __xstat32_conv (vers, &buf64, buf);
> #endif
> + }
> + }
> }
> -
> hidden_def (__fxstat)
> -weak_alias (__fxstat, _fxstat);
> -#if XSTAT_IS_XSTAT64
> -#undef __fxstat64
> -strong_alias (__fxstat, __fxstat64);
> -hidden_ver (__fxstat, __fxstat64)
> -#endif
> +#endif /* XSTAT_IS_XSTAT64 */
> diff --git a/sysdeps/unix/sysv/linux/fxstat64.c
> b/sysdeps/unix/sysv/linux/fxstat64.c index 9133a0a29b..d3834f1ce2
> 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c
> +++ b/sysdeps/unix/sysv/linux/fxstat64.c
> @@ -16,15 +16,13 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <errno.h>
> -#include <stddef.h>
> -#include <fcntl.h>
> +#define __fxstat __redirect___fxstat
> #include <sys/stat.h>
> +#undef __fxstat
> +#include <fcntl.h>
> #include <kernel_stat.h>
> -
> #include <sysdep.h>
> -#include <sys/syscall.h>
> -
> +#include <xstatconv.h>
> #include <statx_cp.h>
>
> /* Get information about the file FD in BUF. */
> @@ -32,17 +30,27 @@
> int
> ___fxstat64 (int vers, int fd, struct stat64 *buf)
> {
> - int result;
> -#ifdef __NR_fstat64
> - result = INLINE_SYSCALL (fstat64, 2, fd, buf);
> -#else
> +#if XSTAT_IS_XSTAT64
> +# ifdef __NR_fstat
> + /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, sparc64,
> riscv64,
> + and x86_64. */
> + if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
> + return INLINE_SYSCALL_CALL (fstat, fd, buf);
> + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
> +# else
> + /* New 32-bit kABIs with only 64-bit time_t support, e.g. arc,
> riscv32. */ struct statx tmp;
> - result = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH,
> STATX_BASIC_STATS,
> - &tmp);
> - if (result == 0)
> + int r = INLINE_SYSCALL_CALL (statx, fd, "", AT_EMPTY_PATH,
> + STATX_BASIC_STATS, &tmp);
> + if (r == 0)
> __cp_stat64_statx (buf, &tmp);
> -#endif
> - return result;
> + return r;
> +# endif
> +#else
> + /* All kABIs with non-LFS support, e.g. arm, csky, i386, hppa,
> m68k,
> + microblaze, mips32, nios2, sh, powerpc32, and sparc32. */
> + return INLINE_SYSCALL_CALL (fstat64, fd, buf);
> +#endif /* XSTAT_IS_XSTAT64 */
> }
>
> #include <shlib-compat.h>
> @@ -56,3 +64,8 @@ hidden_ver (___fxstat64, __fxstat64)
> strong_alias (___fxstat64, __fxstat64)
> hidden_def (__fxstat64)
> #endif
> +
> +#if XSTAT_IS_XSTAT64
> +strong_alias (__fxstat64, __fxstat);
> +hidden_ver (__fxstat64, __fxstat)
> +#endif
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
> b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c deleted file
> mode 100644 index 850450e1e8..0000000000
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -/* Copyright (C) 2011-2020 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Lesser General Public
> - License as published by the Free Software Foundation; either
> - version 2.1 of the License, or (at your option) any later version.
> -
> - The GNU C Library is distributed in the hope that it will be
> useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - Lesser General Public License for more details.
> -
> - You should have received a copy of the GNU Lesser General Public
> - License along with the GNU C Library. If not, see
> - <https://www.gnu.org/licenses/>. */
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <fcntl.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <kernel_stat.h>
> -
> -#include <sysdep.h>
> -#include <sys/syscall.h>
> -
> -#if !XSTAT_IS_XSTAT64
> -#include "overflow.h"
> -#include <statx_cp.h>
> -
> -/* Get information about the file FD in BUF. */
> -int
> -__fxstat (int vers, int fd, struct stat *buf)
> -{
> - if (vers == _STAT_VER_KERNEL)
> - {
> -# ifdef __NR_fstat64
> - int rc = INLINE_SYSCALL (fstat64, 2, fd, buf);
> -# else
> - struct statx tmp;
> - int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH,
> - STATX_BASIC_STATS, &tmp);
> - if (rc == 0)
> - __cp_stat64_statx ((struct stat64 *)buf, &tmp);
> -# endif
> - return rc ?: stat_overflow (buf);
> - }
> -
> - errno = EINVAL;
> - return -1;
> -}
> -
> -hidden_def (__fxstat)
> -weak_alias (__fxstat, _fxstat);
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c
> b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c deleted file
> mode 100644 index b4a2a5b417..0000000000
> --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -/* __fxstat64 () implementation.
> - Copyright (C) 2016-2020 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Lesser General Public
> - License as published by the Free Software Foundation; either
> - version 2.1 of the License, or (at your option) any later version.
> -
> - The GNU C Library is distributed in the hope that it will be
> useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - Lesser General Public License for more details.
> -
> - You should have received a copy of the GNU Lesser General Public
> - License along with the GNU C Library. If not, see
> - <https://www.gnu.org/licenses/>. */
> -
> -/* Hide the prototypes for __fxstat and _fxstat so that GCC will not
> - complain about the different function signatures if they are
> aliased
> - to __fxstat64. If XSTAT_IS_XSTAT64 is set to non-zero then the
> stat and
> - stat64 structures have an identical layout but different type
> names. */ -
> -#define __fxstat __fxstat_disable
> -#define _fxstat _fxstat_disable
> -
> -#include <sysdeps/unix/sysv/linux/fxstat64.c>
> -
> -#undef __fxstat
> -#undef _fxstat
> -#if XSTAT_IS_XSTAT64
> -weak_alias (__fxstat64, __fxstat)
> -weak_alias (__fxstat64, _fxstat)
> -hidden_ver (__fxstat64, __fxstat)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/hppa/fxstat.c
> b/sysdeps/unix/sysv/linux/hppa/fxstat.c deleted file mode 100644
> index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/hppa/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c
> b/sysdeps/unix/sysv/linux/i386/fxstat.c deleted file mode 100644
> index db59baa71b..0000000000
> --- a/sysdeps/unix/sysv/linux/i386/fxstat.c
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -/* fxstat using old-style Unix fstat system call.
> - Copyright (C) 1991-2020 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Lesser General Public
> - License as published by the Free Software Foundation; either
> - version 2.1 of the License, or (at your option) any later version.
> -
> - The GNU C Library is distributed in the hope that it will be
> useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - Lesser General Public License for more details.
> -
> - You should have received a copy of the GNU Lesser General Public
> - License along with the GNU C Library; if not, see
> - <https://www.gnu.org/licenses/>. */
> -
> -/* Ho hum, if xstat == xstat64 we must get rid of the prototype or
> gcc
> - will complain since they don't strictly match. */
> -#define __fxstat64 __fxstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <sys/stat.h>
> -#include <kernel_stat.h>
> -
> -#include <sysdep.h>
> -#include <sys/syscall.h>
> -
> -#include <xstatconv.h>
> -
> -/* Get information about the file FD in BUF. */
> -int
> -__fxstat (int vers, int fd, struct stat *buf)
> -{
> - int result;
> -
> - if (vers == _STAT_VER_KERNEL)
> - return INLINE_SYSCALL (fstat, 2, fd, buf);
> -
> - {
> - struct stat64 buf64;
> -
> - result = INTERNAL_SYSCALL_CALL (fstat64, fd, &buf64);
> - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
> - return INLINE_SYSCALL_ERROR_RETURN_VALUE
> (INTERNAL_SYSCALL_ERRNO (result));
> - else
> - return __xstat32_conv (vers, &buf64, buf);
> - }
> -}
> -
> -hidden_def (__fxstat)
> -weak_alias (__fxstat, _fxstat);
> -#if XSTAT_IS_XSTAT64
> -#undef __fxstat64
> -strong_alias (__fxstat, __fxstat64);
> -hidden_ver (__fxstat, __fxstat64)
> -#endif
> diff --git a/sysdeps/unix/sysv/linux/m68k/fxstat.c
> b/sysdeps/unix/sysv/linux/m68k/fxstat.c deleted file mode 100644
> index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/m68k/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/microblaze/fxstat.c
> b/sysdeps/unix/sysv/linux/microblaze/fxstat.c deleted file mode 100644
> index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/microblaze/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstat.c
> b/sysdeps/unix/sysv/linux/mips/fxstat.c similarity index 60%
> rename from sysdeps/unix/sysv/linux/wordsize-64/fxstat.c
> rename to sysdeps/unix/sysv/linux/mips/fxstat.c
> index 24bfe847d7..16c3cefee2 100644
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstat.c
> +++ b/sysdeps/unix/sysv/linux/mips/fxstat.c
> @@ -1,4 +1,4 @@
> -/* fxstat using old-style Unix fstat system call.
> +/* fxstat using old-style Unix stat system call.
> Copyright (C) 1991-2020 Free Software Foundation, Inc.
> This file is part of the GNU C Library.
>
> @@ -16,30 +16,27 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -/* Ho hum, since xstat == xstat64 we must get rid of the prototype
> or gcc
> - will complain since they don't strictly match. */
> -#define __fxstat64 __fxstat64_disable
> -
> -#include <errno.h>
> -#include <stddef.h>
> #include <sys/stat.h>
> -
> +#include <fcntl.h>
> +#include <kernel_stat.h>
> #include <sysdep.h>
> -#include <sys/syscall.h>
> +#include <xstatconv.h>
>
> -/* Get information about the file FD in BUF. */
> +/* Get information about the file NAME in BUF. */
> int
> __fxstat (int vers, int fd, struct stat *buf)
> {
> - if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
> - return INLINE_SYSCALL (fstat, 2, fd, buf);
> -
> - __set_errno (EINVAL);
> - return -1;
> + switch (vers)
> + {
> + case _STAT_VER_KERNEL:
> + return INLINE_SYSCALL_CALL (fstat, fd, buf);
> +
> + default:
> + {
> + struct kernel_stat kbuf;
> + int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
> + return r ?: __xstat_conv (vers, &kbuf, buf);
> + }
> + }
> }
> -
> hidden_def (__fxstat)
> -weak_alias (__fxstat, _fxstat);
> -#undef __fxstat64
> -strong_alias (__fxstat, __fxstat64);
> -hidden_ver (__fxstat, __fxstat64)
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c
> b/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c index
> 8dd3d92eb1..3fcdd9f1ee 100644 ---
> a/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c +++
> b/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c @@ -16,14 +16,9 @@
> License along with the GNU C Library; if not, see
> <https://www.gnu.org/licenses/>. */
>
> -#include <errno.h>
> -#include <stddef.h>
> #include <sys/stat.h>
> #include <kernel_stat.h>
> -
> #include <sysdep.h>
> -#include <sys/syscall.h>
> -
> #include <xstatconv.h>
>
> /* Get information about the file FD in BUF. */
> @@ -31,14 +26,10 @@
> int
> __fxstat64 (int vers, int fd, struct stat64 *buf)
> {
> - int result;
> struct kernel_stat kbuf;
> + int r = INLINE_SYSCALL_CALL (fstat, fd, &kbuf);
> + return r ?: __xstat64_conv (vers, &kbuf, buf);
>
> - result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
> - if (result == 0)
> - result = __xstat64_conv (vers, &kbuf, buf);
> -
> - return result;
> }
>
> hidden_def (__fxstat64)
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstat.c
> b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstat.c deleted file
> mode 100644 index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c
> b/sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c deleted file mode
> 100644 index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sh/fxstat.c
> b/sysdeps/unix/sysv/linux/sh/fxstat.c deleted file mode 100644
> index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/sh/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c deleted file mode
> 100644 index 4f219f0b9d..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
> b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c deleted file mode
> 100644 index e328ccbab0..0000000000
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "../../i386/fxstat.c"
> diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstat64.c
> b/sysdeps/unix/sysv/linux/wordsize-64/fxstat64.c deleted file mode
> 100644 index 9eff9ebeb7..0000000000
> --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstat64.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -/* fxstat64 is in fxstat.c */
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
similarity index 53%
rename from sysdeps/unix/sysv/linux/alpha/fxstat.c
rename to sysdeps/unix/sysv/linux/alpha/fxstat64.c
@@ -1,4 +1,4 @@
-/* fxstat using old-style Unix stat system call.
+/* fxstat64 using old-style Unix stat system call.
Copyright (C) 2004-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,42 +16,32 @@
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
-#define __fxstat64 __fxstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
+#define __fxstat __redirect___fxstat64
#include <sys/stat.h>
+#undef __fxstat
#include <kernel_stat.h>
#include <sysdep.h>
-#include <sys/syscall.h>
#include <xstatconv.h>
-#undef __fxstat64
-
-
/* Get information about the file NAME in BUF. */
int
-__fxstat (int vers, int fd, struct stat *buf)
+__fxstat64 (int vers, int fd, struct stat64 *buf)
{
- int result;
- struct kernel_stat kbuf;
-
- if (vers == _STAT_VER_KERNEL64)
+ switch (vers)
{
- result = INTERNAL_SYSCALL_CALL (fstat64, fd, buf);
- if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
- return result;
- __set_errno (INTERNAL_SYSCALL_ERRNO (result));
- return -1;
+ case _STAT_VER_KERNEL64:
+ return INLINE_SYSCALL_CALL (fstat64, fd, buf);
+
+ default:
+ {
+ struct kernel_stat kbuf;
+ int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
+ if (r == 0)
+ return __xstat_conv (vers, &kbuf, buf);
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r);
+ }
}
-
- result = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
- if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result)))
- return __xstat_conv (vers, &kbuf, buf);
- __set_errno (INTERNAL_SYSCALL_ERRNO (result));
- return -1;
}
-hidden_def (__fxstat)
-weak_alias (__fxstat, _fxstat);
-strong_alias (__fxstat, __fxstat64);
-hidden_ver (__fxstat, __fxstat64)
+hidden_def (__fxstat64)
+strong_alias (__fxstat64, __fxstat);
+hidden_ver (__fxstat64, __fxstat)
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
@@ -16,46 +16,46 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
- will complain since they don't strictly match. */
-#define __fxstat64 __fxstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <kernel_stat.h>
-
#include <sysdep.h>
-#include <sys/syscall.h>
-#include <xstatconv.h>
+#if !XSTAT_IS_XSTAT64
+# include <xstatconv.h>
+# include <xstatover.h>
/* Get information about the file FD in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
{
- if (vers == _STAT_VER_KERNEL)
- return INLINE_SYSCALL (fstat, 2, fd, buf);
-
-#if STAT_IS_KERNEL_STAT
- return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
-#else
- struct kernel_stat kbuf;
- int result;
-
- result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
- if (result == 0)
- result = __xstat_conv (vers, &kbuf, buf);
-
- return result;
+ switch (vers)
+ {
+ case _STAT_VER_KERNEL:
+ {
+# if STAT_IS_KERNEL_STAT
+ /* New kABIs which uses generic pre 64-bit time Linux ABI,
+ e.g. csky, nios2 */
+ int r = INLINE_SYSCALL_CALL (fstat64, fd, buf);
+ return r ?: stat_overflow (buf);
+# else
+ /* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k,
+ microblaze, s390, sh, powerpc, and sparc. */
+ return INLINE_SYSCALL_CALL (fstat, fd, buf);
+# endif
+ }
+
+ default:
+ {
+# if STAT_IS_KERNEL_STAT
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
+# else
+ struct stat64 buf64;
+ int r = INLINE_SYSCALL_CALL (fstat64, fd, &buf64);
+ return r ?: __xstat32_conv (vers, &buf64, buf);
#endif
+ }
+ }
}
-
hidden_def (__fxstat)
-weak_alias (__fxstat, _fxstat);
-#if XSTAT_IS_XSTAT64
-#undef __fxstat64
-strong_alias (__fxstat, __fxstat64);
-hidden_ver (__fxstat, __fxstat64)
-#endif
+#endif /* XSTAT_IS_XSTAT64 */
@@ -16,15 +16,13 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
-#include <fcntl.h>
+#define __fxstat __redirect___fxstat
#include <sys/stat.h>
+#undef __fxstat
+#include <fcntl.h>
#include <kernel_stat.h>
-
#include <sysdep.h>
-#include <sys/syscall.h>
-
+#include <xstatconv.h>
#include <statx_cp.h>
/* Get information about the file FD in BUF. */
@@ -32,17 +30,27 @@
int
___fxstat64 (int vers, int fd, struct stat64 *buf)
{
- int result;
-#ifdef __NR_fstat64
- result = INLINE_SYSCALL (fstat64, 2, fd, buf);
-#else
+#if XSTAT_IS_XSTAT64
+# ifdef __NR_fstat
+ /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, sparc64, riscv64,
+ and x86_64. */
+ if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
+ return INLINE_SYSCALL_CALL (fstat, fd, buf);
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
+# else
+ /* New 32-bit kABIs with only 64-bit time_t support, e.g. arc, riscv32. */
struct statx tmp;
- result = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS,
- &tmp);
- if (result == 0)
+ int r = INLINE_SYSCALL_CALL (statx, fd, "", AT_EMPTY_PATH,
+ STATX_BASIC_STATS, &tmp);
+ if (r == 0)
__cp_stat64_statx (buf, &tmp);
-#endif
- return result;
+ return r;
+# endif
+#else
+ /* All kABIs with non-LFS support, e.g. arm, csky, i386, hppa, m68k,
+ microblaze, mips32, nios2, sh, powerpc32, and sparc32. */
+ return INLINE_SYSCALL_CALL (fstat64, fd, buf);
+#endif /* XSTAT_IS_XSTAT64 */
}
#include <shlib-compat.h>
@@ -56,3 +64,8 @@ hidden_ver (___fxstat64, __fxstat64)
strong_alias (___fxstat64, __fxstat64)
hidden_def (__fxstat64)
#endif
+
+#if XSTAT_IS_XSTAT64
+strong_alias (__fxstat64, __fxstat);
+hidden_ver (__fxstat64, __fxstat)
+#endif
deleted file mode 100644
@@ -1,57 +0,0 @@
-/* Copyright (C) 2011-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <stddef.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <kernel_stat.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#if !XSTAT_IS_XSTAT64
-#include "overflow.h"
-#include <statx_cp.h>
-
-/* Get information about the file FD in BUF. */
-int
-__fxstat (int vers, int fd, struct stat *buf)
-{
- if (vers == _STAT_VER_KERNEL)
- {
-# ifdef __NR_fstat64
- int rc = INLINE_SYSCALL (fstat64, 2, fd, buf);
-# else
- struct statx tmp;
- int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH,
- STATX_BASIC_STATS, &tmp);
- if (rc == 0)
- __cp_stat64_statx ((struct stat64 *)buf, &tmp);
-# endif
- return rc ?: stat_overflow (buf);
- }
-
- errno = EINVAL;
- return -1;
-}
-
-hidden_def (__fxstat)
-weak_alias (__fxstat, _fxstat);
-#endif
deleted file mode 100644
@@ -1,36 +0,0 @@
-/* __fxstat64 () implementation.
- Copyright (C) 2016-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <https://www.gnu.org/licenses/>. */
-
-/* Hide the prototypes for __fxstat and _fxstat so that GCC will not
- complain about the different function signatures if they are aliased
- to __fxstat64. If XSTAT_IS_XSTAT64 is set to non-zero then the stat and
- stat64 structures have an identical layout but different type names. */
-
-#define __fxstat __fxstat_disable
-#define _fxstat _fxstat_disable
-
-#include <sysdeps/unix/sysv/linux/fxstat64.c>
-
-#undef __fxstat
-#undef _fxstat
-#if XSTAT_IS_XSTAT64
-weak_alias (__fxstat64, __fxstat)
-weak_alias (__fxstat64, _fxstat)
-hidden_ver (__fxstat64, __fxstat)
-#endif
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
deleted file mode 100644
@@ -1,59 +0,0 @@
-/* fxstat using old-style Unix fstat system call.
- Copyright (C) 1991-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
- will complain since they don't strictly match. */
-#define __fxstat64 __fxstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
-#include <sys/stat.h>
-#include <kernel_stat.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-
-#include <xstatconv.h>
-
-/* Get information about the file FD in BUF. */
-int
-__fxstat (int vers, int fd, struct stat *buf)
-{
- int result;
-
- if (vers == _STAT_VER_KERNEL)
- return INLINE_SYSCALL (fstat, 2, fd, buf);
-
- {
- struct stat64 buf64;
-
- result = INTERNAL_SYSCALL_CALL (fstat64, fd, &buf64);
- if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result)))
- return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result));
- else
- return __xstat32_conv (vers, &buf64, buf);
- }
-}
-
-hidden_def (__fxstat)
-weak_alias (__fxstat, _fxstat);
-#if XSTAT_IS_XSTAT64
-#undef __fxstat64
-strong_alias (__fxstat, __fxstat64);
-hidden_ver (__fxstat, __fxstat64)
-#endif
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
similarity index 60%
rename from sysdeps/unix/sysv/linux/wordsize-64/fxstat.c
rename to sysdeps/unix/sysv/linux/mips/fxstat.c
@@ -1,4 +1,4 @@
-/* fxstat using old-style Unix fstat system call.
+/* fxstat using old-style Unix stat system call.
Copyright (C) 1991-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,30 +16,27 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-/* Ho hum, since xstat == xstat64 we must get rid of the prototype or gcc
- will complain since they don't strictly match. */
-#define __fxstat64 __fxstat64_disable
-
-#include <errno.h>
-#include <stddef.h>
#include <sys/stat.h>
-
+#include <fcntl.h>
+#include <kernel_stat.h>
#include <sysdep.h>
-#include <sys/syscall.h>
+#include <xstatconv.h>
-/* Get information about the file FD in BUF. */
+/* Get information about the file NAME in BUF. */
int
__fxstat (int vers, int fd, struct stat *buf)
{
- if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX)
- return INLINE_SYSCALL (fstat, 2, fd, buf);
-
- __set_errno (EINVAL);
- return -1;
+ switch (vers)
+ {
+ case _STAT_VER_KERNEL:
+ return INLINE_SYSCALL_CALL (fstat, fd, buf);
+
+ default:
+ {
+ struct kernel_stat kbuf;
+ int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf);
+ return r ?: __xstat_conv (vers, &kbuf, buf);
+ }
+ }
}
-
hidden_def (__fxstat)
-weak_alias (__fxstat, _fxstat);
-#undef __fxstat64
-strong_alias (__fxstat, __fxstat64);
-hidden_ver (__fxstat, __fxstat64)
@@ -16,14 +16,9 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
#include <sys/stat.h>
#include <kernel_stat.h>
-
#include <sysdep.h>
-#include <sys/syscall.h>
-
#include <xstatconv.h>
/* Get information about the file FD in BUF. */
@@ -31,14 +26,10 @@
int
__fxstat64 (int vers, int fd, struct stat64 *buf)
{
- int result;
struct kernel_stat kbuf;
+ int r = INLINE_SYSCALL_CALL (fstat, fd, &kbuf);
+ return r ?: __xstat64_conv (vers, &kbuf, buf);
- result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
- if (result == 0)
- result = __xstat64_conv (vers, &kbuf, buf);
-
- return result;
}
hidden_def (__fxstat64)
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
deleted file mode 100644
@@ -1 +0,0 @@
-#include "../../i386/fxstat.c"
deleted file mode 100644
@@ -1 +0,0 @@
-/* fxstat64 is in fxstat.c */