From 0b861016eb678a246877f31b0af3d6d5c685c6e6 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 18 Dec 2020 20:39:11 +0100 Subject: [PATCH] Populate mcontext_t on aarch64-linux-musl It is used by wasmtime. --- src/unix/linux_like/linux/musl/b64/aarch64/align.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs index e114eaecd5473..81c55c64ad822 100644 --- a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs +++ b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs @@ -6,7 +6,7 @@ s_no_extra_traits! { } } -s!{ +s! { pub struct ucontext_t { pub uc_flags: ::c_ulong, pub uc_link: *mut ucontext_t, @@ -17,9 +17,11 @@ s!{ #[repr(align(16))] pub struct mcontext_t { - // What we want here is a single [u64; 36 + 512], but splitting things - // up allows Debug to be auto-derived. - __regs1: [[u64; 18]; 2], // 36 - __regs2: [[u64; 32]; 16], // 512 + pub fault_address: ::c_ulong, + pub regs: [::c_ulong; 31], + pub sp: ::c_ulong, + pub pc: ::c_ulong, + pub pstate: ::c_ulong, + __reserved: [[u64; 32]; 16], } }