FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eh_catch.cc (uncaught_exception, [...]): Return false or zero if the library is built without exceptions.

Browse source 
2015-04-27  Federico Lenarduzzi  <federico.lenarduzzi@tallertechnologies.com>
	    Jonathan Wakely  <jwakely@redhat.com>

	* libsupc++/eh_catch.cc (uncaught_exception, uncaught_exceptions):
	Return false or zero if the library is built without exceptions.
	* libsupc++/eh_term_handler.cc: Disable verbose terminate handler if
	the library is built without exceptions.

Co-Authored-By: Jonathan Wakely <jwakely@redhat.com>

From-SVN: r222484
This commit is contained in:
Federico Lenarduzzi 2015-04-27 21:06:17 +00:00 • committed by Jonathan Wakely
parent 913ae610c2
commit 03e73da676
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,11 @@
2015-04-27 Federico Lenarduzzi <federico.lenarduzzi@tallertechnologies.com>
Jonathan Wakely <jwakely@redhat.com>
* libsupc++/eh_catch.cc (uncaught_exception, uncaught_exceptions):
Return false or zero if the library is built without exceptions.
* libsupc++/eh_term_handler.cc: Disable verbose terminate handler if
the library is built without exceptions.
2015-04-27 Ville Voutilainen <ville.voutilainen@gmail.com> 2015-04-27 Ville Voutilainen <ville.voutilainen@gmail.com>
* config/abi/pre/gnu.ver: Fix comment. * config/abi/pre/gnu.ver: Fix comment.

8
libstdc++-v3/libsupc++/eh_catch.cc
View file

@ -136,13 +136,21 @@ __cxxabiv1::__cxa_end_catch ()
bool bool
std::uncaught_exception() throw() std::uncaught_exception() throw()
{ {
#if __cpp_exceptions
__cxa_eh_globals *globals = __cxa_get_globals (); __cxa_eh_globals *globals = __cxa_get_globals ();
return globals->uncaughtExceptions != 0; return globals->uncaughtExceptions != 0;
#else
return false;
#endif
} }
int int
std::uncaught_exceptions() throw() std::uncaught_exceptions() throw()
{ {
#if __cpp_exceptions
__cxa_eh_globals *globals = __cxa_get_globals (); __cxa_eh_globals *globals = __cxa_get_globals ();
return globals->uncaughtExceptions; return globals->uncaughtExceptions;
#else
return 0;
#endif
} }

2
libstdc++-v3/libsupc++/eh_term_handler.cc
View file

@ -32,7 +32,7 @@
--disable-libstdcxx-verbose and rebuilding the library. --disable-libstdcxx-verbose and rebuilding the library.
In a freestanding environment, we default to this latter approach. */ In a freestanding environment, we default to this latter approach. */
#if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE #if _GLIBCXX_HOSTED && _GLIBCXX_VERBOSE && __cpp_exceptions
/* The current installed user handler. */ /* The current installed user handler. */
std::terminate_handler __cxxabiv1::__terminate_handler = std::terminate_handler __cxxabiv1::__terminate_handler =
__gnu_cxx::__verbose_terminate_handler; __gnu_cxx::__verbose_terminate_handler;