[cfe-commits] [PATCH] [libc++] do not define exception handlers when building with supc++

Howard Hinnant hhinnant at apple.com
Tue Jan 22 06:48:49 PST 2013


On Jan 21, 2013, at 10:01 PM, Saleem Abdulrasool <compnerd at compnerd.org> wrote:

> __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++.
> 
> http://llvm-reviews.chandlerc.com/D317
> 
> Files:
>  src/exception.cpp
> 
> Index: src/exception.cpp
> ===================================================================
> --- src/exception.cpp
> +++ 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>)
> <D317.1.patch>_______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Committed revision 173165.

Howard




More information about the cfe-commits mailing list