diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-13 09:13:12 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-09-11 14:35:13 -0300 |
commit | 71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08 (patch) | |
tree | f56f4b1004df49d31c5af7ad581356612d2da39c /sysdeps/unix/sysv/linux/alpha | |
parent | 0b1c222cd04b0de2fec1b116a68df9118ec1c540 (diff) | |
download | glibc-71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08.tar glibc-71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08.tar.gz glibc-71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08.tar.bz2 glibc-71aadfb8aef6e2c944fbcbc3c9646e08bfb2fb08.zip |
linux: Consolidate xstat{64}
The LFS support is implemented on xstat64.c, instead of xstat.c for
64-bit architectures. The xstat.c implements the non-LFS it is
no-op for !XSTAT_IS_XSTAT64.
The generic non-LFS implementation handle two cases:
1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and
nios): it issues __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_stat, otherwise it issues __NR_stat64 and convert
to non-LFS stat struct handling possible overflows on st_ino,
st_size, or st_blocks.
Also the 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 syscall 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. Old 64-bit kABI (ia64, powerpc64*, s390x, x86_64): it
issues __NR_stat for _STAT_VER_KERNEL or _STAT_VER_LINUX.
1.2. Old 64-bit kABI with defines __NR_stat64 instead of __NR_stat
(sparc64): it issues __NR_stat for _STAT_VER_KERNEL or
__NR_stat64 and convert to struct stat64.
1.3. New kABIs which uses generic 64-bit Linux ABI (aarch64 and
riscv64): it issues __NR_newfstatat and only for
_STAT_VER_KERNEL.
1.4. New 32-bit kABIs with only 64-bit time_t support (arc and
riscv32): it issues __NR_statx and covert to struct stat64.
2. Old ABIs with XSTAT_IS_XSTAT64 being 0:
2.1. New kABIs which uses generic pre 64-bit time Linux ABI (csky
and nios2): it issues __NR_fstatat64 for _STAT_VER_KERNEL.
2.2. Old kABIs with old non-LFS support (arm, i386, hppa, m68k,
microblaze, s390, sh, mips32, powerpc32, and sparc32): it
issues __NR_stat64.
Also, two special cases requires specific LFS implementations:
1. alpha: it requires to handle _STAT_VER_KERNEL64 to call __NR_stat64
or use the kernel_stat with __NR_stat 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>
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/xstat64.c (renamed from sysdeps/unix/sysv/linux/alpha/xstat.c) | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/xstat.c b/sysdeps/unix/sysv/linux/alpha/xstat64.c index 3ba1ae1811..ac1af53780 100644 --- a/sysdeps/unix/sysv/linux/alpha/xstat.c +++ b/sysdeps/unix/sysv/linux/alpha/xstat64.c @@ -16,42 +16,34 @@ License along with the GNU C Library. If not, see <https://www.gnu.org/licenses/>. */ -#define __xstat64 __xstat64_disable - -#include <errno.h> -#include <stddef.h> +#define __xstat __redirect___xstat #include <sys/stat.h> +#undef __xstat +#include <fcntl.h> #include <kernel_stat.h> #include <sysdep.h> -#include <sys/syscall.h> #include <xstatconv.h> -#undef __xstat64 - - /* Get information about the file NAME in BUF. */ int -__xstat (int vers, const char *name, struct stat *buf) +__xstat64 (int vers, const char *name, struct stat64 *buf) { - int result; - struct kernel_stat kbuf; - - if (vers == _STAT_VER_KERNEL64) + switch (vers) { - result = INTERNAL_SYSCALL_CALL (stat64, name, 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 (stat64, name, buf); - result = INTERNAL_SYSCALL_CALL (stat, name, &kbuf); - if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result))) - return __xstat_conv (vers, &kbuf, buf); - __set_errno (INTERNAL_SYSCALL_ERRNO (result)); - return -1; + default: + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf); + if (r == 0) + return __xstat_conv (vers, &kbuf, buf); + return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } } -hidden_def (__xstat) -weak_alias (__xstat, _xstat); -strong_alias (__xstat, __xstat64); -hidden_ver (__xstat, __xstat64) +weak_alias (__xstat64, __xstat); +weak_alias (__xstat64, __GI___xstat); + +hidden_def (__xstat64) |