889 lines
35 KiB
Diff
889 lines
35 KiB
Diff
From 7b7dfbb0cbdffebf0233c650627a4861212fbb60 Mon Sep 17 00:00:00 2001
|
||
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||
Date: Wed, 19 Oct 2022 19:14:04 -0300
|
||
Subject: [PATCH 65/81] linux: Fix generic struct_stat for 64 bit time (BZ#
|
||
29657)
|
||
|
||
The generic Linux struct_stat misses the conditionals to use
|
||
bits/struct_stat_time64_helper.h in the __USE_TIME_BITS64 for
|
||
architecture that uses __TIMESIZE == 32 (currently csky and nios2).
|
||
|
||
Since newer ports should not support 32 bit time_t, the generic
|
||
implementation should be used as default.
|
||
|
||
For arm, hppa, and sh a copy of default struct_stat is added,
|
||
while for csky and nios a new one based on generic is used, along
|
||
with conditionals to use bits/struct_stat_time64_helper.h.
|
||
|
||
The default struct_stat is also replaced with the generic one.
|
||
|
||
Checked on aarch64-linux-gnu and arm-linux-gnueabihf.
|
||
|
||
(cherry picked from commit 7a6ca82f8007ddbd43e2b8fce806ba7101ee47f5)
|
||
---
|
||
NEWS | 2 +
|
||
.../unix/sysv/linux/arm/bits/struct_stat.h | 139 ++++++++++++++++++
|
||
sysdeps/unix/sysv/linux/bits/struct_stat.h | 116 +++++++--------
|
||
.../{generic => csky}/bits/struct_stat.h | 28 ++--
|
||
.../unix/sysv/linux/hppa/bits/struct_stat.h | 139 ++++++++++++++++++
|
||
.../unix/sysv/linux/nios2/bits/struct_stat.h | 135 +++++++++++++++++
|
||
sysdeps/unix/sysv/linux/sh/bits/struct_stat.h | 139 ++++++++++++++++++
|
||
7 files changed, 624 insertions(+), 74 deletions(-)
|
||
create mode 100644 sysdeps/unix/sysv/linux/arm/bits/struct_stat.h
|
||
rename sysdeps/unix/sysv/linux/{generic => csky}/bits/struct_stat.h (92%)
|
||
create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/struct_stat.h
|
||
create mode 100644 sysdeps/unix/sysv/linux/nios2/bits/struct_stat.h
|
||
create mode 100644 sysdeps/unix/sysv/linux/sh/bits/struct_stat.h
|
||
|
||
diff --git a/NEWS b/NEWS
|
||
index 8c60d3dc8d..833045585f 100644
|
||
--- a/NEWS
|
||
+++ b/NEWS
|
||
@@ -43,6 +43,8 @@ The following bugs are resolved with this release:
|
||
[29607] nscd repeatably crashes calling __strlen_avx2 when hosts cache is
|
||
enabled
|
||
[29638] libc: stdlib: arc4random fallback is never used
|
||
+ [29657] libc: Incorrect struct stat for 64-bit time on linux/generic
|
||
+ platforms
|
||
|
||
Version 2.36
|
||
|
||
diff --git a/sysdeps/unix/sysv/linux/arm/bits/struct_stat.h b/sysdeps/unix/sysv/linux/arm/bits/struct_stat.h
|
||
new file mode 100644
|
||
index 0000000000..30ee6279d2
|
||
--- /dev/null
|
||
+++ b/sysdeps/unix/sysv/linux/arm/bits/struct_stat.h
|
||
@@ -0,0 +1,139 @@
|
||
+/* Definition for struct stat. Linux/arm version.
|
||
+ Copyright (C) 2020-2022 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
|
||
+ <https://www.gnu.org/licenses/>. */
|
||
+
|
||
+#if !defined _SYS_STAT_H && !defined _FCNTL_H
|
||
+# error "Never include <bits/struct_stat.h> directly; use <sys/stat.h> instead."
|
||
+#endif
|
||
+
|
||
+#ifndef _BITS_STRUCT_STAT_H
|
||
+#define _BITS_STRUCT_STAT_H 1
|
||
+
|
||
+#include <bits/endian.h>
|
||
+#include <bits/wordsize.h>
|
||
+
|
||
+struct stat
|
||
+ {
|
||
+#ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+#else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ unsigned short int __pad1;
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __ino_t st_ino; /* File serial number. */
|
||
+# else
|
||
+ __ino_t __st_ino; /* 32bit file serial number. */
|
||
+# endif
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ unsigned short int __pad2;
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __off_t st_size; /* Size of file, in bytes. */
|
||
+# else
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+# endif
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# else
|
||
+ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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
|
||
+ __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
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ unsigned long int __glibc_reserved4;
|
||
+ unsigned long int __glibc_reserved5;
|
||
+# else
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+# endif
|
||
+#endif /* __USE_TIME_BITS64 */
|
||
+ };
|
||
+
|
||
+#ifdef __USE_LARGEFILE64
|
||
+struct stat64
|
||
+ {
|
||
+# ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+# else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ unsigned int __pad1;
|
||
+
|
||
+ __ino_t __st_ino; /* 32bit file serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ unsigned int __pad2;
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+
|
||
+ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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. */
|
||
+# 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
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+# endif /* __USE_TIME_BITS64 */
|
||
+ };
|
||
+#endif
|
||
+
|
||
+/* Tell code we have these members. */
|
||
+#define _STATBUF_ST_BLKSIZE
|
||
+#define _STATBUF_ST_RDEV
|
||
+/* Nanosecond resolution time values are supported. */
|
||
+#define _STATBUF_ST_NSEC
|
||
+
|
||
+
|
||
+#endif /* _BITS_STRUCT_STAT_H */
|
||
diff --git a/sysdeps/unix/sysv/linux/bits/struct_stat.h b/sysdeps/unix/sysv/linux/bits/struct_stat.h
|
||
index 25bd6cb638..fb11a3fba4 100644
|
||
--- a/sysdeps/unix/sysv/linux/bits/struct_stat.h
|
||
+++ b/sysdeps/unix/sysv/linux/bits/struct_stat.h
|
||
@@ -26,37 +26,36 @@
|
||
#include <bits/endian.h>
|
||
#include <bits/wordsize.h>
|
||
|
||
-struct stat
|
||
- {
|
||
-#ifdef __USE_TIME_BITS64
|
||
-# include <bits/struct_stat_time64_helper.h>
|
||
-#else
|
||
- __dev_t st_dev; /* Device. */
|
||
- unsigned short int __pad1;
|
||
-# ifndef __USE_FILE_OFFSET64
|
||
- __ino_t st_ino; /* File serial number. */
|
||
-# else
|
||
- __ino_t __st_ino; /* 32bit file serial number. */
|
||
+#if defined __USE_FILE_OFFSET64
|
||
+# define __field64(type, type64, name) type64 name
|
||
+#elif __WORDSIZE == 64 || defined __INO_T_MATCHES_INO64_T
|
||
+# if defined __INO_T_MATCHES_INO64_T && !defined __OFF_T_MATCHES_OFF64_T
|
||
+# error "ino_t and off_t must both be the same type"
|
||
# endif
|
||
- __mode_t st_mode; /* File mode. */
|
||
- __nlink_t st_nlink; /* Link count. */
|
||
- __uid_t st_uid; /* User ID of the file's owner. */
|
||
- __gid_t st_gid; /* Group ID of the file's group.*/
|
||
- __dev_t st_rdev; /* Device number, if device. */
|
||
- unsigned short int __pad2;
|
||
-# ifndef __USE_FILE_OFFSET64
|
||
- __off_t st_size; /* Size of file, in bytes. */
|
||
-# else
|
||
- __off64_t st_size; /* Size of file, in bytes. */
|
||
-# endif
|
||
- __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+# define __field64(type, type64, name) type name
|
||
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
|
||
+# define __field64(type, type64, name) \
|
||
+ type name __attribute__((__aligned__ (__alignof__ (type64)))); int __##name##_pad
|
||
+#else
|
||
+# define __field64(type, type64, name) \
|
||
+ int __##name##_pad __attribute__((__aligned__ (__alignof__ (type64)))); type name
|
||
+#endif
|
||
|
||
-# ifndef __USE_FILE_OFFSET64
|
||
- __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
-# else
|
||
- __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
-# endif
|
||
-# ifdef __USE_XOPEN2K8
|
||
+struct stat
|
||
+ {
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ __field64(__ino_t, __ino64_t, st_ino); /* File serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ __dev_t __pad1;
|
||
+ __field64(__off_t, __off64_t, st_size); /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+ int __pad2;
|
||
+ __field64(__blkcnt_t, __blkcnt64_t, st_blocks); /* 512-byte blocks */
|
||
+#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
|
||
@@ -66,47 +65,38 @@ 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
|
||
-# ifndef __USE_FILE_OFFSET64
|
||
- unsigned long int __glibc_reserved4;
|
||
- unsigned long int __glibc_reserved5;
|
||
-# else
|
||
- __ino64_t st_ino; /* File serial number. */
|
||
-# endif
|
||
-#endif /* __USE_TIME_BITS64 */
|
||
+#endif
|
||
+ int __glibc_reserved[2];
|
||
};
|
||
|
||
+#undef __field64
|
||
+
|
||
#ifdef __USE_LARGEFILE64
|
||
struct stat64
|
||
{
|
||
-# ifdef __USE_TIME_BITS64
|
||
-# include <bits/struct_stat_time64_helper.h>
|
||
-# else
|
||
- __dev_t st_dev; /* Device. */
|
||
- unsigned int __pad1;
|
||
-
|
||
- __ino_t __st_ino; /* 32bit file serial number. */
|
||
- __mode_t st_mode; /* File mode. */
|
||
- __nlink_t st_nlink; /* Link count. */
|
||
- __uid_t st_uid; /* User ID of the file's owner. */
|
||
- __gid_t st_gid; /* Group ID of the file's group.*/
|
||
- __dev_t st_rdev; /* Device number, if device. */
|
||
- unsigned int __pad2;
|
||
- __off64_t st_size; /* Size of file, in bytes. */
|
||
- __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
-
|
||
- __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
-# ifdef __USE_XOPEN2K8
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ __dev_t __pad1;
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+ int __pad2;
|
||
+ __blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */
|
||
+#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
|
||
@@ -116,16 +106,15 @@ struct stat64
|
||
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. */
|
||
-# else
|
||
+#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
|
||
- __ino64_t st_ino; /* File serial number. */
|
||
-# endif /* __USE_TIME_BITS64 */
|
||
+#endif
|
||
+ int __glibc_reserved[2];
|
||
};
|
||
#endif
|
||
|
||
@@ -135,5 +124,4 @@ struct stat64
|
||
/* Nanosecond resolution time values are supported. */
|
||
#define _STATBUF_ST_NSEC
|
||
|
||
-
|
||
#endif /* _BITS_STRUCT_STAT_H */
|
||
diff --git a/sysdeps/unix/sysv/linux/generic/bits/struct_stat.h b/sysdeps/unix/sysv/linux/csky/bits/struct_stat.h
|
||
similarity index 92%
|
||
rename from sysdeps/unix/sysv/linux/generic/bits/struct_stat.h
|
||
rename to sysdeps/unix/sysv/linux/csky/bits/struct_stat.h
|
||
index fb11a3fba4..f0ee455748 100644
|
||
--- a/sysdeps/unix/sysv/linux/generic/bits/struct_stat.h
|
||
+++ b/sysdeps/unix/sysv/linux/csky/bits/struct_stat.h
|
||
@@ -1,4 +1,4 @@
|
||
-/* Definition for struct stat.
|
||
+/* Definition for struct stat. Linux/csky version.
|
||
Copyright (C) 2020-2022 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
|
||
@@ -43,6 +43,9 @@
|
||
|
||
struct stat
|
||
{
|
||
+#ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+#else
|
||
__dev_t st_dev; /* Device. */
|
||
__field64(__ino_t, __ino64_t, st_ino); /* File serial number. */
|
||
__mode_t st_mode; /* File mode. */
|
||
@@ -55,7 +58,7 @@ struct stat
|
||
__blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
int __pad2;
|
||
__field64(__blkcnt_t, __blkcnt64_t, st_blocks); /* 512-byte blocks */
|
||
-#ifdef __USE_XOPEN2K8
|
||
+# 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
|
||
@@ -65,18 +68,19 @@ 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
|
||
int __glibc_reserved[2];
|
||
+#endif
|
||
};
|
||
|
||
#undef __field64
|
||
@@ -84,6 +88,9 @@ struct stat
|
||
#ifdef __USE_LARGEFILE64
|
||
struct stat64
|
||
{
|
||
+# ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+# else
|
||
__dev_t st_dev; /* Device. */
|
||
__ino64_t st_ino; /* File serial number. */
|
||
__mode_t st_mode; /* File mode. */
|
||
@@ -96,7 +103,7 @@ struct stat64
|
||
__blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
int __pad2;
|
||
__blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */
|
||
-#ifdef __USE_XOPEN2K8
|
||
+# 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
|
||
@@ -106,15 +113,16 @@ struct stat64
|
||
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. */
|
||
-#else
|
||
+# 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
|
||
int __glibc_reserved[2];
|
||
+# endif
|
||
};
|
||
#endif
|
||
|
||
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/struct_stat.h b/sysdeps/unix/sysv/linux/hppa/bits/struct_stat.h
|
||
new file mode 100644
|
||
index 0000000000..38b6e13e68
|
||
--- /dev/null
|
||
+++ b/sysdeps/unix/sysv/linux/hppa/bits/struct_stat.h
|
||
@@ -0,0 +1,139 @@
|
||
+/* Definition for struct stat. Linux/hppa version.
|
||
+ Copyright (C) 2020-2022 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
|
||
+ <https://www.gnu.org/licenses/>. */
|
||
+
|
||
+#if !defined _SYS_STAT_H && !defined _FCNTL_H
|
||
+# error "Never include <bits/struct_stat.h> directly; use <sys/stat.h> instead."
|
||
+#endif
|
||
+
|
||
+#ifndef _BITS_STRUCT_STAT_H
|
||
+#define _BITS_STRUCT_STAT_H 1
|
||
+
|
||
+#include <bits/endian.h>
|
||
+#include <bits/wordsize.h>
|
||
+
|
||
+struct stat
|
||
+ {
|
||
+#ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+#else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ unsigned short int __pad1;
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __ino_t st_ino; /* File serial number. */
|
||
+# else
|
||
+ __ino_t __st_ino; /* 32bit file serial number. */
|
||
+# endif
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ unsigned short int __pad2;
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __off_t st_size; /* Size of file, in bytes. */
|
||
+# else
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+# endif
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# else
|
||
+ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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
|
||
+ __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
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ unsigned long int __glibc_reserved4;
|
||
+ unsigned long int __glibc_reserved5;
|
||
+# else
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+# endif
|
||
+#endif /* __USE_TIME_BITS64 */
|
||
+ };
|
||
+
|
||
+#ifdef __USE_LARGEFILE64
|
||
+struct stat64
|
||
+ {
|
||
+# ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+# else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ unsigned int __pad1;
|
||
+
|
||
+ __ino_t __st_ino; /* 32bit file serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ unsigned int __pad2;
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+
|
||
+ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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. */
|
||
+# 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
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+# endif /* __USE_TIME_BITS64 */
|
||
+ };
|
||
+#endif
|
||
+
|
||
+/* Tell code we have these members. */
|
||
+#define _STATBUF_ST_BLKSIZE
|
||
+#define _STATBUF_ST_RDEV
|
||
+/* Nanosecond resolution time values are supported. */
|
||
+#define _STATBUF_ST_NSEC
|
||
+
|
||
+
|
||
+#endif /* _BITS_STRUCT_STAT_H */
|
||
diff --git a/sysdeps/unix/sysv/linux/nios2/bits/struct_stat.h b/sysdeps/unix/sysv/linux/nios2/bits/struct_stat.h
|
||
new file mode 100644
|
||
index 0000000000..e00e71173e
|
||
--- /dev/null
|
||
+++ b/sysdeps/unix/sysv/linux/nios2/bits/struct_stat.h
|
||
@@ -0,0 +1,135 @@
|
||
+/* Definition for struct stat. Linux/nios2 version.
|
||
+ Copyright (C) 2020-2022 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
|
||
+ <https://www.gnu.org/licenses/>. */
|
||
+
|
||
+#if !defined _SYS_STAT_H && !defined _FCNTL_H
|
||
+# error "Never include <bits/struct_stat.h> directly; use <sys/stat.h> instead."
|
||
+#endif
|
||
+
|
||
+#ifndef _BITS_STRUCT_STAT_H
|
||
+#define _BITS_STRUCT_STAT_H 1
|
||
+
|
||
+#include <bits/endian.h>
|
||
+#include <bits/wordsize.h>
|
||
+
|
||
+#if defined __USE_FILE_OFFSET64
|
||
+# define __field64(type, type64, name) type64 name
|
||
+#elif __WORDSIZE == 64 || defined __INO_T_MATCHES_INO64_T
|
||
+# if defined __INO_T_MATCHES_INO64_T && !defined __OFF_T_MATCHES_OFF64_T
|
||
+# error "ino_t and off_t must both be the same type"
|
||
+# endif
|
||
+# define __field64(type, type64, name) type name
|
||
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
|
||
+# define __field64(type, type64, name) \
|
||
+ type name __attribute__((__aligned__ (__alignof__ (type64)))); int __##name##_pad
|
||
+#else
|
||
+# define __field64(type, type64, name) \
|
||
+ int __##name##_pad __attribute__((__aligned__ (__alignof__ (type64)))); type name
|
||
+#endif
|
||
+
|
||
+struct stat
|
||
+ {
|
||
+#ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+#else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ __field64(__ino_t, __ino64_t, st_ino); /* File serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ __dev_t __pad1;
|
||
+ __field64(__off_t, __off64_t, st_size); /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+ int __pad2;
|
||
+ __field64(__blkcnt_t, __blkcnt64_t, st_blocks); /* 512-byte blocks */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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
|
||
+ __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
|
||
+ int __glibc_reserved[2];
|
||
+#endif
|
||
+ };
|
||
+
|
||
+#undef __field64
|
||
+
|
||
+#ifdef __USE_LARGEFILE64
|
||
+struct stat64
|
||
+ {
|
||
+# ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+# else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ __dev_t __pad1;
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+ int __pad2;
|
||
+ __blkcnt64_t st_blocks; /* Nr. 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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. */
|
||
+# 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
|
||
+ int __glibc_reserved[2];
|
||
+# endif
|
||
+ };
|
||
+#endif
|
||
+
|
||
+/* Tell code we have these members. */
|
||
+#define _STATBUF_ST_BLKSIZE
|
||
+#define _STATBUF_ST_RDEV
|
||
+/* Nanosecond resolution time values are supported. */
|
||
+#define _STATBUF_ST_NSEC
|
||
+
|
||
+#endif /* _BITS_STRUCT_STAT_H */
|
||
diff --git a/sysdeps/unix/sysv/linux/sh/bits/struct_stat.h b/sysdeps/unix/sysv/linux/sh/bits/struct_stat.h
|
||
new file mode 100644
|
||
index 0000000000..0f7c9cdc89
|
||
--- /dev/null
|
||
+++ b/sysdeps/unix/sysv/linux/sh/bits/struct_stat.h
|
||
@@ -0,0 +1,139 @@
|
||
+/* Definition for struct stat. Linux/sh version.
|
||
+ Copyright (C) 2020-2022 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
|
||
+ <https://www.gnu.org/licenses/>. */
|
||
+
|
||
+#if !defined _SYS_STAT_H && !defined _FCNTL_H
|
||
+# error "Never include <bits/struct_stat.h> directly; use <sys/stat.h> instead."
|
||
+#endif
|
||
+
|
||
+#ifndef _BITS_STRUCT_STAT_H
|
||
+#define _BITS_STRUCT_STAT_H 1
|
||
+
|
||
+#include <bits/endian.h>
|
||
+#include <bits/wordsize.h>
|
||
+
|
||
+struct stat
|
||
+ {
|
||
+#ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+#else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ unsigned short int __pad1;
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __ino_t st_ino; /* File serial number. */
|
||
+# else
|
||
+ __ino_t __st_ino; /* 32bit file serial number. */
|
||
+# endif
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ unsigned short int __pad2;
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __off_t st_size; /* Size of file, in bytes. */
|
||
+# else
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+# endif
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# else
|
||
+ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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
|
||
+ __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
|
||
+# ifndef __USE_FILE_OFFSET64
|
||
+ unsigned long int __glibc_reserved4;
|
||
+ unsigned long int __glibc_reserved5;
|
||
+# else
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+# endif
|
||
+#endif /* __USE_TIME_BITS64 */
|
||
+ };
|
||
+
|
||
+#ifdef __USE_LARGEFILE64
|
||
+struct stat64
|
||
+ {
|
||
+# ifdef __USE_TIME_BITS64
|
||
+# include <bits/struct_stat_time64_helper.h>
|
||
+# else
|
||
+ __dev_t st_dev; /* Device. */
|
||
+ unsigned int __pad1;
|
||
+
|
||
+ __ino_t __st_ino; /* 32bit file serial number. */
|
||
+ __mode_t st_mode; /* File mode. */
|
||
+ __nlink_t st_nlink; /* Link count. */
|
||
+ __uid_t st_uid; /* User ID of the file's owner. */
|
||
+ __gid_t st_gid; /* Group ID of the file's group.*/
|
||
+ __dev_t st_rdev; /* Device number, if device. */
|
||
+ unsigned int __pad2;
|
||
+ __off64_t st_size; /* Size of file, in bytes. */
|
||
+ __blksize_t st_blksize; /* Optimal block size for I/O. */
|
||
+
|
||
+ __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */
|
||
+# 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
|
||
+ identifier 'timespec' to appear in the <sys/stat.h> header.
|
||
+ Therefore we have to handle the use of this header in strictly
|
||
+ standard-compliant sources special. */
|
||
+ 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. */
|
||
+# 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
|
||
+ __ino64_t st_ino; /* File serial number. */
|
||
+# endif /* __USE_TIME_BITS64 */
|
||
+ };
|
||
+#endif
|
||
+
|
||
+/* Tell code we have these members. */
|
||
+#define _STATBUF_ST_BLKSIZE
|
||
+#define _STATBUF_ST_RDEV
|
||
+/* Nanosecond resolution time values are supported. */
|
||
+#define _STATBUF_ST_NSEC
|
||
+
|
||
+
|
||
+#endif /* _BITS_STRUCT_STAT_H */
|
||
--
|
||
2.19.1.6.gb485710b
|
||
|