diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-04-01 09:41:37 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2009-04-01 09:41:37 +0000 |
| commit | 1a6da537df1fe1726d95407ec04cf65caa1f8121 (patch) | |
| tree | 6bce92bfbf8738fc893911aab9c9712da72ab6e6 /elf/dl-close.c | |
| parent | ef860a878bf532436a469fc1f89fe3366862a949 (diff) | |
Updated to fedora-glibc-20090401T0935cvs/fedora-glibc-2_9_90-12
Diffstat (limited to 'elf/dl-close.c')
| -rw-r--r-- | elf/dl-close.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index 46f1a40adc..b73a7adb1a 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -1,5 +1,5 @@ /* Close a shared object opened by `_dl_open'. - Copyright (C) 1996-2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 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 @@ -695,6 +695,18 @@ _dl_close_worker (struct link_map *map) } #endif + if (__builtin_expect (ns->_ns_loaded == NULL, 0) + && nsid == GL(dl_nns) - 1) + do + { + --GL(dl_nns); +#ifndef SHARED + if (GL(dl_nns) == 0) + break; +#endif + } + while (GL(dl_ns)[GL(dl_nns) - 1]._ns_loaded == NULL); + /* Notify the debugger those objects are finalized and gone. */ r->r_state = RT_CONSISTENT; _dl_debug_state (); @@ -763,7 +775,7 @@ free_slotinfo (struct dtv_slotinfo_list **elemp) libc_freeres_fn (free_mem) { - for (Lmid_t nsid = 0; nsid < DL_NNS; ++nsid) + for (Lmid_t nsid = 0; nsid < GL(dl_nns); ++nsid) if (__builtin_expect (GL(dl_ns)[nsid]._ns_global_scope_alloc, 0) != 0 && (GL(dl_ns)[nsid]._ns_main_searchlist->r_nlist // XXX Check whether we need NS-specific initial_searchlist |