Skip to content

Commit 7bc84da

Browse files
committed
Auto merge of #2000 - lu-zero:aarch64-musl-mcontext_t, r=JohnTitor
Populate mcontext_t on aarch64-linux-musl It is used by wasmtime. Should address bytecodealliance/wasmtime#2133
2 parents f26757a + 0b86101 commit 7bc84da

File tree

1 file changed

+7
-5
lines changed
  • src/unix/linux_like/linux/musl/b64/aarch64

1 file changed

+7
-5
lines changed

src/unix/linux_like/linux/musl/b64/aarch64/align.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ s_no_extra_traits! {
66
}
77
}
88

9-
s!{
9+
s! {
1010
pub struct ucontext_t {
1111
pub uc_flags: ::c_ulong,
1212
pub uc_link: *mut ucontext_t,
@@ -17,9 +17,11 @@ s!{
1717

1818
#[repr(align(16))]
1919
pub struct mcontext_t {
20-
// What we want here is a single [u64; 36 + 512], but splitting things
21-
// up allows Debug to be auto-derived.
22-
__regs1: [[u64; 18]; 2], // 36
23-
__regs2: [[u64; 32]; 16], // 512
20+
pub fault_address: ::c_ulong,
21+
pub regs: [::c_ulong; 31],
22+
pub sp: ::c_ulong,
23+
pub pc: ::c_ulong,
24+
pub pstate: ::c_ulong,
25+
__reserved: [[u64; 32]; 16],
2426
}
2527
}

0 commit comments

Comments
 (0)