commit 224f96067eff10cb2f94faa6030a01bd64ee0f95
author Eric Fiselier <eric@efcs.ca> Mon Jan 02 22:27:45 2017 +0000
committer Eric Fiselier <eric@efcs.ca> Mon Jan 02 22:27:45 2017 +0000
tree 4f4f5e862a1f6fbf7c8b7c4ef8782e08487d8ab4
parent fd0ef994ee9c26a718abc668a9e031a63ed9560d

Revert r290839 - Fix configuring and building libc++ w/o an ABI library

llvm-svn: 290841
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 221596df3336a45d635b63293867fb1166a863ca

src/exception.cpp

diff --git a/src/exception.cpp b/src/exception.cpp
index ec8969a..96bd7ee 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -12,8 +12,7 @@
 #include "exception"
 #include "new"
 
-#if defined(__APPLE__) && !defined(LIBCXXRT) && \
-    !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
+#if defined(__APPLE__) && !defined(LIBCXXRT)
   #include <cxxabi.h>
 
   using namespace __cxxabiv1;
@@ -107,8 +106,7 @@
 
 int uncaught_exceptions() _NOEXCEPT
 {
-#if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \
-    (defined(__APPLE__) || defined(_LIBCPPABI_VERSION))
+#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)
    // on Darwin, there is a helper function so __cxa_get_globals is private
 # if _LIBCPPABI_VERSION > 1101
     return __cxa_uncaught_exceptions();

src/new.cpp

diff --git a/src/new.cpp b/src/new.cpp
index 734d931..3d8b2a9 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -13,8 +13,7 @@
 
 #include "new"
 
-#if defined(__APPLE__) && !defined(LIBCXXRT) && \
-    !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
+#if defined(__APPLE__) && !defined(LIBCXXRT)
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION
@@ -27,8 +26,7 @@
     #if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI)
         #include <cxxabi.h>
     #endif  // defined(LIBCXX_BUILDING_LIBCXXABI)
-    #if defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) || \
-        (!defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__))
+    #if !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__)
         static std::new_handler __new_handler;
     #endif  // _LIBCPPABI_VERSION
 #endif

src/stdexcept.cpp

diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp
index 3f33330..90d8a34 100644
--- a/src/stdexcept.cpp
+++ b/src/stdexcept.cpp
@@ -14,8 +14,7 @@
 #include "__refstring"
 
 /* For _LIBCPPABI_VERSION */
-#if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \
-    (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(__APPLE__) || defined(LIBCXXRT))
+#if defined(LIBCXX_BUILDING_LIBCXXABI) || defined(__APPLE__) || defined(LIBCXXRT)
 #include <cxxabi.h>
 #endif
 

src/typeinfo.cpp

diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp
index d0a7dae..3033c98 100644
--- a/src/typeinfo.cpp
+++ b/src/typeinfo.cpp
@@ -8,19 +8,13 @@
 //===----------------------------------------------------------------------===//
 #include <stdlib.h>
 
-#if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \
-    (defined(__APPLE__) || defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI))
+#if defined(__APPLE__) || defined(LIBCXXRT) ||                                 \
+    defined(LIBCXX_BUILDING_LIBCXXABI)
 #include <cxxabi.h>
 #endif
 
 #include "typeinfo"
 
-#if defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
-std::type_info::~type_info()
-{
-}
-#endif
-
 #if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION)
 
 std::bad_cast::bad_cast() _NOEXCEPT
@@ -53,7 +47,7 @@
   return "std::bad_typeid";
 }
 
-#if defined(__APPLE__) && !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)
+#ifdef __APPLE__
   // On Darwin, the cxa_bad_* functions cannot be in the lower level library
   // because bad_cast and bad_typeid are defined in his higher level library
   void __cxxabiv1::__cxa_bad_typeid()