From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 13C341F5AE for ; Fri, 24 Jul 2020 09:14:13 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 12AEF388E812; Fri, 24 Jul 2020 09:14:12 +0000 (GMT) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id 7D130388E80B for ; Fri, 24 Jul 2020 09:14:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7D130388E80B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4BCk664W5Mz1qs07; Fri, 24 Jul 2020 11:14:06 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4BCk664BTHz1qy6J; Fri, 24 Jul 2020 11:14:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id fFwD1TREbnQM; Fri, 24 Jul 2020 11:14:03 +0200 (CEST) X-Auth-Info: AgG2nwIyDc7THdcTm3LqrYslbz6rTcGMFbm1og7TGL4= Received: from jawa (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Fri, 24 Jul 2020 11:14:03 +0200 (CEST) Date: Fri, 24 Jul 2020 11:14:02 +0200 From: Lukasz Majewski To: Adhemerval Zanella Subject: Re: [PATCH 06/16] linux: Consolidate fxstatat{64} Message-ID: <20200724111402.10ff4e20@jawa> In-Reply-To: <20200723194641.1949404-7-adhemerval.zanella@linaro.org> References: <20200723194641.1949404-1-adhemerval.zanella@linaro.org> <20200723194641.1949404-7-adhemerval.zanella@linaro.org> Organization: denx.de X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/GgiCtcxxH6dBi2245X07Z/Q"; protocol="application/pgp-signature" X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , libc-alpha@sourceware.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --Sig_/GgiCtcxxH6dBi2245X07Z/Q Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Thu, 23 Jul 2020 16:46:31 -0300 Adhemerval Zanella wrote: > The LFS support is implemented on fxstat64.c, instead of fxstat.c for > 64-bit architectures. The fxstatat.c implements the non-LFS and it is > a no-op for !XSTAT_IS_XSTAT64. >=20 > The generic non-LFS implementation handles two cases: >=20 > 1. New kABIs which uses generic pre 64-bit time Linux ABI (csky and > nios): it issues __NR_fstatat64 plus handle the overflow on > st_ino, st_size, or st_blocks. It only handles _STAT_VER_KERNEL. >=20 > 2. Old kABIs with old non-LFS support (arm, i386, hppa, m68k, > mips32, microblaze, s390, sh, powerpc, and sparc32). it issues > __NR_fstatat64 and convert to non-LFS stat struct based on the > version. >=20 > Also non-LFS mips64 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). >=20 > The generic LFS implementation handles multiple cases: >=20 > 1. XSTAT_IS_XSTAT64 being 1: >=20 > 1.1. 64-bit kABI (aarch64, ia64, powerpc64*, s390x, riscv64, and > x86_64): it issues __NR_newfstatat for _STAT_VER_KERNEL or > _STAT_VER_LINUX. >=20 > 1.2. 64-bit kABI outlier (sparc64): it issuess fstatat64 with a > temporary stat64 and convert to output stat64 based on the > input version (and using a sparc64 specific __xstat32_conv). >=20 > 1.3. New 32-bit kABIs with only 64-bit time_t support (arc and > riscv32): it issues __NR_statx and covert to struct stat64. >=20 > 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. >=20 > Also, two special cases requires specific implementations: >=20 > 1. alpha: it uses the __NR_fstatat64 syscall instead. >=20 > 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. >=20 > 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 > --- > sysdeps/unix/sysv/linux/Makefile | 3 +- > sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c | 1 - > sysdeps/unix/sysv/linux/alpha/fxstatat.c | 52 --------------- > .../wordsize-32 =3D> alpha}/fxstatat64.c | 35 +++++----- > sysdeps/unix/sysv/linux/arm/fxstatat.c | 1 - > sysdeps/unix/sysv/linux/fxstatat.c | 53 ++++++--------- > sysdeps/unix/sysv/linux/fxstatat64.c | 65 > +++++++++++-------- .../sysv/linux/generic/wordsize-32/fxstatat.c | > 56 ---------------- sysdeps/unix/sysv/linux/hppa/fxstatat.c | > 1 - sysdeps/unix/sysv/linux/i386/fxstatat.c | 54 --------------- > sysdeps/unix/sysv/linux/m68k/fxstatat.c | 1 - > sysdeps/unix/sysv/linux/microblaze/fxstatat.c | 1 - > .../unix/sysv/linux/mips/mips32/fxstatat.c | 1 - > .../{wordsize-64 =3D> mips/mips64}/fxstatat.c | 33 +++------- > .../unix/sysv/linux/mips/mips64/fxstatat64.c | 28 ++------ > .../sysv/linux/powerpc/powerpc32/fxstatat.c | 1 - > .../unix/sysv/linux/s390/s390-32/fxstatat.c | 1 - > sysdeps/unix/sysv/linux/sh/fxstatat.c | 1 - > .../unix/sysv/linux/sparc/sparc32/fxstatat.c | 1 - > .../sysv/linux/sparc/sparc64/dl-fxstatat64.c | 1 - > .../unix/sysv/linux/sparc/sparc64/fxstatat.c | 1 - > .../sysv/linux/wordsize-64/dl-fxstatat64.c | 1 - > .../unix/sysv/linux/wordsize-64/fxstatat64.c | 1 - > 23 files changed, 92 insertions(+), 301 deletions(-) > delete mode 100644 sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c > delete mode 100644 sysdeps/unix/sysv/linux/alpha/fxstatat.c > rename sysdeps/unix/sysv/linux/{generic/wordsize-32 =3D> > alpha}/fxstatat64.c (53%) delete mode 100644 > sysdeps/unix/sysv/linux/arm/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c delete mode > 100644 sysdeps/unix/sysv/linux/hppa/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/i386/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/m68k/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/microblaze/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c rename > sysdeps/unix/sysv/linux/{wordsize-64 =3D> mips/mips64}/fxstatat.c (56%) > delete mode 100644 > sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c delete mode > 100644 sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c delete mode > 100644 sysdeps/unix/sysv/linux/sh/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c delete mode 100644 > sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c delete mode > 100644 sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c delete mode > 100644 sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c delete > mode 100644 sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c >=20 > diff --git a/sysdeps/unix/sysv/linux/Makefile > b/sysdeps/unix/sysv/linux/Makefile index 9b2a253032..3c28adae0d 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -280,8 +280,7 @@ tests +=3D tst-fallocate tst-fallocate64 > tst-o_path-locks endif > =20 > ifeq ($(subdir),elf) > -sysdep-rtld-routines +=3D dl-brk dl-sbrk dl-getcwd dl-openat64 > dl-opendir \ > - dl-fxstatat64 > +sysdep-rtld-routines +=3D dl-brk dl-sbrk dl-getcwd dl-openat64 > dl-opendir=20 > libof-lddlibc4 =3D lddlibc4 > =20 > diff --git a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c > b/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c deleted file mode > 100644 index 330b33f7c7..0000000000 > --- a/sysdeps/unix/sysv/linux/alpha/dl-fxstatat64.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include "fxstatat.c" > diff --git a/sysdeps/unix/sysv/linux/alpha/fxstatat.c > b/sysdeps/unix/sysv/linux/alpha/fxstatat.c deleted file mode 100644 > index c5953d250a..0000000000 > --- a/sysdeps/unix/sysv/linux/alpha/fxstatat.c > +++ /dev/null > @@ -1,52 +0,0 @@ > -/* Copyright (C) 2005-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 > - . */ > - > -#define __fxstatat64 __fxstatat64_disable > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#undef __fxstatat64 > - > -/* Get information about the file NAME in BUF. */ > -int > -__fxstatat (int vers, int fd, const char *file, struct stat *st, int > flag) -{ > - int result, errno_out; > - > - /* ??? The __fxstatat entry point is new enough that it must be > using > - vers =3D=3D _STAT_VER_KERNEL64. For the benefit of > dl-fxstatat64.c, we > - cannot actually check this, lest the compiler not optimize the > rest > - of the function away. */ > - > - result =3D INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag); > - if (__glibc_likely (!INTERNAL_SYSCALL_ERROR_P (result))) > - return result; > - errno_out =3D INTERNAL_SYSCALL_ERRNO (result); > - __set_errno (errno_out); > - return -1; > -} > -libc_hidden_def (__fxstatat) > -strong_alias (__fxstatat, __fxstatat64); > -libc_hidden_ver(__fxstatat, __fxstatat64); > diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c > b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c similarity index 53% > rename from sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c > rename to sysdeps/unix/sysv/linux/alpha/fxstatat64.c > index 894f6dd396..f10c1d31e8 100644 > --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c > +++ b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c > @@ -1,7 +1,6 @@ > -/* __fxstatat64 () implementation. > - Copyright (C) 2016-2020 Free Software Foundation, Inc. > +/* fxstat using old-style Unix stat system call. > + Copyright (C) 2004-2020 Free Software Foundation, Inc. > This file is part of the GNU C Library. > - Contributed by Chris Metcalf , 2011. > =20 > The GNU C Library is free software; you can redistribute it and/or > modify it under the terms of the GNU Lesser General Public > @@ -17,21 +16,21 @@ > License along with the GNU C Library. If not, see > . */ > =20 > -/* Hide the prototype for __fxstatat so that GCC will not complain > about > - the different function signature if it is aliased to > __fxstatat64. > - If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64 > structures > - have an identical layout but different type names. */ > - > -#define __fxstatat __fxstatat_disable > - > +#define __fxstatat __redirect___fxstatat64 > #include > -#undef _STAT_VER_LINUX > -#define _STAT_VER_LINUX _STAT_VER_KERNEL > - > -#include > - > #undef __fxstatat > -#if XSTAT_IS_XSTAT64 > -weak_alias (__fxstatat64, __fxstatat) > -libc_hidden_ver (__fxstatat64, __fxstatat) > +#include > +#include > +#include > + > +/* Get information about the file NAME in BUF. */ > +int > +__fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, > int flag) +{ > + return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); > +} > +libc_hidden_def (__fxstatat64) > +#if IS_IN(libc) > +strong_alias (__fxstatat64, __fxstatat); > +hidden_ver (__fxstatat64, __fxstatat) > #endif > diff --git a/sysdeps/unix/sysv/linux/arm/fxstatat.c > b/sysdeps/unix/sysv/linux/arm/fxstatat.c deleted file mode 100644 > index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/arm/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/fxstatat.c > b/sysdeps/unix/sysv/linux/fxstatat.c index 937fec45c2..0291a2c598 > 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c > +++ b/sysdeps/unix/sysv/linux/fxstatat.c > @@ -1,4 +1,5 @@ > -/* Copyright (C) 2005-2020 Free Software Foundation, Inc. > +/* fxstatat used on fstatat, Linux implementation. > + Copyright (C) 2005-2020 Free Software Foundation, Inc. > This file is part of the GNU C Library. > =20 > The GNU C Library is free software; you can redistribute it and/or > @@ -15,48 +16,36 @@ > License along with the GNU C Library; if not, see > . */ > =20 > -/* Ho hum, if fxstatat =3D=3D fxstatat64 we must get rid of the > prototype or gcc > - will complain since they don't strictly match. */ > -#define __fxstatat64 __fxstatat64_disable > - > -#include > -#include > -#include > -#include > -#include > #include > +#include > #include > - > #include > -#include > =20 > -#include > +#if !XSTAT_IS_XSTAT64 > +# include > +# include > =20 > -/* Get information about the file NAME in BUF. */ > +/* Get information about the file FD in BUF. */ > int > __fxstatat (int vers, int fd, const char *file, struct stat *st, int > flag) { > - int result; > #if STAT_IS_KERNEL_STAT > -# define kst (*st) > -#else > - struct kernel_stat kst; > -#endif > - > - result =3D INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); > - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) > + /* New kABIs which uses generic pre 64-bit time Linux ABI, e.g. > + csky, nios2 */ > + if (vers =3D=3D _STAT_VER_KERNEL) > { > -#if STAT_IS_KERNEL_STAT > - return 0; > + int r =3D INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); > + return r ?: stat_overflow (st); > + } > + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > #else > - return __xstat_conv (vers, &kst, st); > + /* Old kABIs with old non-LFS support, e.g. arm, i386, hppa, m68k, > mips32, > + microblaze, s390, sh, powerpc32, and sparc32. */ > + struct stat64 st64; > + int r =3D INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); > + return r ?: __xstat32_conv (vers, &st64, st); > #endif > - } > - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO > (result)); } > libc_hidden_def (__fxstatat) > -#if XSTAT_IS_XSTAT64 > -# undef __fxstatat64 > -strong_alias (__fxstatat, __fxstatat64); > -libc_hidden_def (__fxstatat64) > -#endif > + > +#endif /* XSTAT_IS_XSTAT64 */ > diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c > b/sysdeps/unix/sysv/linux/fxstatat64.c index e24b456604..ac33ab4fc9 > 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c > +++ b/sysdeps/unix/sysv/linux/fxstatat64.c > @@ -1,4 +1,5 @@ > -/* Copyright (C) 2005-2020 Free Software Foundation, Inc. > +/* fxstatat64 used on fstatat64, Linux implementation. > + Copyright (C) 2005-2020 Free Software Foundation, Inc. > This file is part of the GNU C Library. > =20 > The GNU C Library is free software; you can redistribute it and/or > @@ -15,41 +16,53 @@ > License along with the GNU C Library; if not, see > . */ > =20 > -#include > -#include > -#include > -#include > -#include > +#define __fxstatat __redirect___fxstatat > #include > +#undef __fxstatat > +#include > #include > - > #include > -#include > - > +#include > #include > =20 > -/* Get information about the file NAME in BUF. */ > +/* Get information about the file FD in BUF. */ > =20 > int > __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, > int flag) { > - if (__glibc_unlikely (vers !=3D _STAT_VER_LINUX)) > - return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > - > - int result; > - > -#ifdef __NR_fstatat64 > - result =3D INTERNAL_SYSCALL_CALL (fstatat64, fd, file, st, flag); > +#if XSTAT_IS_XSTAT64 > +# ifdef __NR_newfstatat > + /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, riscv64, and > + x86_64. */ > + if (vers =3D=3D _STAT_VER_KERNEL || vers =3D=3D _STAT_VER_LINUX) > + return INLINE_SYSCALL_CALL (newfstatat, fd, file, st, flag); > +# elif defined __NR_fstatat64 > + /* 64-bit kABI outlier, e.g. sparc64. */ > + struct stat64 st64; > + int r =3D INLINE_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); > + return r ?: __xstat32_conv (vers, &st64, (struct stat *) st); > +# else > + /* New 32-bit kABIs with only 64-bit time_t support, e.g. arc, > riscv32. */ > + if (vers =3D=3D _STAT_VER_KERNEL) > + { > + struct statx tmp; > + int r =3D INLINE_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT > | flag, > + STATX_BASIC_STATS, &tmp); > + if (r =3D=3D 0) > + __cp_stat64_statx (st, &tmp); > + return r; > + } > +# endif > #else > - struct statx tmp; > - > - result =3D INTERNAL_SYSCALL_CALL (statx, fd, file, AT_NO_AUTOMOUNT | > flag, > - STATX_BASIC_STATS, &tmp); > - if (result =3D=3D 0) > - __cp_stat64_statx (st, &tmp); > + /* All kABIs with non-LFS support, e.g. arm, csky, i386, hppa, > m68k, > + microblaze, mips32, nios2, sh, powerpc32, and sparc32. */ > + if (vers =3D=3D _STAT_VER_LINUX) > + return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); > #endif > - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) > - return 0; > - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO > (result)); > + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > } > libc_hidden_def (__fxstatat64) > +#if XSTAT_IS_XSTAT64 && IS_IN(libc) > +strong_alias (__fxstatat64, __fxstatat); > +hidden_ver (__fxstatat64, __fxstatat) > +#endif > diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c > b/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c deleted file > mode 100644 index 8df65ebea0..0000000000 > --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c > +++ /dev/null > @@ -1,56 +0,0 @@ > -/* Copyright (C) 2011-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Chris Metcalf , 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 > - . */ > - > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include > -#include > - > -#if !XSTAT_IS_XSTAT64 > -#include "overflow.h" > -#include > - > -/* Get information about the file NAME in BUF. */ > -int > -__fxstatat (int vers, int fd, const char *file, struct stat *buf, > int flag) -{ > - if (vers =3D=3D _STAT_VER_KERNEL) > - { > -# ifdef __NR_fstatat64 > - int rc =3D INLINE_SYSCALL (fstatat64, 4, fd, file, buf, flag); > -# else > - struct statx tmp; > - int rc =3D INLINE_SYSCALL (statx, 5, fd, file, > - AT_NO_AUTOMOUNT | flag, > - STATX_BASIC_STATS, &tmp); > - if (rc =3D=3D 0) > - __cp_stat64_statx ((struct stat64 *)buf, &tmp); > -# endif > - return rc ?: stat_overflow (buf); > - } > - > - errno =3D EINVAL; > - return -1; > -} > -libc_hidden_def (__fxstatat) > -#endif > diff --git a/sysdeps/unix/sysv/linux/hppa/fxstatat.c > b/sysdeps/unix/sysv/linux/hppa/fxstatat.c deleted file mode 100644 > index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/hppa/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c > b/sysdeps/unix/sysv/linux/i386/fxstatat.c deleted file mode 100644 > index f720f6e429..0000000000 > --- a/sysdeps/unix/sysv/linux/i386/fxstatat.c > +++ /dev/null > @@ -1,54 +0,0 @@ > -/* Copyright (C) 2005-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 > - . */ > - > -/* Ho hum, if fxstatat =3D=3D fxstatat64 we must get rid of the > prototype or gcc > - will complain since they don't strictly match. */ > -#define __fxstatat64 __fxstatat64_disable > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > -#include > -#include > - > -#include > - > - > -/* Get information about the file NAME relative to FD in ST. */ > -int > -__fxstatat (int vers, int fd, const char *file, struct stat *st, int > flag) -{ > - int result; > - struct stat64 st64; > - > - result =3D INTERNAL_SYSCALL_CALL (fstatat64, fd, file, &st64, flag); > - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result))) > - return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO > (result)); > - else > - return __xstat32_conv (vers, &st64, st); > -} > -libc_hidden_def (__fxstatat) > -#if XSTAT_IS_XSTAT64 > -# undef __fxstatat64 > -strong_alias (__fxstatat, __fxstatat64); > -libc_hidden_ver (__fxstatat, __fxstatat64) > -#endif > diff --git a/sysdeps/unix/sysv/linux/m68k/fxstatat.c > b/sysdeps/unix/sysv/linux/m68k/fxstatat.c deleted file mode 100644 > index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/m68k/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/microblaze/fxstatat.c > b/sysdeps/unix/sysv/linux/microblaze/fxstatat.c deleted file mode > 100644 index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/microblaze/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c > b/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c deleted file mode > 100644 index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/mips/mips32/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c > b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c similarity index 56% > rename from sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c > rename to sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c > index b8f5ab562e..58410a1441 100644 > --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c > +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c > @@ -1,4 +1,5 @@ > -/* Copyright (C) 2005-2020 Free Software Foundation, Inc. > +/* 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. > =20 > The GNU C Library is free software; you can redistribute it and/or > @@ -15,34 +16,18 @@ > License along with the GNU C Library; if not, see > . */ > =20 > -/* Ho hum, since fxstatat =3D=3D fxstatat64 we must get rid of the > - prototype or gcc will complain since they don't strictly match. > */ -#define __fxstatat64 __fxstatat64_disable > - > -#include > -#include > -#include > -#include > -#include > #include > - > +#include > +#include > #include > -#include > - > +#include > =20 > -/* Get information about the file NAME relative to FD in ST. */ > +/* Get information about the file FD in BUF. */ > int > __fxstatat (int vers, int fd, const char *file, struct stat *st, int > flag) { > - if (vers !=3D _STAT_VER_KERNEL && vers !=3D _STAT_VER_LINUX) > - { > - __set_errno (EINVAL); > - return -1; > - } > - > - return INLINE_SYSCALL (newfstatat, 4, fd, file, st, flag); > + struct kernel_stat kst; > + int r =3D INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); > + return r ?: __xstat_conv (vers, &kst, st); > } > libc_hidden_def (__fxstatat) > -#undef __fxstatat64 > -strong_alias (__fxstatat, __fxstatat64); > -strong_alias (__fxstatat64, __GI___fxstatat64) > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c > b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index > 62df5fb26c..e5416d8971 100644 --- > a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++ > b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -15,17 +15,9 @@ > License along with the GNU C Library. If not, see > . */ > =20 > -#include > -#include > -#include > -#include > -#include > #include > #include > - > #include > -#include > - > #include > =20 > /* Get information about the file NAME in BUF. */ > @@ -33,22 +25,12 @@ > int > __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, > int flag) { > - if (__builtin_expect (vers !=3D _STAT_VER_LINUX, 0)) > - { > - __set_errno (EINVAL); > - return -1; > - } > - > - int result; > - struct kernel_stat kst; > - > - result =3D INTERNAL_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); > - if (!__glibc_likely (INTERNAL_SYSCALL_ERROR_P (result))) > - return __xstat64_conv (vers, &kst, st); > - else > + if (vers =3D=3D _STAT_VER_LINUX) > { > - __set_errno (INTERNAL_SYSCALL_ERRNO (result)); > - return -1; > + struct kernel_stat kst; > + int r =3D INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, > flag);; > + return r ?: __xstat64_conv (vers, &kst, st); > } > + return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); > } > libc_hidden_def (__fxstatat64) > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c > b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c deleted file > mode 100644 index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c > b/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c deleted file mode > 100644 index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/s390/s390-32/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/sh/fxstatat.c > b/sysdeps/unix/sysv/linux/sh/fxstatat.c deleted file mode 100644 > index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/sh/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c > b/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c deleted file mode > 100644 index 0f8b3135d8..0000000000 > --- a/sysdeps/unix/sysv/linux/sparc/sparc32/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c > b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c deleted file > mode 100644 index 330b33f7c7..0000000000 > --- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-fxstatat64.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include "fxstatat.c" > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c > b/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c deleted file mode > 100644 index db08af8e0f..0000000000 > --- a/sysdeps/unix/sysv/linux/sparc/sparc64/fxstatat.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include "../../i386/fxstatat.c" > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c > b/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c deleted file > mode 100644 index 330b33f7c7..0000000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c > +++ /dev/null > @@ -1 +0,0 @@ > -#include "fxstatat.c" > diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c > b/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c deleted file mode > 100644 index 05e7f413bb..0000000000 > --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat64.c > +++ /dev/null > @@ -1 +0,0 @@ > -/* fxstatat64 is in fxstatat.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 --Sig_/GgiCtcxxH6dBi2245X07Z/Q Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAl8aploACgkQAR8vZIA0 zr10yAf+IKasqQambqv61krSfj+Xxcki5899UbuLtkV/kdeePNDg3PpWCN2Wilnv pO6x2qPZ9yA6Sb92J2fzYA9InjR0c2LMhnvi2F5mNVgmkKOpSvDyeQA0ZLT+AdBt Sbhc26MSv3/LAFJ5nJy7oJJv6jrUSM6tTyEJEbz62NnD8YqITYXQbI2CvxmCEhc+ ONfuec11e0U/Mi6jWpqSK0Cakd3L/eGIKop464oPWJr/Wlqtrq5vxDr5ju7TEJln 3ejN+CHF5luAM0y0SspM0Bm3qqQqSIq1aCoRTXhXu0lt/zH9hzzjQoGUw3t3iYEv KWvKB1U4mW8vkA0JPctUUKKe+deyDA== =1myV -----END PGP SIGNATURE----- --Sig_/GgiCtcxxH6dBi2245X07Z/Q--