Skip to content

[0.2] Revert "musl: convert inline timespecs to timespec" #4958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tgross35 merged 1 commit into from
Feb 9, 2026
Merged

[0.2] Revert "musl: convert inline timespecs to timespec" #4958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4105,9 +4105,9 @@ fn test_linux(target: &str) {
cfg.rename_struct_field(move |struct_, field| {
match (struct_.ident(), field.ident()) {
// Our stat *_nsec fields normally don't actually exist but are part
// of a timeval struct - this is fixed in musl_v1_2_3
// of a timeval struct
("stat" | "statfs" | "statvfs" | "stat64" | "statfs64" | "statvfs64", f)
if !musl_v1_2_3 && f.ends_with("_nsec") =>
if f.ends_with("_nsec") =>
{
Some(f.replace("e_nsec", ".tv_nsec"))
}
Expand Down
29 changes: 16 additions & 13 deletions src/unix/linux_like/linux/musl/b32/arm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,30 @@ s! {
#[cfg(musl32_time64)]
__st_ctim32: Padding<__c_anonymous_timespec32>,

#[cfg(not(musl_v1_2_3))]
#[cfg(musl_v1_2_3)]
pub st_ino: crate::ino_t,

pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad0: Padding<u32>,
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad0: Padding<u32>,
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad1: Padding<u32>,
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad1: Padding<u32>,
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad2: Padding<u32>,
pub st_ctime_nsec: c_long,
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad2: Padding<u32>,

#[cfg(not(musl_v1_2_3))]
pub st_ino: crate::ino_t,

#[cfg(musl32_time64)]
pub st_atim: crate::timespec,
#[cfg(musl32_time64)]
pub st_mtim: crate::timespec,
#[cfg(musl32_time64)]
pub st_ctim: crate::timespec,
}

struct __c_anonymous_timespec32 {
Expand Down
25 changes: 12 additions & 13 deletions src/unix/linux_like/linux/musl/b32/hexagon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,24 @@ s! {
__st_blksize_padding: Padding<c_int>,
pub st_blocks: crate::blkcnt_t,

#[cfg(not(musl_v1_2_3))]
pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad0: Padding<u32>,
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad0: Padding<u32>,
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad1: Padding<u32>,
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad1: Padding<u32>,
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad2: Padding<u32>,
pub st_ctime_nsec: c_long,

#[cfg(musl_v1_2_3)]
pub st_atim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_mtim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_ctim: crate::timespec,
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad2: Padding<u32>,

__unused: Padding<[c_int; 2]>,
}
Expand Down
41 changes: 25 additions & 16 deletions src/unix/linux_like/linux/musl/b32/mips/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,42 @@ s! {
#[cfg(musl32_time64)]
__st_ctim32: Padding<__c_anonymous_timespec32>,

#[cfg(not(musl_v1_2_3))]
#[cfg(musl_v1_2_3)]
pub st_blksize: crate::blksize_t,
#[cfg(musl_v1_2_3)]
__st_padding3: Padding<c_long>,
#[cfg(musl_v1_2_3)]
pub st_blocks: crate::blkcnt_t,

pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad0: Padding<u32>,
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad0: Padding<u32>,
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad1: Padding<u32>,
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad1: Padding<u32>,
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad2: Padding<u32>,
pub st_ctime_nsec: c_long,
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad2: Padding<u32>,

#[cfg(not(musl_v1_2_3))]
pub st_blksize: crate::blksize_t,
#[cfg(not(musl_v1_2_3))]
__st_padding3: Padding<c_long>,
#[cfg(not(musl_v1_2_3))]
pub st_blocks: crate::blkcnt_t,
#[cfg(not(musl32_time64))]
__st_padding4: Padding<[c_long; 14]>,

#[cfg(musl32_time64)]
pub st_atim: crate::timespec,
#[cfg(musl32_time64)]
pub st_mtim: crate::timespec,
#[cfg(musl32_time64)]
pub st_ctim: crate::timespec,

#[cfg(musl32_time64)]
#[cfg(not(musl_v1_2_3))]
__st_padding4: Padding<[c_long; 14]>,
#[cfg(musl_v1_2_3)]
__st_padding4: Padding<[c_long; 2]>,
}

Expand Down
29 changes: 16 additions & 13 deletions src/unix/linux_like/linux/musl/b32/powerpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,30 @@ s! {
#[cfg(musl32_time64)]
__st_ctim32: Padding<__c_anonymous_timespec32>,

#[cfg(not(musl_v1_2_3))]
#[cfg(musl_v1_2_3)]
__unused: Padding<[c_long; 2]>,

pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad0: Padding<u32>,
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad0: Padding<u32>,
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad1: Padding<u32>,
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad1: Padding<u32>,
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad2: Padding<u32>,
pub st_ctime_nsec: c_long,
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad2: Padding<u32>,

#[cfg(not(musl_v1_2_3))]
__unused: Padding<[c_long; 2]>,

#[cfg(musl32_time64)]
pub st_atim: crate::timespec,
#[cfg(musl32_time64)]
pub st_mtim: crate::timespec,
#[cfg(musl32_time64)]
pub st_ctim: crate::timespec,
}

struct __c_anonymous_timespec32 {
Expand Down
27 changes: 12 additions & 15 deletions src/unix/linux_like/linux/musl/b32/riscv32/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,24 @@ s! {
pub st_blksize: crate::blksize_t,
pub __pad2: c_int,
pub st_blocks: crate::blkcnt_t,

#[cfg(not(musl_v1_2_3))]
pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad0: Padding<u32>,
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad0: Padding<u32>,
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad1: Padding<u32>,
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "little"))]
__pad1: Padding<u32>,
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
#[cfg(all(musl32_time64, target_endian = "big"))]
__pad2: Padding<u32>,
pub st_ctime_nsec: c_long,

#[cfg(musl_v1_2_3)]
pub st_atim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_mtim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_ctim: crate::timespec,

#[cfg(all(musl32_time64, target_endian = "little"))]
__pad2: Padding<u32>,
__unused: Padding<[c_int; 2usize]>,
}

Expand Down
23 changes: 10 additions & 13 deletions src/unix/linux_like/linux/musl/b32/x86/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,24 @@ s! {
#[cfg(musl32_time64)]
__st_ctim32: Padding<__c_anonymous_timespec32>,

#[cfg(not(musl_v1_2_3))]
#[cfg(musl_v1_2_3)]
pub st_ino: crate::ino_t,

pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(musl32_time64)]
__pad0: Padding<u32>,
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
#[cfg(musl32_time64)]
__pad1: Padding<u32>,
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_ctime_nsec: c_long,
#[cfg(musl32_time64)]
__pad2: Padding<u32>,

#[cfg(not(musl_v1_2_3))]
pub st_ino: crate::ino_t,

#[cfg(musl32_time64)]
pub st_atim: crate::timespec,
#[cfg(musl32_time64)]
pub st_mtim: crate::timespec,
#[cfg(musl32_time64)]
pub st_ctim: crate::timespec,
}

struct __c_anonymous_timespec32 {
Expand Down
15 changes: 0 additions & 15 deletions src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,12 @@ s! {
pub st_blksize: crate::blksize_t,
__pad1: Padding<c_int>,
pub st_blocks: crate::blkcnt_t,

#[cfg(not(musl_v1_2_3))]
pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_ctime_nsec: c_long,

#[cfg(musl_v1_2_3)]
pub st_atim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_mtim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_ctim: crate::timespec,

__unused: Padding<[c_uint; 2]>,
}

Expand Down
15 changes: 0 additions & 15 deletions src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,12 @@ s! {
pub st_blksize: crate::blksize_t,
__pad2: Padding<c_int>,
pub st_blocks: crate::blkcnt_t,

#[cfg(not(musl_v1_2_3))]
pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_ctime_nsec: c_long,

#[cfg(musl_v1_2_3)]
pub st_atim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_mtim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_ctim: crate::timespec,

__unused: Padding<[c_int; 2usize]>,
}

Expand Down
15 changes: 0 additions & 15 deletions src/unix/linux_like/linux/musl/b64/mips64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,12 @@ s! {
__pad2: Padding<[c_uint; 2]>,
pub st_size: off_t,
__pad3: Padding<c_int>,

#[cfg(not(musl_v1_2_3))]
pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_ctime_nsec: c_long,

#[cfg(musl_v1_2_3)]
pub st_atim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_mtim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_ctim: crate::timespec,

pub st_blksize: crate::blksize_t,
__pad4: Padding<c_uint>,
pub st_blocks: crate::blkcnt_t,
Expand Down
15 changes: 0 additions & 15 deletions src/unix/linux_like/linux/musl/b64/powerpc64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,12 @@ s! {
pub st_size: off_t,
pub st_blksize: crate::blksize_t,
pub st_blocks: crate::blkcnt_t,

#[cfg(not(musl_v1_2_3))]
pub st_atime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_atime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_mtime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_mtime_nsec: c_long,
#[cfg(not(musl_v1_2_3))]
pub st_ctime: crate::time_t,
#[cfg(not(musl_v1_2_3))]
pub st_ctime_nsec: c_long,

#[cfg(musl_v1_2_3)]
pub st_atim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_mtim: crate::timespec,
#[cfg(musl_v1_2_3)]
pub st_ctim: crate::timespec,

__unused: Padding<[c_long; 3]>,
}

Expand Down
Loading