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/exception.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/exception.cpp')
| -rw-r--r-- | libcxx/src/exception.cpp | 6 |
1 files changed, 2 insertions, 4 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(); |
