Commit 5e87af44 authored Feb 10, 2015 by Hans Wennborg

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

parent b2e7b69b

libcxxabi/src/Unwind/Unwind-EHABI.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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__