X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=library%2Funwind%2Fsrc%2Flibunwind.rs;h=a5b6193b086fbf44aef522205179d07a7abefdcc;hb=9e197b75f0e5ad17dc1bb1431853bd4df7cff408;hp=7b78bda424bb02a14fa019d47ae115cf768a9fae;hpb=1ab98933fa75d72e882b86feac1a0be3a5b02cb0;p=rust.git diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index 7b78bda424b..a5b6193b086 100644 --- a/library/unwind/src/libunwind.rs +++ b/library/unwind/src/libunwind.rs @@ -30,10 +30,10 @@ pub enum _Unwind_Reason_Code { #[cfg(target_arch = "x86_64")] pub const unwinder_private_data_size: usize = 6; -#[cfg(all(target_arch = "arm", not(target_os = "ios")))] +#[cfg(all(target_arch = "arm", not(any(target_os = "ios", target_os = "watchos"))))] pub const unwinder_private_data_size: usize = 20; -#[cfg(all(target_arch = "arm", target_os = "ios"))] +#[cfg(all(target_arch = "arm", any(target_os = "ios", target_os = "watchos")))] pub const unwinder_private_data_size: usize = 5; #[cfg(all(target_arch = "aarch64", target_pointer_width = "64"))] @@ -105,7 +105,7 @@ pub enum _Unwind_Context {} } cfg_if::cfg_if! { -if #[cfg(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm")))] { +if #[cfg(any(target_os = "ios", target_os = "watchos", target_os = "netbsd", not(target_arch = "arm")))] { // Not ARM EHABI #[repr(C)] #[derive(Copy, Clone, PartialEq)]