* libc/stdlib/__call_atexit.c (__call_exitprocs): Handle atexit

functions registering additional atexit functions.
This commit is contained in:
Kazu Hirata 2007-04-05 16:47:38 +00:00
parent 263435cc61
commit 0efa93c061
2 changed files with 17 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2007-04-04 Mark Mitchell <mark@codesourcery.com>
* libc/stdlib/__call_atexit.c (__call_exitprocs): Handle atexit
functions registering additional atexit functions.
2007-04-04 Patrick Mansfield <patmans@us.ibm.com> 2007-04-04 Patrick Mansfield <patmans@us.ibm.com>
* libc/machine/spu/sys/syscall.h: New file for __send_to_ppe * libc/machine/spu/sys/syscall.h: New file for __send_to_ppe

View File

@ -23,6 +23,8 @@ _DEFUN (__call_exitprocs, (code, d),
int i; int i;
void (*fn) (void); void (*fn) (void);
restart:
p = _GLOBAL_REENT->_atexit; p = _GLOBAL_REENT->_atexit;
lastp = &_GLOBAL_REENT->_atexit; lastp = &_GLOBAL_REENT->_atexit;
while (p) while (p)
@ -34,6 +36,8 @@ _DEFUN (__call_exitprocs, (code, d),
#endif #endif
for (n = p->_ind - 1; n >= 0; n--) for (n = p->_ind - 1; n >= 0; n--)
{ {
int ind;
i = 1 << n; i = 1 << n;
/* Skip functions not from this dso. */ /* Skip functions not from this dso. */
@ -52,6 +56,8 @@ _DEFUN (__call_exitprocs, (code, d),
if (!fn) if (!fn)
continue; continue;
ind = p->_ind;
/* Call the function. */ /* Call the function. */
if (!args || (args->_fntypes & i) == 0) if (!args || (args->_fntypes & i) == 0)
fn (); fn ();
@ -59,6 +65,12 @@ _DEFUN (__call_exitprocs, (code, d),
(*((void (*)(int, _PTR)) fn))(code, args->_fnargs[n]); (*((void (*)(int, _PTR)) fn))(code, args->_fnargs[n]);
else else
(*((void (*)(_PTR)) fn))(args->_fnargs[n]); (*((void (*)(_PTR)) fn))(args->_fnargs[n]);
/* The function we called call atexit and registered another
function (or functions). Call these new functions before
continuing with the already registered functions. */
if (ind != p->_ind || *lastp != p)
goto restart;
} }
#ifndef _ATEXIT_DYNAMIC_ALLOC #ifndef _ATEXIT_DYNAMIC_ALLOC