diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-02-25 21:36:01 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-02-25 21:36:01 +0000 |
| commit | 908d2bebaf8a9a3c52082e81a8d65ab82ee933c2 (patch) | |
| tree | 208af742614ce1e328a6b7ebf9f2cbc024c49ce4 /libcxx | |
| parent | d89c218a2b5ec8a2966760e28975a37d502ea362 (diff) | |
| download | bcm5719-llvm-908d2bebaf8a9a3c52082e81a8d65ab82ee933c2.tar.gz bcm5719-llvm-908d2bebaf8a9a3c52082e81a8d65ab82ee933c2.zip | |
At least temporarily move operator new/delete from the abi back to here. I'm having trouble reexporting it as a weak symbol.
llvm-svn: 151459
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/lib/libc++abi2.exp | 16 | ||||
| -rw-r--r-- | libcxx/src/new.cpp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libcxx/lib/libc++abi2.exp b/libcxx/lib/libc++abi2.exp index d73fafc2d9a..bdfe99c3456 100644 --- a/libcxx/lib/libc++abi2.exp +++ b/libcxx/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/libcxx/src/new.cpp b/libcxx/src/new.cpp index dfeb5a1ac5f..11d7be62aff 100644 --- a/libcxx/src/new.cpp +++ b/libcxx/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 { |
