From f6de2239e2cb1af87b36dbd8712bd27f42ae7d54 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 21 Oct 2000 02:07:22 +0000 Subject: Update. * elf/Makefile: Add rules to build and run unload2. * elf/unload2.c: New file. * elf/unload2mod.c: New file. * elf/unload2dep.c: New file. * intl/libintl.h (ngettext macro): Add missing parameter. (dngettext macro): Likewise. --- elf/dl-close.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'elf/dl-close.c') diff --git a/elf/dl-close.c b/elf/dl-close.c index 03c38d906f..8426e73ec9 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -61,9 +61,6 @@ _dl_close (void *_map) /* Acquire the lock. */ __libc_lock_lock (_dl_load_lock); - list = map->l_searchlist.r_list; - nsearchlist = map->l_searchlist.r_nlist; - /* Decrement the reference count. */ if (map->l_opencount > 1 || map->l_type != lt_loaded) { @@ -81,17 +78,14 @@ _dl_close (void *_map) "\n", NULL); } - /* Even if we don't unload it now, we still have to decrement - `l_opencount' of the dependencies. Otherwise, they may not - get unloaded later. */ - for (i = 0; i < nsearchlist; ++i) - if (! (list[i]->l_flags_1 & DF_1_NODELETE)) - --list[i]->l_opencount; - + --map->l_opencount; __libc_lock_unlock (_dl_load_lock); return; } + list = map->l_searchlist.r_list; + nsearchlist = map->l_searchlist.r_nlist; + rellist = map->l_reldeps; nrellist = map->l_reldepsact; -- cgit v1.2.3