From 01059b9454db83c12d0215b8bf0721d6fd69ff93 Mon Sep 17 00:00:00 2001
From: Fenrir <fenrirwolf@gmail.com>
Date: Fri, 19 Jan 2018 01:20:34 -0700
Subject: [PATCH] Match libunwind's EABI selection with libpanic_unwind

---
 src/libunwind/libunwind.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
index e22f6702672..e6fff7963f7 100644
--- a/src/libunwind/libunwind.rs
+++ b/src/libunwind/libunwind.rs
@@ -93,8 +93,7 @@ pub enum _Unwind_Context {}
 }
 
 cfg_if! {
-if #[cfg(not(any(all(target_os = "android", target_arch = "arm"),
-                 all(target_os = "linux", target_arch = "arm"))))] {
+if #[cfg(all(any(target_os = "ios", not(target_arch = "arm"))))] {
     // Not ARM EHABI
     #[repr(C)]
     #[derive(Copy, Clone, PartialEq)]