diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-02-10 03:47:31 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-02-10 03:47:31 +0000 |
| commit | 5e87af449956046675b63abfc05d1e5f783daa07 (patch) | |
| tree | 12ce412628c9242686b3984a854c12df62423e9e /libcxxabi | |
| parent | b2e7b69b1003da0a087bd243e974f6a6868b1ab6 (diff) | |
| download | llvm-5e87af449956046675b63abfc05d1e5f783daa07.zip llvm-5e87af449956046675b63abfc05d1e5f783daa07.tar.gz llvm-5e87af449956046675b63abfc05d1e5f783daa07.tar.bz2 | |
Merging r228359:
------------------------------------------------------------------------
r228359 | compnerd | 2015-02-05 15:27:41 -0800 (Thu, 05 Feb 2015) | 5 lines
Fix compilation of unwind on Darwin-x86_64
EHABI related typedef sugar is gated via LIBCXXABI_ARM_EHABI which did not
protect the EHABI header. This would cause declarations to be emitted on
non-EHABI targets, resulting in errors. This permits compilation on Darwin.
------------------------------------------------------------------------
llvm-svn: 228666
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/src/Unwind/Unwind-EHABI.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxxabi/src/Unwind/Unwind-EHABI.h b/libcxxabi/src/Unwind/Unwind-EHABI.h index fdc0d27..5a58e42 100644 --- a/libcxxabi/src/Unwind/Unwind-EHABI.h +++ b/libcxxabi/src/Unwind/Unwind-EHABI.h @@ -14,6 +14,8 @@ #include <stdint.h> #include <unwind.h> +#if LIBCXXABI_ARM_EHABI + // Unable to unwind in the ARM index table (section 5 EHABI). #define UNW_EXIDX_CANTUNWIND 0x1 @@ -42,4 +44,6 @@ extern _Unwind_Reason_Code __aeabi_unwind_cpp_pr2( } // extern "C" #endif +#endif + #endif // __UNWIND_EHABI_H__ |