diff options
Diffstat (limited to 'stdlib/cxa_finalize.c')
| -rw-r--r-- | stdlib/cxa_finalize.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c index 43fcbc484f..bb49f36ddd 100644 --- a/stdlib/cxa_finalize.c +++ b/stdlib/cxa_finalize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1999,2001,2002,2003,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,22 +31,36 @@ __cxa_finalize (void *d) { struct exit_function_list *funcs; + restart: for (funcs = __exit_funcs; funcs; funcs = funcs->next) { struct exit_function *f; for (f = &funcs->fns[funcs->idx - 1]; f >= &funcs->fns[0]; --f) - if ((d == NULL || d == f->func.cxa.dso_handle) - /* We don't want to run this cleanup more than once. */ - && ! atomic_compare_and_exchange_bool_acq (&f->flavor, ef_free, - ef_cxa)) - { - void (*cxafn) (void *arg, int status) = f->func.cxa.fn; + { + void (*cxafn) (void *arg, int status); + void *cxaarg; + + if ((d == NULL || d == f->func.cxa.dso_handle) + /* We don't want to run this cleanup more than once. */ + && (cxafn = f->func.cxa.fn, + cxaarg = f->func.cxa.arg, + ! atomic_compare_and_exchange_bool_acq (&f->flavor, ef_free, + ef_cxa))) + { + uint64_t check = __new_exitfn_called; + #ifdef PTR_DEMANGLE - PTR_DEMANGLE (cxafn); + PTR_DEMANGLE (cxafn); #endif - cxafn (f->func.cxa.arg, 0); - } + cxafn (cxaarg, 0); + + /* It is possible that that last exit function registered + more exit functions. Start the loop over. */ + if (__builtin_expect (check != __new_exitfn_called, 0)) + goto restart; + } + } } /* Remove the registered fork handlers. We do not have to |