commit 65b726605835d1b3947d648497729a4be05dedde
author Nick Kledzik <kledzik@apple.com> Thu Jan 23 02:06:19 2014 +0000
committer Nick Kledzik <kledzik@apple.com> Thu Jan 23 02:06:19 2014 +0000
tree ba5c2a1d9c537782cc714fa50b1a0c131eee8eb6
parent f29757a358ae9c07d3a768a5b40543fae9d768dd

Fix unwinder to build for iOS

git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@199859 91177308-0d34-0410-b5e6-96231b3b80d8

src/Unwind/AddressSpace.hpp

diff --git a/src/Unwind/AddressSpace.hpp b/src/Unwind/AddressSpace.hpp
index 67b0973..fafee04 100644
--- a/src/Unwind/AddressSpace.hpp
+++ b/src/Unwind/AddressSpace.hpp
@@ -230,8 +230,9 @@
     const void*                 compact_unwind_section;
     uintptr_t                   compact_unwind_section_length;
   };
-  #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) \
-                                  && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+  #if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) \
+                                 && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)) \
+      || defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
     // In 10.7.0 or later, libSystem.dylib implements this function.
     extern "C" bool _dyld_find_unwind_sections(void *, dyld_unwind_sections *);
   #else

src/Unwind/assembly.h

diff --git a/src/Unwind/assembly.h b/src/Unwind/assembly.h
index d282de8..210d350 100644
--- a/src/Unwind/assembly.h
+++ b/src/Unwind/assembly.h
@@ -18,6 +18,8 @@
 
 #if defined(__POWERPC__) || defined(__powerpc__) || defined(__ppc__)
 #define SEPARATOR @
+#elif defined(__arm64__)
+#define SEPARATOR %%
 #else
 #define SEPARATOR ;
 #endif