diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-04-16 19:26:56 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-04-16 19:26:56 +0000 |
| commit | 3084db3bb1a0a7c0fe6dc400f8be9c2633be9063 (patch) | |
| tree | 91da39cba7ad6f0eb109cb7c379ab9954312df65 /libcxx/src/new.cpp | |
| parent | 5a30177906a6ec711ca1ff689ae2383e79e1119c (diff) | |
| download | bcm5719-llvm-3084db3bb1a0a7c0fe6dc400f8be9c2633be9063.tar.gz bcm5719-llvm-3084db3bb1a0a7c0fe6dc400f8be9c2633be9063.zip | |
[libc++] Remove old workaround for buildit
Summary:
I'm not sure what the problem was at the time, however I don't think
this is necessary since buildit doesn't exist anymore.
Instead of the workaround, the correct thing to do is to leave out
the get_new_handler/set_new_handler definitions from libc++ when
we're getting them from libc++abi.
Reviewers: EricWF
Subscribers: christof, jkorous, dexonsmith, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60717
llvm-svn: 358518
Diffstat (limited to 'libcxx/src/new.cpp')
| -rw-r--r-- | libcxx/src/new.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp index 95b797e7865..43b234ac488 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/src/new.cpp @@ -22,12 +22,8 @@ # include "support/runtime/new_handler_fallback.ipp" #elif defined(__GLIBCXX__) // nothing to do -#else -# if defined(__APPLE__) && !defined(_LIBCPP_BUILDING_HAS_NO_ABI_LIBRARY) -# include <cxxabi.h> // FIXME: remove this once buildit is gone. -# else -# include "support/runtime/new_handler_fallback.ipp" -# endif +#elif !defined(_LIBCPP_DISABLE_NEW_DELETE_DEFINITIONS) +# include "support/runtime/new_handler_fallback.ipp" #endif namespace std |
