summaryrefslogtreecommitdiff
path: root/malloc/mtrace.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-02-26 17:53:15 +0000
committerUlrich Drepper <drepper@redhat.com>2001-02-26 17:53:15 +0000
commitc08bc50a60a92e8d32f302ea411312bc438f05ef (patch)
tree3d385b90c8a5fc7879d4a840f60edc1eb148308a /malloc/mtrace.c
parentd9e77f3d6ebeee8ba1ee31d46d592530f7c37ba7 (diff)
downloadglibc-c08bc50a60a92e8d32f302ea411312bc438f05ef.tar.gz
Update.
2001-02-26 Ulrich Drepper <drepper@redhat.com> * dlfcn/Makefile (distribute): Add modatexit.c and modcxaatexit.c. (tests): Add tstatexit and tstcxaatexit. (module-names): Add modatexit and modcxaatexit. Add rules to build and run tstatexit and tstcxaatexit. * dlfcn/modatexit.c: New file. * dlfcn/modcxaatexit.c: New file. * dlfcn/tstatexit.c: New file. * dlfcn/tstcxaatexit.c: New file. * io/Makefile: Pass -DHAVE_DOT_HIDDEN to stat and mknod functions if .hidden is available. * io/stat.c: If .hidden is available use it to avoid exporting functions. * io/fstat.c: Likewise. * io/lstat.c: Likewise. * io/stat64.c: Likewise. * io/fstat64.c: Likewise. * io/lstat64.c: Likewise. * sysdeps/generic/mknod.c: Likewise. * malloc/mtrace.c: Use __cxa_atexit and not atexit. * sysdeps/generic/bb_init_func.c: Likewise. * sysdeps/generic/libc-start.c: Likewise. * stdlib/atexit.c (__new_exitfn): Move to cxa_atexit.c. (atexit): Implement using __cxa_atexit. Use .hidden if availble to avoid exporting atexit. * stdlib/cxa_atexit.c (__new_exitfn): Moved to here from atexit.c. * stdlib/Versions: Export __new_exitfn for GLIBC_2.2.3. * stdlib/Makefile (routines): Add old_atexit. (static-only-routines): Add atexit. Pass -DHAVE_DOT_HIDDEN for atexit.c if .hidden is available. * stdlib/old_atexit.c: New file. * intl/Makefile: Remove bogus endif.
Diffstat (limited to 'malloc/mtrace.c')
-rw-r--r--malloc/mtrace.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 9ebbaebf4d..fddf137fa6 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -291,8 +291,10 @@ mtrace ()
#ifdef _LIBC
if (!added_atexit_handler)
{
+ extern void *__dso_handle __attribute__ ((__weak__));
added_atexit_handler = 1;
- atexit (release_libc_mem);
+ __cxa_atexit ((void (*) (void *)) release_libc_mem, NULL,
+ &__dso_handle ? __dso_handle : NULL);
}
#endif
}