Saleem Abdulrasool: __terminate_handler and __unexpected_handler are defined but...

building against libsupc++ as the functions for which they are used are provided
by libsupc++.  Simply preprocess them away when building against libsupc++.

llvm-svn: 173165

diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index f5e6d22..0cd182b 100644 (file)
--- a/libcxx/src/exception.cpp
+++ b/libcxx/src/exception.cpp
@@ -33,7 +33,7 @@
   #if defined(LIBCXXRT) || defined(_LIBCPPABI_VERSION)
     #define HAVE_DEPENDENT_EH_ABI 1
   #endif
-#else  // __has_include(<cxxabi.h>)
+#elif !defined(__GLIBCXX__) // __has_include(<cxxabi.h>)
   static std::terminate_handler  __terminate_handler;
   static std::unexpected_handler __unexpected_handler;
 #endif // __has_include(<cxxabi.h>)