[libcxxabi] r199859 - Fix unwinder to build for iOS

[Nick Kledzik]

Author: kledzik
Date: Wed Jan 22 20:06:19 2014
New Revision: 199859

URL: http://llvm.org/viewvc/llvm-project?rev=199859&view=rev
Log:
Fix unwinder to build for iOS

Modified:
    libcxxabi/trunk/src/Unwind/AddressSpace.hpp
    libcxxabi/trunk/src/Unwind/assembly.h

Modified: libcxxabi/trunk/src/Unwind/AddressSpace.hpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/AddressSpace.hpp?rev=199859&r1=199858&r2=199859&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/AddressSpace.hpp (original)
+++ libcxxabi/trunk/src/Unwind/AddressSpace.hpp Wed Jan 22 20:06:19 2014
@@ -230,8 +230,9 @@ inline LocalAddressSpace::pint_t LocalAd
     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

Modified: libcxxabi/trunk/src/Unwind/assembly.h
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/assembly.h?rev=199859&r1=199858&r2=199859&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/assembly.h (original)
+++ libcxxabi/trunk/src/Unwind/assembly.h Wed Jan 22 20:06:19 2014
@@ -18,6 +18,8 @@
 
 #if defined(__POWERPC__) || defined(__powerpc__) || defined(__ppc__)
 #define SEPARATOR @
+#elif defined(__arm64__)
+#define SEPARATOR %%
 #else
 #define SEPARATOR ;
 #endif