generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Teach libc++ to check for libc++abi and use its features if they're available.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@160038 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Richard Smith 2012-07-11 09:35:47 +00:00
parent d586248597
commit 591e32d624
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/exception.cpp
View File

@ -10,6 +10,10 @@
#include "exception" #include "exception"
#ifndef __has_include
#define __has_include(inc) 0
#endif
#if __APPLE__ #if __APPLE__
#include <cxxabi.h> #include <cxxabi.h>
@ -23,14 +27,16 @@
#define __terminate_handler __cxxabiapple::__cxa_terminate_handler #define __terminate_handler __cxxabiapple::__cxa_terminate_handler
#define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler #define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler
#endif // _LIBCPPABI_VERSION #endif // _LIBCPPABI_VERSION
#elif defined(LIBCXXRT) #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
#include <cxxabi.h> #include <cxxabi.h>
using namespace __cxxabiv1; using namespace __cxxabiv1;
#if defined(LIBCXXRT) || defined(_LIBCPPABI_VERSION)
#define HAVE_DEPENDENT_EH_ABI 1 #define HAVE_DEPENDENT_EH_ABI 1
#else // __APPLE__ #endif
#else // __has_include(<cxxabi.h>)
static std::terminate_handler __terminate_handler; static std::terminate_handler __terminate_handler;
static std::unexpected_handler __unexpected_handler; static std::unexpected_handler __unexpected_handler;
#endif // __APPLE__ #endif // __has_include(<cxxabi.h>)
namespace std namespace std
{ {
@ -96,12 +102,9 @@ terminate() _NOEXCEPT
#ifndef LIBCXXRT #ifndef LIBCXXRT
bool uncaught_exception() _NOEXCEPT bool uncaught_exception() _NOEXCEPT
{ {
#if __APPLE__ #if __APPLE__ || defined(_LIBCPPABI_VERSION)
// on Darwin, there is a helper function so __cxa_get_globals is private // on Darwin, there is a helper function so __cxa_get_globals is private
return __cxa_uncaught_exception(); return __cxa_uncaught_exception();
#elif LIBCXXRT
__cxa_eh_globals * globals = __cxa_get_globals();
return (globals->uncaughtExceptions != 0);
#else // __APPLE__ #else // __APPLE__
#warning uncaught_exception not yet implemented #warning uncaught_exception not yet implemented
::abort(); ::abort();