From b87b697f15d6bf7e576a2eeadc1f740172f9d013 Mon Sep 17 00:00:00 2001 From: =Joshua Kinard Date: Mon, 18 Apr 2022 09:55:08 -0300 Subject: [PATCH] mips: Fix mips64n32 64 bit time_t stat support (BZ#29069) Add missing support initially added by 4e8521333bea6e89fcef1020 (which missed n32 stat). (cherry picked from commit 78fb88827362fbd2cc8aa32892ae5b015106e25c) --- NEWS | 2 + .../unix/sysv/linux/mips/bits/struct_stat.h | 38 +++++++++++-------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 55aea241d5f..edb1be4e00e 100644 --- a/NEWS +++ b/NEWS @@ -95,6 +95,8 @@ The following bugs are resolved with this release: [28953] nss: Protect against errno changes in function lookup [29029] nptl: poll() spuriously returns EINTR during thread cancellation and with cancellation disabled + [29069] libc: fstatat64_time64_statx wrapper broken on MIPS N32 with + -D_FILE_OFFSET_BITS=64 and -D_TIME_BITS=64 Version 2.34 diff --git a/sysdeps/unix/sysv/linux/mips/bits/struct_stat.h b/sysdeps/unix/sysv/linux/mips/bits/struct_stat.h index ab9f474cbc2..ed5b1bc00ba 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/struct_stat.h +++ b/sysdeps/unix/sysv/linux/mips/bits/struct_stat.h @@ -131,27 +131,30 @@ struct stat64 struct stat { +# ifdef __USE_TIME_BITS64 +# include +# else __dev_t st_dev; int st_pad1[3]; /* Reserved for st_dev expansion */ -# ifndef __USE_FILE_OFFSET64 +# ifndef __USE_FILE_OFFSET64 __ino_t st_ino; -# else +# else __ino64_t st_ino; -# endif +# endif __mode_t st_mode; __nlink_t st_nlink; __uid_t st_uid; __gid_t st_gid; __dev_t st_rdev; -# if !defined __USE_FILE_OFFSET64 +# if !defined __USE_FILE_OFFSET64 unsigned int st_pad2[2]; /* Reserved for st_rdev expansion */ __off_t st_size; int st_pad3; -# else +# else unsigned int st_pad2[3]; /* Reserved for st_rdev expansion */ __off64_t st_size; -# endif -# ifdef __USE_XOPEN2K8 +# endif +# ifdef __USE_XOPEN2K8 /* Nanosecond resolution timestamps are stored in a format equivalent to 'struct timespec'. This is the type used whenever possible but the Unix namespace rules do not allow the @@ -161,30 +164,34 @@ struct stat struct timespec st_atim; /* Time of last access. */ struct timespec st_mtim; /* Time of last modification. */ struct timespec st_ctim; /* Time of last status change. */ -# define st_atime st_atim.tv_sec /* Backward compatibility. */ -# define st_mtime st_mtim.tv_sec -# define st_ctime st_ctim.tv_sec -# else +# define st_atime st_atim.tv_sec /* Backward compatibility. */ +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec +# else __time_t st_atime; /* Time of last access. */ unsigned long int st_atimensec; /* Nscecs of last access. */ __time_t st_mtime; /* Time of last modification. */ unsigned long int st_mtimensec; /* Nsecs of last modification. */ __time_t st_ctime; /* Time of last status change. */ unsigned long int st_ctimensec; /* Nsecs of last status change. */ -# endif +# endif __blksize_t st_blksize; unsigned int st_pad4; -# ifndef __USE_FILE_OFFSET64 +# ifndef __USE_FILE_OFFSET64 __blkcnt_t st_blocks; -# else +# else __blkcnt64_t st_blocks; -# endif +# endif int st_pad5[14]; +# endif }; #ifdef __USE_LARGEFILE64 struct stat64 { +# ifdef __USE_TIME_BITS64 +# include +# else __dev_t st_dev; unsigned int st_pad1[3]; /* Reserved for st_dev expansion */ __ino64_t st_ino; @@ -217,6 +224,7 @@ struct stat64 unsigned int st_pad3; __blkcnt64_t st_blocks; int st_pad4[14]; +# endif /* __USE_TIME_BITS64 */ }; #endif -- 2.47.3