Some libcxxrt-compatibility cleanups (avoid defining things twice).

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@151717 91177308-0d34-0410-b5e6-96231b3b80d8

src/new.cpp

@@ -24,7 +24,7 @@
     static std::new_handler __new_handler;
 #endif
 
-//#ifndef _LIBCPPABI_VERSION
+#if !defined (LIBCXXRT) // && !defined(_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  // _LIBCPPABI_VERSION
+#endif  // !_LIBCPPABI_VERSION && !LIBCXXRT
 
 namespace std
 {
@@ -155,6 +155,8 @@ get_new_handler() _NOEXCEPT
     return __sync_fetch_and_add(&__new_handler, (new_handler)0);
 }
 
+#ifndef LIBCXXRT
+
 bad_alloc::bad_alloc() _NOEXCEPT
 {
 }
@@ -184,6 +186,7 @@ bad_array_new_length::what() const _NOEXCEPT
 }
 
 #endif
+#endif //LIBCXXRT
 
 void
 __throw_bad_alloc()