diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-23 14:05:04 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-23 14:05:04 +0000 |
| commit | d524fe5b3a0975a1c037669ade35c182681c14f9 (patch) | |
| tree | 607ca5d457c8ef1f41944acfb4f1c99f4797798c /libcxx/src | |
| parent | 6af366be8ad3199f715c54e84c779e02bb8c18b8 (diff) | |
| download | bcm5719-llvm-d524fe5b3a0975a1c037669ade35c182681c14f9.tar.gz bcm5719-llvm-d524fe5b3a0975a1c037669ade35c182681c14f9.zip | |
[libc++] Remove redundant conditionals for Apple platforms
Summary:
In a bunch of places, we used to check whether LIBCXX_BUILDING_LIBCXXABI
is defined OR we're building for an Apple platform. This used to
be necessary in a time when Apple's build script did NOT define
LIBCXX_BUILDING_LIBCXXABI. However this is not relevant anymore
since Apple's build does define LIBCXX_BUILDING_LIBCXXABI.
Reviewers: EricWF
Subscribers: christof, jkorous, dexonsmith, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60842
llvm-svn: 358988
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/exception.cpp | 3 | ||||
| -rw-r--r-- | libcxx/src/support/runtime/stdexcept_default.ipp | 3 | ||||
| -rw-r--r-- | libcxx/src/typeinfo.cpp | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index ee9f384b671..fce6db7c38b 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/exception.cpp @@ -10,8 +10,7 @@ #include "new" #include "typeinfo" -#if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) || \ - (defined(__APPLE__) && !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY)) +#if defined(LIBCXXRT) || defined(LIBCXX_BUILDING_LIBCXXABI) #include <cxxabi.h> using namespace __cxxabiv1; #define HAVE_DEPENDENT_EH_ABI 1 diff --git a/libcxx/src/support/runtime/stdexcept_default.ipp b/libcxx/src/support/runtime/stdexcept_default.ipp index 91dd54b28cf..c827ca4c513 100644 --- a/libcxx/src/support/runtime/stdexcept_default.ipp +++ b/libcxx/src/support/runtime/stdexcept_default.ipp @@ -10,8 +10,7 @@ /* For _LIBCPPABI_VERSION */ #if !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) && \ - (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(__APPLE__) || \ - defined(LIBCXXRT)) + (defined(LIBCXX_BUILDING_LIBCXXABI) || defined(LIBCXXRT)) #include <cxxabi.h> #endif diff --git a/libcxx/src/typeinfo.cpp b/libcxx/src/typeinfo.cpp index 5b893b1e68b..49a07ef7dab 100644 --- a/libcxx/src/typeinfo.cpp +++ b/libcxx/src/typeinfo.cpp @@ -45,11 +45,11 @@ size_t std::type_info::hash_code() const _NOEXCEPT { } #endif // _LIBCPP_ABI_MICROSOFT -// FIXME: Remove __APPLE__ default here once buildit is gone. // FIXME: Remove the _LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY configuration. -#if (!defined(LIBCXX_BUILDING_LIBCXXABI) && !defined(LIBCXXRT) && \ - !defined(__GLIBCXX__) && !defined(__APPLE__) && \ - !defined(_LIBCPP_ABI_VCRUNTIME)) || \ +#if (!defined(LIBCXX_BUILDING_LIBCXXABI) && \ + !defined(LIBCXXRT) && \ + !defined(__GLIBCXX__) && \ + !defined(_LIBCPP_ABI_VCRUNTIME)) || \ defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) std::type_info::~type_info() { |
