diff --git a/src/unix/linux_like/android/b32/arm.rs b/src/unix/linux_like/android/b32/arm.rs index 66375876e776..fb88cd10af1b 100644 --- a/src/unix/linux_like/android/b32/arm.rs +++ b/src/unix/linux_like/android/b32/arm.rs @@ -31,7 +31,7 @@ s! { pub struct __c_anonymous_uc_sigmask_with_padding { pub uc_sigmask: crate::sigset_t, - /* Android has a wrong (smaller) sigset_t on x86. */ + /* Android has a wrong (smaller) sigset_t on ARM. */ __padding_rt_sigset: Padding, } diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs index c8c48e5d9089..b33d2ef36fc7 100644 --- a/src/unix/linux_like/android/b64/aarch64/mod.rs +++ b/src/unix/linux_like/android/b64/aarch64/mod.rs @@ -62,6 +62,9 @@ s! { pub uc_link: *mut ucontext_t, pub uc_stack: crate::stack_t, pub uc_sigmask: crate::sigset_t, + /* The kernel adds extra padding after uc_sigmask to match + * glibc sigset_t on ARM64. */ + __padding: Padding<[c_char; 128 - size_of::()]>, pub uc_mcontext: mcontext_t, }