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/rtld.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'elf/rtld.c') diff --git a/elf/rtld.c b/elf/rtld.c index 1db96999ea..8276b79a71 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -313,7 +313,7 @@ static void map_doit (void *a) { struct map_args *args = (struct map_args *) a; - args->main_map = _dl_map_object (NULL, args->str, 0, lt_library, 0); + args->main_map = _dl_map_object (NULL, args->str, 0, lt_library, 0, 0); } static void @@ -514,7 +514,7 @@ of this helper program; chances are you did not intend to run this program.\n\ else { HP_TIMING_NOW (start); - _dl_map_object (NULL, _dl_argv[0], 0, lt_library, 0); + _dl_map_object (NULL, _dl_argv[0], 0, lt_library, 0, 0); HP_TIMING_NOW (stop); HP_TIMING_DIFF (load_time, start, stop); @@ -694,7 +694,7 @@ of this helper program; chances are you did not intend to run this program.\n\ || strchr (p, '/') == NULL)) { struct link_map *new_map = _dl_map_object (_dl_loaded, p, 1, - lt_library, 0); + lt_library, 0, 0); if (new_map->l_opencount == 1) /* It is no duplicate. */ ++npreloads; @@ -762,7 +762,7 @@ of this helper program; chances are you did not intend to run this program.\n\ if (p[0] != '\0') { struct link_map *new_map = _dl_map_object (_dl_loaded, p, 1, - lt_library, 0); + lt_library, 0, 0); if (new_map->l_opencount == 1) /* It is no duplicate. */ ++npreloads; @@ -773,7 +773,7 @@ of this helper program; chances are you did not intend to run this program.\n\ { char *p = strndupa (problem, file_size - (problem - file)); struct link_map *new_map = _dl_map_object (_dl_loaded, p, 1, - lt_library, 0); + lt_library, 0, 0); if (new_map->l_opencount == 1) /* It is no duplicate. */ ++npreloads; -- cgit v1.2.3