diff

diff

diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
index 73a259bd4..4bdfcb06e 100644
--- a/src/libunwind/libunwind.rs
+++ b/src/libunwind/libunwind.rs
@@ -44,10 +44,10 @@ pub const unwinder_private_data_size: usize = 5;
 #[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.contains("arm"), not(target_os = "ios")))]
 pub const unwinder_private_data_size: usize = 20;
 
-#[cfg(all(target_arch = "arm", target_os = "ios"))]
+#[cfg(all(target_arch.contains("arm"), target_os = "ios"))]
 pub const unwinder_private_data_size: usize = 5;
 
 #[cfg(target_arch = "aarch64")]
@@ -93,7 +93,7 @@ extern "C" {
 }
 
 cfg_if! {
-if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm"))))] {
+if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch.contains("arm")))))] {
     // Not ARM EHABI
     #[repr(C)]
     #[derive(Copy, Clone, PartialEq)]
@@ -217,7 +217,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
     }
 }
 
-if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] {
+if #[cfg(not(all(target_os = "ios", target_arch.contains("arm"))))] {
     // Not 32-bit iOS
     extern "C" {
         #[unwind(allowed)]