[libcxxabi] r228666 - Merging r228359:

[Hans Wennborg]

Author: hans
Date: Mon Feb  9 21:47:31 2015
New Revision: 228666

URL: http://llvm.org/viewvc/llvm-project?rev=228666&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    libcxxabi/branches/release_36/   (props changed)
    libcxxabi/branches/release_36/src/Unwind/Unwind-EHABI.h

Propchange: libcxxabi/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  9 21:47:31 2015
@@ -1 +1 @@
-/libcxxabi/trunk:226818-226820,226822-226824
+/libcxxabi/trunk:226818-226820,226822-226824,228359

Modified: libcxxabi/branches/release_36/src/Unwind/Unwind-EHABI.h
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_36/src/Unwind/Unwind-EHABI.h?rev=228666&r1=228665&r2=228666&view=diff
==============================================================================
--- libcxxabi/branches/release_36/src/Unwind/Unwind-EHABI.h (original)
+++ libcxxabi/branches/release_36/src/Unwind/Unwind-EHABI.h Mon Feb  9 21:47:31 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__