[libcxxabi] r230837 - Unwind: make it build on Darwin again

Saleem Abdulrasool compnerd at compnerd.org
Fri Feb 27 18:23:54 PST 2015


Author: compnerd
Date: Fri Feb 27 20:23:54 2015
New Revision: 230837

URL: http://llvm.org/viewvc/llvm-project?rev=230837&view=rev
Log:
Unwind: make it build on Darwin again

The support for the LSB eh_frame_hdr extension was overzealous in trying to
include headers.  Be more careful to permit building on Darwin.

Modified:
    libcxxabi/trunk/src/Unwind/AddressSpace.hpp

Modified: libcxxabi/trunk/src/Unwind/AddressSpace.hpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/Unwind/AddressSpace.hpp?rev=230837&r1=230836&r2=230837&view=diff
==============================================================================
--- libcxxabi/trunk/src/Unwind/AddressSpace.hpp (original)
+++ libcxxabi/trunk/src/Unwind/AddressSpace.hpp Fri Feb 27 20:23:54 2015
@@ -55,11 +55,14 @@ struct EHTEntry {
 extern EHTEntry __exidx_start;
 extern EHTEntry __exidx_end;
 #endif // !defined(_LIBUNWIND_IS_BAREMETAL)
+#endif  // LIBCXXABI_ARM_EHABI
 
-#elif _LIBUNWIND_SUPPORT_DWARF_UNWIND
+#if defined(__linux__)
+#if _LIBUNWIND_SUPPORT_DWARF_UNWIND && _LIBUNWIND_SUPPORT_DWARF_INDEX
 #include <link.h>
 #include "EHHeaderParser.hpp"
-#endif  // LIBCXXABI_ARM_EHABI
+#endif
+#endif
 
 namespace libunwind {
 





More information about the cfe-commits mailing list