Index: libc++-3.5/libcxxabi/include/libunwind.h
===================================================================
--- libc++-3.5.orig/libcxxabi/include/libunwind.h
+++ libc++-3.5/libcxxabi/include/libunwind.h
@@ -20,7 +20,7 @@
 // FIXME: This is also in unwind.h and cxxabi.h, can we consolidate?
 #if !defined(__USING_SJLJ_EXCEPTIONS__) && defined(__arm__) && \
     !defined(__ARM_DWARF_EH__) && !defined(__APPLE__)
-#define LIBCXXABI_ARM_EHABI 1
+#define LIBCXXABI_ARM_EHABI 0
 #else
 #define LIBCXXABI_ARM_EHABI 0
 #endif
Index: libc++-3.5/libcxxabi/include/cxxabi.h
===================================================================
--- libc++-3.5.orig/libcxxabi/include/cxxabi.h
+++ libc++-3.5/libcxxabi/include/cxxabi.h
@@ -24,7 +24,7 @@
 // FIXME: This is also in unwind.h and libunwind.h, can we consolidate?
 #if !defined(__USING_SJLJ_EXCEPTIONS__) && defined(__arm__) && \
     !defined(__ARM_DWARF_EH__) && !defined(__APPLE__)
-#define LIBCXXABI_ARM_EHABI 1
+#define LIBCXXABI_ARM_EHABI 0
 #else
 #define LIBCXXABI_ARM_EHABI 0
 #endif