From f55c0db8b545cd6f89c7b96933dc8c9d2694bc46 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 22 Jan 2013 14:48:10 +0000
Subject: Saleem Abdulrasool: __terminate_handler and __unexpected_handler are
 defined but not used when 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
---
 libcxx/src/exception.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libcxx/src')

diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index f5e6d2259da..0cd182b716c 100644
--- 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>)
-- 
cgit v1.2.3