From bf8b3e74bfdc50935445c324f8dc03025a6f2419 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 20 Jul 2000 22:53:54 +0000 Subject: Update. * elf/elf.h: Add various DF_1_*, DTF_1_*, and DF_P1_* entries. * elf/dl-close.c (_dl_close): Don't close an object if it is marked with nodelete. * elf/dl-open.c (dl_open_worker): Pass RTLD_NOLOAD as new parameter to _dl_map_object. Return immediately if no object loaded. Set DF_1_NODELETE bit in l_flags_1 if RTLD_NODELETE was passed. * elf/dynamic-link.h (elf_get_dynamic_info): Copy DT_FLAGS_1 entry if it exists into l_flags_1 word. * elf/dl-load.c (_dl_map_object_from_fd): Take no parameter and use it to determine whether loading is wanted or not. (_dl_map_object): Likewise. Call _dl_map_object_from_fd with new parameter. * sysdeps/generic/ldsodefs.h: Update prototype. * elf/dl-deps.c: Add new parameter to _dl_map_object calls. * elf/rtld.c: Likewise. * elf/Makefile (tests): Add noload. Add rules to generate noload. * elf/noload.c: New file. * include/link.h (struct link_map): Add l_feature_1 and l_flags_1. * sysdeps/generic/bits/dlfcn.h: Define RTLD_NOLOAD and RTLD_NODELETE. * sysdeps/mips/bits/dlfcn.h: Likewise. --- elf/dl-close.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'elf/dl-close.c') diff --git a/elf/dl-close.c b/elf/dl-close.c index ec563ed..99d52d0 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -48,6 +48,11 @@ _dl_close (void *_map) unsigned int nrellist; unsigned int i; + /* First see whether we can remove the object at all. */ + if (map->l_flags_1 & DF_1_NODELETE) + /* Nope. Do nothing. */ + return; + if (map->l_opencount == 0) _dl_signal_error (0, map->l_name, N_("shared object not open")); @@ -112,7 +117,8 @@ _dl_close (void *_map) points to, the 0th elt being MAP itself. Decrement the reference counts on all the objects MAP depends on. */ for (i = 0; i < nsearchlist; ++i) - --list[i]->l_opencount; + if (! (list[i]->l_flags_1 & DF_1_NODELETE)) + --list[i]->l_opencount; /* Check each element of the search list to see if all references to it are gone. */ -- cgit v1.1