1 files changed, 9 insertions, 5 deletions

diff --git a/contrib/libc++/src/exception.cpp b/contrib/libc++/src/exception.cpp
index 6b5e6984a606..6a5803d37745 100644
--- a/contrib/libc++/src/exception.cpp
+++ b/contrib/libc++/src/exception.cpp
@@ -114,13 +114,17 @@ exception::~exception() _NOEXCEPT
 {
 }
 
-bad_exception::~bad_exception() _NOEXCEPT
+const char* exception::what() const _NOEXCEPT
 {
+  return "std::exception";
 }
 
-const char* exception::what() const _NOEXCEPT
+#endif  // _LIBCPPABI_VERSION
+#endif //LIBCXXRT
+#ifndef _LIBCPPABI_VERSION
+
+bad_exception::~bad_exception() _NOEXCEPT
 {
-  return "std::exception";
 }
 
 const char* bad_exception::what() const _NOEXCEPT
@@ -128,8 +132,8 @@ const char* bad_exception::what() const _NOEXCEPT
   return "std::bad_exception";
 }
 
-#endif  // _LIBCPPABI_VERSION
-#endif //LIBCXXRT
+#endif
+
 
 exception_ptr::~exception_ptr() _NOEXCEPT
 {