From 9d84832741f9f2a136b95556df7e1b80b21ac3d0 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Sat, 25 Feb 2012 21:36:01 +0000
Subject: [PATCH] At least temporarily move operator new/delete from the abi
 back to here.  I'm having trouble reexporting it as a weak symbol.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@151459 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/libc++abi2.exp | 16 ++++++++--------
 src/new.cpp        |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/libc++abi2.exp b/lib/libc++abi2.exp
index d73fafc2..bdfe99c3 100644
--- a/lib/libc++abi2.exp
+++ b/lib/libc++abi2.exp
@@ -209,14 +209,14 @@ __ZNSt20bad_array_new_lengthC2Ev
 __ZNSt20bad_array_new_lengthD0Ev
 __ZNSt20bad_array_new_lengthD2Ev
 __ZSt10unexpectedv
-__ZdaPv
-__ZdlPv
-__ZdlPvRKSt9nothrow_t
-__Znam
-__ZdaPvRKSt9nothrow_t
-__Znwm
-__ZnwmRKSt9nothrow_t
-__ZnamRKSt9nothrow_t
+# __ZdaPv
+# __ZdlPv
+# __ZdlPvRKSt9nothrow_t
+# __Znam
+# __ZdaPvRKSt9nothrow_t
+# __Znwm
+# __ZnwmRKSt9nothrow_t
+# __ZnamRKSt9nothrow_t
 __ZTISt10bad_typeid
 __ZTISt8bad_cast
 ___cxa_bad_typeid
diff --git a/src/new.cpp b/src/new.cpp
index dfeb5a1a..11d7be62 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -24,7 +24,7 @@
     static std::new_handler __new_handler;
 #endif
 
-#ifndef _LIBCPPABI_VERSION
+//#ifndef _LIBCPPABI_VERSION
 
 // Implement all new and delete operators as weak definitions
 // in this shared library, so that they can be overriden by programs
@@ -134,7 +134,7 @@ operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
     ::operator delete[](ptr);
 }
 
-#endif
+//#endif  // _LIBCPPABI_VERSION
 
 namespace std
 {