Skip to content

Commit f4619be

Browse files
snoggetgross35
snogge
authored and
tgross35
committed
gnu: Adapt struct stat64 for gnu_time_bits64
References: ARM: https://github.com/bminor/glibc/blob/77930e0447e0b37a129db0e13c6c6f5e60a3019e/sysdeps/unix/sysv/linux/arm/bits/struct_stat.h MIPS: https://github.com/bminor/glibc/blob/77930e0447e0b37a129db0e13c6c6f5e60a3019e/sysdeps/unix/sysv/linux/mips/bits/struct_stat.h POWERPC: https://github.com/bminor/glibc/blob/77930e0447e0b37a129db0e13c6c6f5e60a3019e/sysdeps/unix/sysv/linux/powerpc/bits/struct_stat.h SPARC: https://github.com/bminor/glibc/blob/77930e0447e0b37a129db0e13c6c6f5e60a3019e/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h x86: https://github.com/bminor/glibc/blob/77930e0447e0b37a129db0e13c6c6f5e60a3019e/sysdeps/unix/sysv/linux/x86/bits/struct_stat.h Common definition for _TIME_BITS=64 https://github.com/bminor/glibc/blob/77930e0447e0b37a129db0e13c6c6f5e60a3019e/sysdeps/unix/sysv/linux/bits/struct_stat_time64_helper.h (backport <rust-lang#4433>) (cherry picked from commit 402a851)
1 parent 36b2e48 commit f4619be

4 files changed

Lines changed: 63 additions & 0 deletions

File tree

