diff options
Diffstat (limited to 'stdlib/cxa_atexit.c')
| -rw-r--r-- | stdlib/cxa_atexit.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c index 3bdf871e53..767f08e66b 100644 --- a/stdlib/cxa_atexit.c +++ b/stdlib/cxa_atexit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2001, 2002, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1999,2001,2002,2005,2006,2009 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 @@ -26,13 +26,13 @@ #undef __cxa_atexit -/* Register a function to be called by exit or when a shared library - is unloaded. This function is only called from code generated by - the C++ compiler. */ + int -__cxa_atexit (void (*func) (void *), void *arg, void *d) +attribute_hidden +__internal_atexit (void (*func) (void *), void *arg, void *d, + struct exit_function_list **listp) { - struct exit_function *new = __new_exitfn (); + struct exit_function *new = __new_exitfn (listp); if (new == NULL) return -1; @@ -47,6 +47,16 @@ __cxa_atexit (void (*func) (void *), void *arg, void *d) new->flavor = ef_cxa; return 0; } + + +/* Register a function to be called by exit or when a shared library + is unloaded. This function is only called from code generated by + the C++ compiler. */ +int +__cxa_atexit (void (*func) (void *), void *arg, void *d) +{ + return __internal_atexit (func, arg, d, &__exit_funcs); +} INTDEF(__cxa_atexit) @@ -59,7 +69,7 @@ struct exit_function_list *__exit_funcs = &initial; uint64_t __new_exitfn_called; struct exit_function * -__new_exitfn (void) +__new_exitfn (struct exit_function_list **listp) { struct exit_function_list *p = NULL; struct exit_function_list *l; @@ -68,7 +78,7 @@ __new_exitfn (void) __libc_lock_lock (lock); - for (l = __exit_funcs; l != NULL; p = l, l = l->next) + for (l = *listp; l != NULL; p = l, l = l->next) { for (i = l->idx; i > 0; --i) if (l->fns[i - 1].flavor != ef_free) @@ -92,8 +102,8 @@ __new_exitfn (void) calloc (1, sizeof (struct exit_function_list)); if (p != NULL) { - p->next = __exit_funcs; - __exit_funcs = p; + p->next = *listp; + *listp = p; } } |