Skip to content

Commit c236e79

Browse files
committed
musl: time64: adjust struct timespec definition
This is equivalent to upstream commit bminor/musl@9b2921b.
1 parent d51582b commit c236e79

File tree

3 files changed

+58
-0
lines changed

3 files changed

+58
-0
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:511:5:
2+
assertion `left == right` failed
3+
left: 0
4+
right: 1002111927320821928687967599834759150
5+
stack backtrace:
6+
0: 0x7f4357159785 - <unknown>
7+
1: 0x7f43571596d5 - std::backtrace::Backtrace::force_capture::hef0840345d34355a
8+
2: 0x7f435489b1ce - <unknown>
9+
3: 0x7f4357176833 - std::panicking::rust_panic_with_hook::h402df430f77b139b
10+
4: 0x7f435717650a - <unknown>
11+
5: 0x7f4357173a89 - std::sys::backtrace::__rust_end_short_backtrace::hd6ee186b09085420
12+
6: 0x7f43571761cf - rust_begin_unwind
13+
7: 0x7f435394e480 - core::panicking::panic_fmt::h250731373fbf7c0c
14+
8: 0x7f435394e8fa - core::panicking::assert_failed_inner::h0b63c78fb2eab9e0
15+
9: 0x7f4355988747 - core[1da3e9e537ec24d4]::panicking::assert_failed::<u128, u128>
16+
10: 0x7f435596522c - <rustc_middle[d6b0322ea3151aaa]::query::on_disk_cache::OnDiskCache>::new
17+
11: 0x7f43551dbd52 - rustc_incremental[539479ebccffad45]::persist::load::load_query_result_cache
18+
12: 0x7f43547c8a7b - <unknown>
19+
13: 0x7f435487f596 - <unknown>
20+
14: 0x7f4354815a97 - <unknown>
21+
15: 0x7f4354830651 - std[6956e2ccddace8c]::sys::backtrace::__rust_begin_short_backtrace::<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_with_globals<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_pool_with_globals<rustc_interface[8bbda2bbdfb85682]::interface::run_compiler<(), rustc_driver_impl[a38dd6409c8212bc]::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>
22+
16: 0x7f4354832693 - <unknown>
23+
17: 0x7f435718212b - <unknown>
24+
25+
26+
rustc version: 1.86.0-nightly (05f9846f8 2025-03-31) (gentoo)
27+
platform: x86_64-unknown-linux-musl
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
thread 'rustc' panicked at compiler/rustc_middle/src/query/on_disk_cache.rs:511:5:
2+
assertion `left == right` failed
3+
left: 0
4+
right: 1002111927320821928687967599834759150
5+
stack backtrace:
6+
0: 0x7fae09159785 - <unknown>
7+
1: 0x7fae091596d5 - std::backtrace::Backtrace::force_capture::hef0840345d34355a
8+
2: 0x7fae0689b1ce - <unknown>
9+
3: 0x7fae09176833 - std::panicking::rust_panic_with_hook::h402df430f77b139b
10+
4: 0x7fae0917650a - <unknown>
11+
5: 0x7fae09173a89 - std::sys::backtrace::__rust_end_short_backtrace::hd6ee186b09085420
12+
6: 0x7fae091761cf - rust_begin_unwind
13+
7: 0x7fae0594e480 - core::panicking::panic_fmt::h250731373fbf7c0c
14+
8: 0x7fae0594e8fa - core::panicking::assert_failed_inner::h0b63c78fb2eab9e0
15+
9: 0x7fae07988747 - core[1da3e9e537ec24d4]::panicking::assert_failed::<u128, u128>
16+
10: 0x7fae0796522c - <rustc_middle[d6b0322ea3151aaa]::query::on_disk_cache::OnDiskCache>::new
17+
11: 0x7fae071dbd52 - rustc_incremental[539479ebccffad45]::persist::load::load_query_result_cache
18+
12: 0x7fae067c8a7b - <unknown>
19+
13: 0x7fae0687f596 - <unknown>
20+
14: 0x7fae06815a97 - <unknown>
21+
15: 0x7fae06830651 - std[6956e2ccddace8c]::sys::backtrace::__rust_begin_short_backtrace::<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_with_globals<rustc_interface[8bbda2bbdfb85682]::util::run_in_thread_pool_with_globals<rustc_interface[8bbda2bbdfb85682]::interface::run_compiler<(), rustc_driver_impl[a38dd6409c8212bc]::run_compiler::{closure#0}>::{closure#1}, ()>::{closure#0}, ()>::{closure#0}::{closure#0}, ()>
22+
16: 0x7fae06832693 - <unknown>
23+
17: 0x7fae0918212b - <unknown>
24+
25+
26+
rustc version: 1.86.0-nightly (05f9846f8 2025-03-31) (gentoo)
27+
platform: x86_64-unknown-linux-musl

src/unix/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,14 @@ s! {
7171
#[cfg(not(target_env = "gnu"))]
7272
pub struct timespec {
7373
pub tv_sec: time_t,
74+
#[cfg(all(musl32_time64, target_endian = "big"))]
75+
__pad0: u32,
7476
#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))]
7577
pub tv_nsec: i64,
7678
#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
7779
pub tv_nsec: c_long,
80+
#[cfg(all(musl32_time64, target_endian = "little"))]
81+
__pad0: u32,
7882
}
7983

8084
pub struct rlimit {

0 commit comments

Comments
 (0)