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/typeinfo.cpp | |
| 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/typeinfo.cpp')
| -rw-r--r-- | libcxx/src/typeinfo.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
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() |
