aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-deps.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-deps.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-deps.c')
-rw-r--r--elf/dl-deps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 1d3779f..5bc048e 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -67,7 +67,7 @@ openaux (void *a)
args->aux = _dl_map_object (args->map, args->name, 0,
(args->map->l_type == lt_executable
? lt_library : args->map->l_type),
- args->trace_mode);
+ args->trace_mode, 0);
}
@@ -232,7 +232,7 @@ _dl_map_object_deps (struct link_map *map,
dep = _dl_map_object (l, name, 0,
l->l_type == lt_executable ? lt_library :
- l->l_type, trace_mode);
+ l->l_type, trace_mode, 0);
/* Add it in any case to the duplicate list. */
newp = alloca (sizeof (struct list));
@@ -316,7 +316,7 @@ _dl_map_object_deps (struct link_map *map,
args.aux = _dl_map_object (l, name, 0,
(l->l_type == lt_executable
? lt_library : l->l_type),
- trace_mode);
+ trace_mode, 0);
}
/* The auxiliary object is actually available.