[cfe-commits] [libcxx] r151459 - in /libcxx/trunk: lib/libc++abi2.exp src/new.cpp

[Howard Hinnant]

Author: hhinnant
Date: Sat Feb 25 15:36:01 2012
New Revision: 151459

URL: http://llvm.org/viewvc/llvm-project?rev=151459&view=rev
Log:
At least temporarily move operator new/delete from the abi back to here.  I'm having trouble reexporting it as a weak symbol.

Modified:
    libcxx/trunk/lib/libc++abi2.exp
    libcxx/trunk/src/new.cpp

Modified: libcxx/trunk/lib/libc++abi2.exp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/libc%2B%2Babi2.exp?rev=151459&r1=151458&r2=151459&view=diff
==============================================================================
--- libcxx/trunk/lib/libc++abi2.exp (original)
+++ libcxx/trunk/lib/libc++abi2.exp Sat Feb 25 15:36:01 2012
@@ -209,14 +209,14 @@
 __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

Modified: libcxx/trunk/src/new.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/new.cpp?rev=151459&r1=151458&r2=151459&view=diff
==============================================================================
--- libcxx/trunk/src/new.cpp (original)
+++ libcxx/trunk/src/new.cpp Sat Feb 25 15:36:01 2012
@@ -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[](ptr);
 }
 
-#endif
+//#endif  // _LIBCPPABI_VERSION
 
 namespace std
 {