[libcxxabi] r228359 - Fix compilation of unwind on Darwin-x86_64
Saleem Abdulrasool
compnerd at compnerd.org
Thu Feb 5 15:27:41 PST 2015
Author: compnerd
Date: Thu Feb 5 17:27:41 2015
New Revision: 228359
URL: http://llvm.org/viewvc/llvm-project?rev=228359&view=rev
Log:
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.
Modified:
libcxxabi/trunk/src/Unwind/Unwind-EHABI.h
Modified: libcxxabi/trunk/src/Unwind/Unwind-EHABI.h
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/Unwind-EHABI.h?rev=228359&r1=228358&r2=228359&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/Unwind-EHABI.h (original)
+++ libcxxabi/trunk/src/Unwind/Unwind-EHABI.h Thu Feb 5 17:27:41 2015
@@ -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_unwin
} // extern "C"
#endif
+#endif
+
#endif // __UNWIND_EHABI_H__
More information about the cfe-commits
mailing list