Skip to content

Commit 16266a4

Browse files
CUB3Dtgross35
authored andcommitted
Fix alignment of uc_ucontext fields on arm64 android (rust-lang#3894)
[ change `core` to `::core` and move ucontext_t to s_no_extra_traits for backport - Trevor ] (backport <rust-lang#3894>) (cherry picked from commit 707d32c)
1 parent b01982b commit 16266a4

File tree

1 file changed

+4
-2
lines changed
  • src/unix/linux_like/android/b64/aarch64

1 file changed

+4
-2
lines changed

src/unix/linux_like/android/b64/aarch64/align.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ s_no_extra_traits! {
44
pub struct max_align_t {
55
priv_: [f32; 8]
66
}
7-
}
87

9-
s! {
8+
#[allow(missing_debug_implementations)]
109
pub struct ucontext_t {
1110
pub uc_flags: ::c_ulong,
1211
pub uc_link: *mut ucontext_t,
1312
pub uc_stack: ::stack_t,
1413
pub uc_sigmask: ::sigset_t,
14+
pub __pad: [u8; 1024 / 8 - ::core::mem::size_of::<::sigset_t>()],
1515
pub uc_mcontext: mcontext_t,
1616
}
17+
}
1718

19+
s! {
1820
#[repr(align(16))]
1921
pub struct mcontext_t {
2022
pub fault_address: ::c_ulonglong,

0 commit comments

Comments
 (0)