diff mbox series

[v2] linux: Fix fstat64 on alpha and sparc64

Message ID 20240102143152.3477636-1-adhemerval.zanella@linaro.org
State Committed
Headers
Series [v2] linux: Fix fstat64 on alpha and sparc64 |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed

Commit Message

Adhemerval Zanella Netto Jan. 2, 2024, 2:31 p.m. UTC 
  The 551101e8240b7514fc646d1722f8b79c90362b8f change is incorrect for
alpha and sparc, since __NR_stat is defined by both kABI.  Use
__NR_newfstat to check whether to fallback to __NR_fstat64 (similar
to what fstatat64 does).

Checked on sparc64-linux-gnu.
---
 sysdeps/unix/sysv/linux/fstat64.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Carlos O'Donell Jan. 12, 2024, 1:37 p.m. UTC | #1 
On 1/2/24 09:31, Adhemerval Zanella wrote:
> The 551101e8240b7514fc646d1722f8b79c90362b8f change is incorrect for
> alpha and sparc, since __NR_stat is defined by both kABI.  Use
> __NR_newfstat to check whether to fallback to __NR_fstat64 (similar
> to what fstatat64 does).

LGTM for 2.39.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> Checked on sparc64-linux-gnu.
> ---
>  sysdeps/unix/sysv/linux/fstat64.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/fstat64.c b/sysdeps/unix/sysv/linux/fstat64.c
> index b4b5dc2908..cc9f695df9 100644
> --- a/sysdeps/unix/sysv/linux/fstat64.c
> +++ b/sysdeps/unix/sysv/linux/fstat64.c
> @@ -30,7 +30,10 @@ __fstat64_time64 (int fd, struct __stat64_t64 *buf)
>  {
>  #if !FSTATAT_USE_STATX
>  # if XSTAT_IS_XSTAT64
> -#  ifdef __NR_fstat
> +  /* The __NR_stat macro is defined for all ABIs that also define 
> +     XSTAT_IS_STAT64, so to correctly identify alpha and sparc check
> +     __NR_newfstatat (similar to what fstatat64 does).  */
> +#  ifdef __NR_newfstatat

OK. Confirmed in fstatat64.c we use __NR_newfstatat to identify a 64-bit kABI.

>    /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, riscv64, and
>       x86_64.  */
>    return INLINE_SYSCALL_CALL (fstat, fd, buf);
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/fstat64.c b/sysdeps/unix/sysv/linux/fstat64.c
index b4b5dc2908..cc9f695df9 100644
--- a/sysdeps/unix/sysv/linux/fstat64.c
+++ b/sysdeps/unix/sysv/linux/fstat64.c
@@ -30,7 +30,10 @@  __fstat64_time64 (int fd, struct __stat64_t64 *buf)
 {
 #if !FSTATAT_USE_STATX
 # if XSTAT_IS_XSTAT64
-#  ifdef __NR_fstat
+  /* The __NR_stat macro is defined for all ABIs that also define 
+     XSTAT_IS_STAT64, so to correctly identify alpha and sparc check
+     __NR_newfstatat (similar to what fstatat64 does).  */
+#  ifdef __NR_newfstatat
   /* 64-bit kABI, e.g. aarch64, ia64, powerpc64*, s390x, riscv64, and
      x86_64.  */
   return INLINE_SYSCALL_CALL (fstat, fd, buf);