Prepare for running on top of new libc++abi.
llvm-svn: 149634
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 2c9c6a579a8f3d4f7c65b8073ef8fc6a64a7fa76
diff --git a/src/new.cpp b/src/new.cpp
index f2987b1..dfeb5a1 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -13,14 +13,19 @@
#if __APPLE__
#include <cxxabi.h>
- // On Darwin, there are two STL shared libraries and a lower level ABI
- // shared libray. The global holding the current new handler is
- // in the ABI library and named __cxa_new_handler.
- #define __new_handler __cxxabiapple::__cxa_new_handler
+
+ #ifndef _LIBCPPABI_VERSION
+ // On Darwin, there are two STL shared libraries and a lower level ABI
+ // shared libray. The global holding the current new handler is
+ // in the ABI library and named __cxa_new_handler.
+ #define __new_handler __cxxabiapple::__cxa_new_handler
+ #endif
#else // __APPLE__
static std::new_handler __new_handler;
#endif
+#ifndef _LIBCPPABI_VERSION
+
// Implement all new and delete operators as weak definitions
// in this shared library, so that they can be overriden by programs
// that define non-weak copies of the functions.
@@ -129,11 +134,15 @@
::operator delete[](ptr);
}
+#endif
+
namespace std
{
const nothrow_t nothrow = {};
+#ifndef _LIBCPPABI_VERSION
+
new_handler
set_new_handler(new_handler handler) _NOEXCEPT
{
@@ -174,6 +183,8 @@
return "bad_array_new_length";
}
+#endif
+
void
__throw_bad_alloc()
{