diff options
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/exception.cpp | 37 | ||||
| -rw-r--r-- | libcxx/src/locale.cpp | 14 |
2 files changed, 31 insertions, 20 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 28d87b34050..9a80d3e92ef 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/exception.cpp @@ -13,16 +13,24 @@ #if __APPLE__ #include <cxxabi.h> using namespace __cxxabiv1; + using namespace __cxxabiv1::__cxxabiapple; // On Darwin, there are two STL shared libraries and a lower level ABI // shared libray. The globals holding the current terminate handler and // current unexpected handler are in the ABI library. #define __terminate_handler __cxxabiapple::__cxa_terminate_handler #define __unexpected_handler __cxxabiapple::__cxa_unexpected_handler + #define HAVE_DEPENDENT_EH_ABI 1 +#elif defined(LIBCXXRT) + #include <cxxabi.h> + using namespace __cxxabiv1; + #define HAVE_DEPENDENT_EH_ABI 1 #else // __APPLE__ static std::terminate_handler __terminate_handler; static std::unexpected_handler __unexpected_handler; #endif // __APPLE__ +#ifndef LIBCXXRT +// libcxxrt provides implementations of these functions itself. std::unexpected_handler std::set_unexpected(std::unexpected_handler func) _NOEXCEPT { @@ -76,18 +84,19 @@ std::terminate() _NOEXCEPT } #endif // _LIBCPP_NO_EXCEPTIONS } +#endif // LIBCXXRT bool std::uncaught_exception() _NOEXCEPT { #if __APPLE__ // on Darwin, there is a helper function so __cxa_get_globals is private return __cxxabiapple::__cxa_uncaught_exception(); +#elif LIBCXXRT + __cxa_eh_globals * globals = __cxa_get_globals(); + return (globals->uncaughtExceptions != 0); #else // __APPLE__ #warning uncaught_exception not yet implemented ::abort(); - // Not provided by Ubuntu gcc-4.2.4's cxxabi.h. - // __cxa_eh_globals * globals = __cxa_get_globals(); - // return (globals->uncaughtExceptions != 0); #endif // __APPLE__ } @@ -114,8 +123,8 @@ const char* bad_exception::what() const _NOEXCEPT exception_ptr::~exception_ptr() _NOEXCEPT { -#if __APPLE__ - __cxxabiapple::__cxa_decrement_exception_refcount(__ptr_); +#if HAVE_DEPENDENT_EH_ABI + __cxa_decrement_exception_refcount(__ptr_); #else #warning exception_ptr not yet implemented ::abort(); @@ -125,8 +134,8 @@ exception_ptr::~exception_ptr() _NOEXCEPT exception_ptr::exception_ptr(const exception_ptr& other) _NOEXCEPT : __ptr_(other.__ptr_) { -#if __APPLE__ - __cxxabiapple::__cxa_increment_exception_refcount(__ptr_); +#if HAVE_DEPENDENT_EH_ABI + __cxa_increment_exception_refcount(__ptr_); #else #warning exception_ptr not yet implemented ::abort(); @@ -135,11 +144,11 @@ exception_ptr::exception_ptr(const exception_ptr& other) _NOEXCEPT exception_ptr& exception_ptr::operator=(const exception_ptr& other) _NOEXCEPT { -#if __APPLE__ +#if HAVE_DEPENDENT_EH_ABI if (__ptr_ != other.__ptr_) { - __cxxabiapple::__cxa_increment_exception_refcount(other.__ptr_); - __cxxabiapple::__cxa_decrement_exception_refcount(__ptr_); + __cxa_increment_exception_refcount(other.__ptr_); + __cxa_decrement_exception_refcount(__ptr_); __ptr_ = other.__ptr_; } return *this; @@ -171,12 +180,12 @@ nested_exception::rethrow_nested() const std::exception_ptr std::current_exception() _NOEXCEPT { -#if __APPLE__ +#if HAVE_DEPENDENT_EH_ABI // be nicer if there was a constructor that took a ptr, then // this whole function would be just: // return exception_ptr(__cxa_current_primary_exception()); std::exception_ptr ptr; - ptr.__ptr_ = __cxxabiapple::__cxa_current_primary_exception(); + ptr.__ptr_ = __cxa_current_primary_exception(); return ptr; #else // __APPLE__ #warning exception_ptr not yet implemented @@ -186,8 +195,8 @@ std::exception_ptr std::current_exception() _NOEXCEPT void std::rethrow_exception(exception_ptr p) { -#if __APPLE__ - __cxxabiapple::__cxa_rethrow_primary_exception(p.__ptr_); +#if HAVE_DEPENDENT_EH_ABI + __cxa_rethrow_primary_exception(p.__ptr_); // if p.__ptr_ is NULL, above returns so we terminate terminate(); #else // __APPLE__ diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index a9fccec84c0..8f1e4e1322b 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -733,7 +733,7 @@ ctype<wchar_t>::do_scan_not(mask m, const char_type* low, const char_type* high) wchar_t ctype<wchar_t>::do_toupper(char_type c) const { -#ifndef _LIBCPP_STABLE_APPLE_ABI +#if !(defined(_LIBCPP_STABLE_APPLE_ABI) || defined(__FreeBSD__)) return isascii(c) ? ctype<char>::__classic_upper_table()[c] : c; #else return isascii(c) ? _DefaultRuneLocale.__mapupper[c] : c; @@ -744,7 +744,7 @@ const wchar_t* ctype<wchar_t>::do_toupper(char_type* low, const char_type* high) const { for (; low != high; ++low) -#ifndef _LIBCPP_STABLE_APPLE_ABI +#if !(defined(_LIBCPP_STABLE_APPLE_ABI) || defined(__FreeBSD__)) *low = isascii(*low) ? ctype<char>::__classic_upper_table()[*low] : *low; #else @@ -908,11 +908,12 @@ ctype<char>::do_narrow(const char_type* low, const char_type* high, char dfault, const ctype<char>::mask* ctype<char>::classic_table() _NOEXCEPT { -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) return _DefaultRuneLocale.__runetype; #elif defined(__GLIBC__) return __cloc()->__ctype_b; -// This is assumed to be safe. +// This is assumed to be safe, which is a nonsense assumption because we're +// going to end up dereferencing it later... #else return NULL; #endif @@ -922,7 +923,7 @@ ctype<char>::classic_table() _NOEXCEPT const int* ctype<char>::__classic_lower_table() _NOEXCEPT { -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) return _DefaultRuneLocale.__maplower; #elif defined(__GLIBC__) return __cloc()->__ctype_tolower; @@ -934,7 +935,7 @@ ctype<char>::__classic_lower_table() _NOEXCEPT const int* ctype<char>::__classic_upper_table() _NOEXCEPT { -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) return _DefaultRuneLocale.__mapupper; #elif defined(__GLIBC__) return __cloc()->__ctype_toupper; @@ -1036,6 +1037,7 @@ ctype_byname<wchar_t>::do_is(mask m, char_type c) const #ifdef _LIBCPP_WCTYPE_IS_MASK return static_cast<bool>(iswctype_l(c, m, __l)); #else + // FIXME: This is broken for things that test more than one flag. if (m & space && !iswspace_l(c, __l)) return false; if (m & print && !iswprint_l(c, __l)) return false; if (m & cntrl && !iswcntrl_l(c, __l)) return false; |
