diff options
| author | Nick Kledzik <kledzik@apple.com> | 2014-01-23 02:06:19 +0000 |
|---|---|---|
| committer | Nick Kledzik <kledzik@apple.com> | 2014-01-23 02:06:19 +0000 |
| commit | fd0a6cf17aea680e593e20d600fa0e560ae36c4d (patch) | |
| tree | 48c85f5b6032d044e4f8a73fdae1b5f0fc02c640 /libcxxabi/src | |
| parent | 50944eb6384581bb299647ef49d8f06a714d0db5 (diff) | |
| download | bcm5719-llvm-fd0a6cf17aea680e593e20d600fa0e560ae36c4d.tar.gz bcm5719-llvm-fd0a6cf17aea680e593e20d600fa0e560ae36c4d.zip | |
Fix unwinder to build for iOS
llvm-svn: 199859
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/Unwind/AddressSpace.hpp | 5 | ||||
| -rw-r--r-- | libcxxabi/src/Unwind/assembly.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libcxxabi/src/Unwind/AddressSpace.hpp b/libcxxabi/src/Unwind/AddressSpace.hpp index 67b0973de2f..fafee04cf9a 100644 --- a/libcxxabi/src/Unwind/AddressSpace.hpp +++ b/libcxxabi/src/Unwind/AddressSpace.hpp @@ -230,8 +230,9 @@ inline LocalAddressSpace::pint_t LocalAddressSpace::getEncodedP(pint_t &addr, 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 diff --git a/libcxxabi/src/Unwind/assembly.h b/libcxxabi/src/Unwind/assembly.h index d282de8c06a..210d3503bc8 100644 --- a/libcxxabi/src/Unwind/assembly.h +++ b/libcxxabi/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 |
