diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-02 22:27:45 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-02 22:27:45 +0000 |
| commit | 221596df3336a45d635b63293867fb1166a863ca (patch) | |
| tree | 5f725f5d954bc5894d1bf5734518b0dc6e87d13d /libcxx/src | |
| parent | 9aca97d6f932fc33d5630060edd27c51450ae9b6 (diff) | |
| download | bcm5719-llvm-221596df3336a45d635b63293867fb1166a863ca.tar.gz bcm5719-llvm-221596df3336a45d635b63293867fb1166a863ca.zip | |
Revert r290839 - Fix configuring and building libc++ w/o an ABI library
llvm-svn: 290841
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/exception.cpp | 6 | ||||
| -rw-r--r-- | libcxx/src/new.cpp | 6 | ||||
| -rw-r--r-- | libcxx/src/stdexcept.cpp | 3 | ||||
| -rw-r--r-- | libcxx/src/typeinfo.cpp | 12 |
4 files changed, 8 insertions, 19 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index ec8969aaf4c..96bd7ee59a0 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/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 @@ bool uncaught_exception() _NOEXCEPT { return uncaught_exceptions() > 0; } 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(); diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index 734d93136b5..3d8b2a9d8a6 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/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 diff --git a/libcxx/src/stdexcept.cpp b/libcxx/src/stdexcept.cpp index 3f333309dd8..90d8a34b82d 100644 --- a/libcxx/src/stdexcept.cpp +++ b/libcxx/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 diff --git a/libcxx/src/typeinfo.cpp b/libcxx/src/typeinfo.cpp index d0a7dae3802..3033c9800f1 100644 --- a/libcxx/src/typeinfo.cpp +++ b/libcxx/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 @@ std::bad_typeid::what() const _NOEXCEPT 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() |
