[PATCH] libstdc++: Fix exceptions being generated when compiling with -fno-exceptions
Federico Lenarduzzi
federico.lenarduzzi@tallertechnologies.com
Tue Apr 14 15:18:00 GMT 2015
When the libstdc++ is compiled, the compiler sets the std::terminate_handler function with __verbose_terminate_handler() or std::abort() depending on _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE being true or false.
However, even if we compile with -fno-exceptions, the compiler will use __verbose_terminate_handler(), which uses exceptions. Therefore, the library is not fully exception-free.
This patch adds a check for __EXCEPTIONS to the #if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE condition. If __EXCEPTIONS is defined, the compiler will use __verbose_terminate_handler() as a termination function; otherwise it'll use std::abort() which doesn't have exceptions. It also makes std::uncaught_exception() throw() return false if __EXCEPTIONS is not defined.
libstdc++-v3/
2015-04-14 Federico Lenarduzzi <federico.lenarduzzi@tallertechnologies.com>
* libsupc++/eh_catch.cc (std::uncaught_exception() throw()): Add an #else
which returns false if __EXCEPTIONS is not defined.
* libsupc++/eh_term_handler.cc: Add a check for __EXCEPTIONS to the #if.
---
libstdc++-v3/libsupc++/eh_catch.cc | 4 ++++
libstdc++-v3/libsupc++/eh_term_handler.cc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/libsupc++/eh_catch.cc b/libstdc++-v3/libsupc++/eh_catch.cc
index 43e875a..6b500f6 100644
--- a/libstdc++-v3/libsupc++/eh_catch.cc
+++ b/libstdc++-v3/libsupc++/eh_catch.cc
@@ -136,6 +136,10 @@ __cxxabiv1::__cxa_end_catch ()
bool
std::uncaught_exception() throw()
{
+#ifdef __EXCEPTIONS
__cxa_eh_globals *globals = __cxa_get_globals ();
return globals->uncaughtExceptions != 0;
+#else
+ return false;
+#endif
}
diff --git a/libstdc++-v3/libsupc++/eh_term_handler.cc b/libstdc++-v3/libsupc++/eh_term_handler.cc
index c855360..0935193 100644
--- a/libstdc++-v3/libsupc++/eh_term_handler.cc
+++ b/libstdc++-v3/libsupc++/eh_term_handler.cc
@@ -32,7 +32,7 @@
--disable-libstdcxx-verbose and rebuilding the library.
In a freestanding environment, we default to this latter approach. */
-#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE
+#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE && defined(__EXCEPTIONS)
/* The current installed user handler. */
std::terminate_handler __cxxabiv1::__terminate_handler =
__gnu_cxx::__verbose_terminate_handler;
--
1.9.3
More information about the Gcc-patches
mailing list