diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | stdlib/Makefile | 2 | ||||
| -rw-r--r-- | stdlib/Versions | 4 | ||||
| -rw-r--r-- | stdlib/cxa_atexit.c | 38 | ||||
| -rw-r--r-- | stdlib/cxa_finalize.c | 44 | ||||
| -rw-r--r-- | stdlib/exit.c | 3 | ||||
| -rw-r--r-- | stdlib/exit.h | 22 |
7 files changed, 123 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 8f6f65e65e..1dff3ed602 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +1999-12-17 Andreas Jaeger <aj@suse.de> + + * stdlib/Versions: Export __cxa_atexit and __cxa_finalize. + +1999-12-16 Mark Mitchell <mark@codesourcery.com> + + * stdlib/Makefile (routines): Add cxa_atexit and cxa_finalize. + * stdlib/exit.h (flavor): Add ef_cxa. + (exit_function): Add cxa variant. + * stdlib/exit.c (exit): Handle ef_cxa exit functions. + * stdlib/cxa_atexit.c: New file. + * stdlib/cxa_finalize.c: New file. + 1999-12-27 Ulrich Drepper <drepper@cygnus.com> * iconvdata/gb2312.c: Update mapping of GB 0x212c from latest diff --git a/stdlib/Makefile b/stdlib/Makefile index ee7039f8c2..29adea4425 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -29,7 +29,7 @@ routines := \ abort \ bsearch qsort msort \ getenv putenv setenv secure-getenv \ - exit on_exit atexit \ + exit on_exit atexit cxa_atexit cxa_finalize \ abs labs llabs \ div ldiv lldiv \ mblen mbstowcs mbtowc wcstombs wctomb \ diff --git a/stdlib/Versions b/stdlib/Versions index 9536e3240e..034125a200 100644 --- a/stdlib/Versions +++ b/stdlib/Versions @@ -90,4 +90,8 @@ libc { # i* imaxabs; imaxdiv; } + GLIBC_2.1.3 { + # used by new G++ ABI + __cxa_atexit; __cxa_finalize; + } } diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c new file mode 100644 index 0000000000..180d74a54d --- /dev/null +++ b/stdlib/cxa_atexit.c @@ -0,0 +1,38 @@ +/* Copyright (C) 1999 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <stdlib.h> +#include "exit.h" + +/* 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) +{ + struct exit_function *new = __new_exitfn (); + + if (new == NULL) + return -1; + + new->flavor = ef_cxa; + new->func.cxa.fn = func; + new->func.cxa.arg = arg; + new->func.cxa.dso_handle = d; + return 0; +} diff --git a/stdlib/cxa_finalize.c b/stdlib/cxa_finalize.c new file mode 100644 index 0000000000..da2d91512e --- /dev/null +++ b/stdlib/cxa_finalize.c @@ -0,0 +1,44 @@ +/* Copyright (C) 1999 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <assert.h> +#include <stdlib.h> +#include <atomicity.h> +#include "exit.h" + +/* If D is non-NULL, call all functions registered with `__cxa_atexit' + with the same dso handle. Otherwise, if D is NULL, do nothing. */ +void +__cxa_finalize (void *d) +{ + struct exit_function_list *funcs; + + if (!d) + return; + + 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 == f->func.cxa.dso_handle + /* We don't want to run this cleanup more than once. */ + && compare_and_swap (&f->flavor, ef_cxa, ef_free)) + (*f->func.cxa.fn) (f->func.cxa.arg); + } +} diff --git a/stdlib/exit.c b/stdlib/exit.c index f63dc1fdec..904c225336 100644 --- a/stdlib/exit.c +++ b/stdlib/exit.c @@ -56,6 +56,9 @@ exit (int status) case ef_at: (*f->func.at) (); break; + case ef_cxa: + (*f->func.cxa.fn) (f->func.cxa.arg); + break; } } diff --git a/stdlib/exit.h b/stdlib/exit.h index dcaa85a442..9b6c1c3d4e 100644 --- a/stdlib/exit.h +++ b/stdlib/exit.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1999 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 @@ -19,9 +19,21 @@ #ifndef _EXIT_H #define _EXIT_H 1 + +enum +{ + ef_free, /* `ef_free' MUST be zero! */ + ef_us, + ef_on, + ef_at, + ef_cxa +}; + struct exit_function { - enum { ef_free, ef_us, ef_on, ef_at } flavor; /* `ef_free' MUST be zero! */ + /* `flavour' should be of type of the `enum' above but since we need + this element in an atomic operation we have to use `long int'. */ + long int flavor; union { void (*at) (void); @@ -30,6 +42,12 @@ struct exit_function void (*fn) (int status, void *arg); void *arg; } on; + struct + { + void (*fn) (void *arg); + void *arg; + void *dso_handle; + } cxa; } func; }; struct exit_function_list |