summaryrefslogtreecommitdiffstats
path: root/libcxx/src/exception.cpp
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2019-04-23 14:05:04 +0000
committerLouis Dionne <ldionne@apple.com>2019-04-23 14:05:04 +0000
commitd524fe5b3a0975a1c037669ade35c182681c14f9 (patch)
tree607ca5d457c8ef1f41944acfb4f1c99f4797798c /libcxx/src/exception.cpp
parent6af366be8ad3199f715c54e84c779e02bb8c18b8 (diff)
downloadbcm5719-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/exception.cpp')
-rw-r--r--libcxx/src/exception.cpp3
1 files changed, 1 insertions, 2 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
OpenPOWER on IntegriCloud