diff options
Diffstat (limited to 'elf/dl-fini.c')
| -rw-r--r-- | elf/dl-fini.c | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/elf/dl-fini.c b/elf/dl-fini.c index 4b578f8bd7..3f2d625652 100644 --- a/elf/dl-fini.c +++ b/elf/dl-fini.c @@ -1,5 +1,5 @@ /* Call the termination functions of loaded shared objects. - Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1998, 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 @@ -28,18 +28,48 @@ _dl_fini (void) for (l = _dl_loaded; l; l = l->l_next) if (l->l_init_called) { - if (l->l_info[DT_FINI] && - !(l->l_name[0] == '\0' && l->l_type == lt_executable)) + int first = 1; + + /* Make sure nothing happens if we are called twice. */ + l->l_init_called = 0; + + /* Don't call the destructors for objects we are not supposed to. */ + if (l->l_name[0] == '\0' && l->l_type == lt_executable) + continue; + + /* First see whether an array is given. */ + if (l->l_info[DT_FINI_ARRAY] != NULL) + { + ElfW(Addr) *array = + (ElfW(Addr) *) (l->l_addr + + l->l_info[DT_FINI_ARRAY]->d_un.d_ptr); + unsigned int sz = (l->l_info[DT_FINI_ARRAYSZ]->d_un.d_val + / sizeof (ElfW(Addr))); + unsigned int cnt; + + for (cnt = 0; cnt < sz; ++cnt) + { + /* When debugging print a message first. */ + if (_dl_debug_impcalls && first) + _dl_debug_message (1, "\ncalling fini: ", + l->l_name[0] ? l->l_name : _dl_argv[0], + "\n\n", NULL); + first = 0; + + (*(void (*) (void)) (l->l_addr + array[cnt])) (); + } + } + + /* Next try the old-style destructor. */ + if (l->l_info[DT_FINI]) { /* When debugging print a message first. */ - if (_dl_debug_impcalls) + if (_dl_debug_impcalls && first) _dl_debug_message (1, "\ncalling fini: ", l->l_name[0] ? l->l_name : _dl_argv[0], "\n\n", NULL); (*(void (*) (void)) (l->l_addr + l->l_info[DT_FINI]->d_un.d_ptr)) (); } - /* Make sure nothing happens if we are called twice. */ - l->l_init_called = 0; } } |