aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-open.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-20 22:53:54 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-20 22:53:54 +0000
commitbf8b3e74bfdc50935445c324f8dc03025a6f2419 (patch)
tree0f45dcac18a219c2743bd0b5e99d3e7b25f6131c /elf/dl-open.c
parent5e61ef88485aad8392c15956d6097285db3f2955 (diff)
downloadglibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.zip
glibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.tar.gz
glibc-bf8b3e74bfdc50935445c324f8dc03025a6f2419.tar.bz2
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.
Diffstat (limited to 'elf/dl-open.c')
-rw-r--r--elf/dl-open.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 680377b..477ecdf 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -144,7 +144,17 @@ dl_open_worker (void *a)
}
/* Load the named object. */
- args->map = new = _dl_map_object (NULL, file, 0, lt_loaded, 0);
+ args->map = new = _dl_map_object (NULL, file, 0, lt_loaded, 0,
+ mode & RTLD_NOLOAD);
+
+ /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
+ set and the object is not already loaded. */
+ if (new == NULL)
+ {
+ assert (mode & RTLD_NOLOAD);
+ return;
+ }
+
if (new->l_searchlist.r_list)
/* It was already open. */
return;
@@ -279,6 +289,11 @@ dl_open_worker (void *a)
/* XXX Do we have to add something to r_dupsearchlist??? --drepper */
}
+ /* Mark the object as not deletable if the RTLD_NODELETE flags was
+ passed. */
+ if (__builtin_expect (mode & RTLD_NODELETE, 0))
+ new->l_flags_1 |= DF_1_NODELETE;
+
if (_dl_sysdep_start == NULL)
/* We must be the static _dl_open in libc.a. A static program that
has loaded a dynamic object now has competition. */