From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 7C1093858002; Mon, 18 Apr 2022 16:18:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C1093858002 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] mips: Fix mips64n32 64 bit time_t stat support (BZ#29069) X-Act-Checkin: glibc X-Git-Author: =Joshua Kinard X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: bd415684df590b14d4970acc93ad28719fffe4c1 X-Git-Newrev: 8e8d46d59809824054dde501b0ba0e331a747078 Message-Id: <20220418161804.7C1093858002@sourceware.org> Date: Mon, 18 Apr 2022 16:18:04 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2022 16:18:04 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8e8d46d59809824054dde501b0ba0e331a747078 commit 8e8d46d59809824054dde501b0ba0e331a747078 Author: =Joshua Kinard Date: Mon Apr 18 09:55:08 2022 -0300 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) Diff: --- NEWS | 2 ++ sysdeps/unix/sysv/linux/mips/bits/struct_stat.h | 38 +++++++++++++++---------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 30b644685f..264b91cd1a 100644 --- a/NEWS +++ b/NEWS @@ -359,6 +359,8 @@ The following bugs are resolved with this release: [28837] libc: FAIL: socket/tst-socket-timestamp-compat [28847] locale: Empty mon_decimal_point in LC_MONETARY results in non- empty mon_decimal_point_wc + [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 7747b3e471..71594e4562 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