From 610e67ed5af7e1acf2f96bb964cc2131af570a3d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper <drepper@redhat.com> Date: Sun, 8 Mar 2009 19:53:12 +0000 Subject: * stdlib/Makefile (routines): Add quick_exit, at_quick_exit, and cxa_at_quick_exit. (static-only-routines): Add at_quick_exit. * stdlib/Versions: Export quick_exit and __cxa_at_quick_exit for GLIBC_2.10. * stdlib/quick_exit.c: New file. * stdlib/at_quick_exit.c: New file. * stdlib/cxa_at_quick_exit.c: New file. * stdlib/cxa_atexit.c (__cxa_atexit): Move body to new function. Call it appropriately. (__internal_atexit): New function. (__new_exitfn): Now takes parameter to point to the list to use. * stdlib/cxa_finalize.c: Remove quick_exit handlers, don't call them. * stdlib/exit.c (__run_exit_handlers): New function. Split from... (exit): ...here. Just call __run_exit_handlers appropriately. * stdlib/exit.h: Declare __quick_exit_funcs, __run_exit_handlers, __internal_atexit, __cxa_at_quick_exit. Adjust __new_exitfn. * stdlib/on_exit.c: Adjust call to __new_exitfn. * stdlib/stdlib.h: Declare at_quick_exit and quick_exit. --- stdlib/cxa_finalize.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'stdlib/cxa_finalize.c') diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c index 148d57f200..351538a686 100644 --- a/stdlib/cxa_finalize.c +++ b/stdlib/cxa_finalize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999,2001,2002,2003,2005,2006 Free Software Foundation, Inc. +/* Copyright (C) 1999,2001-2003,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 @@ -63,6 +63,16 @@ __cxa_finalize (void *d) } } + /* Also remove the quick_exit handlers, but do not call them. */ + for (funcs = __quick_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) + f->flavor = ef_free; + } + /* Remove the registered fork handlers. We do not have to unregister anything if the program is going to terminate anyway. */ #ifdef UNREGISTER_ATFORK -- cgit v1.2.3-65-gdbad