Undo some overzealous #ifdefs for LIBCXXRT.
llvm-svn: 152718
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 1e02029f37edc72770ee62a71755affbc40350af
diff --git a/src/new.cpp b/src/new.cpp
index 1c171a8..1fb4b2d 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -24,8 +24,6 @@
static std::new_handler __new_handler;
#endif
-#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
// that define non-weak copies of the functions.
@@ -134,8 +132,6 @@
::operator delete[](ptr);
}
-#endif // !_LIBCPPABI_VERSION && !LIBCXXRT
-
namespace std
{
@@ -171,6 +167,8 @@
return "std::bad_alloc";
}
+#endif //LIBCXXRT
+
bad_array_new_length::bad_array_new_length() _NOEXCEPT
{
}
@@ -186,7 +184,6 @@
}
#endif
-#endif //LIBCXXRT
void
__throw_bad_alloc()