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

eh_alloc.cc: Ensure that required macros are defined before including gthr.h.

Browse source 
* libsupc++/eh_alloc.cc: Ensure that required macros are
	defined before including gthr.h.  Ensure that we get the
	version of gthr.h for which we know how to provide a
	configuration.
	* libsupc++/eh_globals.cc: Likewise.  And, bring the threading
	code path into line with the current EH model.  Use std, where
	appropriate.

Co-Authored-By: John David Anglin <dave@hiauly1.hia.nrc.ca>

From-SVN: r42999
This commit is contained in:
Loren J. Rittle 2001-06-08 03:55:43 +00:00 • committed by Loren J. Rittle
parent 5e21803304
commit 7628e178ef
3 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,14 @@
2001-06-07 Loren J. Rittle <ljrittle@acm.org>
John David Anglin <dave@hiauly1.hia.nrc.ca>
* libsupc++/eh_alloc.cc: Ensure that required macros are
defined before including gthr.h. Ensure that we get the
version of gthr.h for which we know how to provide a
configuration.
* libsupc++/eh_globals.cc: Likewise. And, bring the threading
code path into line with the current EH model. Use std, where
appropriate.
2001-06-07 Loren J. Rittle <ljrittle@acm.org>
John David Anglin <dave@hiauly1.hia.nrc.ca>

3
libstdc++-v3/libsupc++/eh_alloc.cc
View file

@ -35,7 +35,8 @@
#include <cstring>
#include <limits.h>
#include "unwind-cxx.h"
#include "gthr.h"
#include "bits/c++config.h"
#include "bits/gthr.h"
using namespace __cxxabiv1;

30
libstdc++-v3/libsupc++/eh_globals.cc
View file

@ -29,8 +29,10 @@
#include <exception>
#include <cstdlib>
#include "unwind-cxx.h"
#include "gthr.h"
#include "bits/c++config.h"
#include "bits/gthr.h"
using namespace __cxxabiv1;
@ -47,7 +49,7 @@ get_globals_dtor (void *ptr)
{
__gthread_key_dtor (globals_key, ptr);
if (ptr)
free (ptr);
std::free (ptr);
}
static void
@ -90,24 +92,20 @@ __cxa_get_globals ()
return &globals_static;
if (use_thread_key < 0)
get_globals_init_once ();
{
get_globals_init_once ();
// Make sure use_thread_key got initialized.
if (use_thread_key == 0)
return &globals_static;
}
g = (__cxa_eh_globals *) __gthread_getspecific (globals_key);
if (! g)
{
static __gthread_once_t once = __GTHREAD_ONCE_INIT;
// Make sure use_thread_key got initialized. Some systems have
// dummy thread routines in their libc that return a success.
if (__gthread_once (&once, eh_threads_initialize) != 0
|| use_thread_key < 0)
{
use_thread_key = 0;
return &globals_static;
}
if ((g = malloc (sizeof (__cxa_eh_globals))) == 0
|| __gthread_setspecific (eh_context_key, (void *) g) != 0)
if ((g = (__cxa_eh_globals *)
std::malloc (sizeof (__cxa_eh_globals))) == 0
|| __gthread_setspecific (globals_key, (void *) g) != 0)
std::terminate ();
g->caughtExceptions = 0;
g->uncaughtExceptions = 0;