‎src/unix/linux_like/linux/gnu/b32/arm/mod.rs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,35 @@ s! {
6060

6161
pub struct stat64 {
6262
pub st_dev: crate::dev_t,
63+
#[cfg(not(gnu_time_bits64))]
6364
__pad1: c_uint,
65+
#[cfg(not(gnu_time_bits64))]
6466
__st_ino: c_ulong,
67+
#[cfg(gnu_time_bits64)]
68+
pub st_ino: crate::ino_t,
6569
pub st_mode: crate::mode_t,
6670
pub st_nlink: crate::nlink_t,
6771
pub st_uid: crate::uid_t,
6872
pub st_gid: crate::gid_t,
6973
pub st_rdev: crate::dev_t,
74+
#[cfg(not(gnu_time_bits64))]
7075
__pad2: c_uint,
7176
pub st_size: off64_t,
7277
pub st_blksize: crate::blksize_t,
7378
pub st_blocks: crate::blkcnt64_t,
7479
pub st_atime: crate::time_t,
7580
pub st_atime_nsec: c_long,
81+
#[cfg(gnu_time_bits64)]
82+
_atime_pad: c_int,
7683
pub st_mtime: crate::time_t,
7784
pub st_mtime_nsec: c_long,
85+
#[cfg(gnu_time_bits64)]
86+
_mtime_pad: c_int,
7887
pub st_ctime: crate::time_t,
7988
pub st_ctime_nsec: c_long,
89+
#[cfg(gnu_time_bits64)]
90+
_ctime_pad: c_int,
91+
#[cfg(not(gnu_time_bits64))]
8092
pub st_ino: crate::ino64_t,
8193
}
8294

‎src/unix/linux_like/linux/gnu/b32/mips/mod.rs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,55 @@ s! {
6464
}
6565

6666
pub struct stat64 {
67+
#[cfg(not(gnu_time_bits64))]
6768
pub st_dev: c_ulong,
69+
#[cfg(gnu_time_bits64)]
70+
pub st_dev: crate::dev_t,
71+
72+
#[cfg(not(gnu_time_bits64))]
6873
st_pad1: [c_long; 3],
74+
6975
pub st_ino: crate::ino64_t,
7076
pub st_mode: crate::mode_t,
7177
pub st_nlink: crate::nlink_t,
7278
pub st_uid: crate::uid_t,
7379
pub st_gid: crate::gid_t,
80+
81+
#[cfg(not(gnu_time_bits64))]
7482
pub st_rdev: c_ulong,
83+
#[cfg(gnu_time_bits64)]
84+
pub st_rdev: crate::dev_t,
85+
86+
#[cfg(not(gnu_time_bits64))]
7587
st_pad2: [c_long; 3],
88+
7689
pub st_size: off64_t,
90+
91+
#[cfg(gnu_time_bits64)]
92+
pub st_blksize: crate::blksize_t,
93+
#[cfg(gnu_time_bits64)]
94+
pub st_blocks: crate::blkcnt_t,
95+
7796
pub st_atime: crate::time_t,
97+
#[cfg(gnu_time_bits64)]
98+
_atime_pad: c_int,
7899
pub st_atime_nsec: c_long,
79100
pub st_mtime: crate::time_t,
101+
#[cfg(gnu_time_bits64)]
102+
_mtime_pad: c_int,
80103
pub st_mtime_nsec: c_long,
81104
pub st_ctime: crate::time_t,
105+
#[cfg(gnu_time_bits64)]
106+
_ctime_pad: c_int,
82107
pub st_ctime_nsec: c_long,
108+
109+
#[cfg(not(gnu_time_bits64))]
83110
pub st_blksize: crate::blksize_t,
111+
#[cfg(not(gnu_time_bits64))]
84112
st_pad3: c_long,
113+
#[cfg(not(gnu_time_bits64))]
85114
pub st_blocks: crate::blkcnt64_t,
115+
#[cfg(not(gnu_time_bits64))]
86116
st_pad5: [c_long; 14],
87117
}
88118

‎src/unix/linux_like/linux/gnu/b32/powerpc.rs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,26 @@ s! {
9898
pub st_uid: crate::uid_t,
9999
pub st_gid: crate::gid_t,
100100
pub st_rdev: crate::dev_t,
101+
#[cfg(not(gnu_time_bits64))]
101102
__pad2: c_ushort,
102103
pub st_size: off64_t,
103104
pub st_blksize: crate::blksize_t,
104105
pub st_blocks: crate::blkcnt64_t,
105106
pub st_atime: crate::time_t,
107+
#[cfg(gnu_time_bits64)]
108+
_atime_pad: c_int,
106109
pub st_atime_nsec: c_long,
107110
pub st_mtime: crate::time_t,
111+
#[cfg(gnu_time_bits64)]
112+
_mtime_pad: c_int,
108113
pub st_mtime_nsec: c_long,
109114
pub st_ctime: crate::time_t,
115+
#[cfg(gnu_time_bits64)]
116+
_ctime_pad: c_int,
110117
pub st_ctime_nsec: c_long,
118+
#[cfg(not(gnu_time_bits64))]
111119
__glibc_reserved4: c_ulong,
120+
#[cfg(not(gnu_time_bits64))]
112121
__glibc_reserved5: c_ulong,
113122
}
114123

‎src/unix/linux_like/linux/gnu/b32/x86/mod.rs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,23 +134,35 @@ s! {
134134

135135
pub struct stat64 {
136136
pub st_dev: crate::dev_t,
137+
#[cfg(not(gnu_time_bits64))]
137138
__pad1: c_uint,
139+
#[cfg(not(gnu_time_bits64))]
138140
__st_ino: c_ulong,
141+
#[cfg(gnu_time_bits64)]
142+
pub st_ino: crate::ino_t,
139143
pub st_mode: crate::mode_t,
140144
pub st_nlink: crate::nlink_t,
141145
pub st_uid: crate::uid_t,
142146
pub st_gid: crate::gid_t,
143147
pub st_rdev: crate::dev_t,
148+
#[cfg(not(gnu_time_bits64))]
144149
__pad2: c_uint,
145150
pub st_size: off64_t,
146151
pub st_blksize: crate::blksize_t,
147152
pub st_blocks: crate::blkcnt64_t,
148153
pub st_atime: crate::time_t,
149154
pub st_atime_nsec: c_long,
155+
#[cfg(gnu_time_bits64)]
156+
_atime_pad: c_int,
150157
pub st_mtime: crate::time_t,
151158
pub st_mtime_nsec: c_long,
159+
#[cfg(gnu_time_bits64)]
160+
_mtime_pad: c_int,
152161
pub st_ctime: crate::time_t,
153162
pub st_ctime_nsec: c_long,
163+
#[cfg(gnu_time_bits64)]
164+
_ctime_pad: c_int,
165+
#[cfg(not(gnu_time_bits64))]
154166
pub st_ino: crate::ino64_t,
155167
}
156168

0 commit comments

Comments
 (0)