From de100ca78f839854b10a04bf34ef57eb45ac77ae Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 10 Mar 1998 00:16:33 +0000 Subject: Update. 1998-03-10 00:10 Ulrich Drepper * elf/dl-lookup.c (do_lookup): Remove list and n parameter and add instead scope. If debugging display information about symbol resolving. (_dl_lookup_symbol): Call do_lookup with correct parameters. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. * elf/dl-support.c: Define _dl_debug_symbols. * elf/link.h: Add declaration for _dl_debug_symbols. * elf/rtld.c: Define _dl_debug_symbols. (process_dl_debug): Recognize symbols option. --- elf/dl-lookup.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'elf/dl-lookup.c') diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index c3231ac2c5..9ee8381f66 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -63,10 +63,12 @@ struct sym_val static inline int do_lookup (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref, struct sym_val *result, - struct link_map *list[], size_t i, size_t n, - const char *reference_name, const struct r_found_version *version, - struct link_map *skip, int reloc_type) + struct link_map *scope, size_t i, const char *reference_name, + const struct r_found_version *version, struct link_map *skip, + int reloc_type) { + struct link_map **list = scope->l_searchlist; + size_t n = scope->l_nsearchlist; struct link_map *map; for (; i < n; ++i) @@ -96,6 +98,12 @@ do_lookup (const char *undef_name, unsigned long int hash, if (map->l_info[DT_SYMTAB] == NULL) continue; + /* Print some debugging info if wanted. */ + if (_dl_debug_symbols) + _dl_debug_message ("\tsymbol=", undef_name, "; lookup in file=", + map->l_name[0] ? map->l_name : _dl_argv[0], + "\n", NULL); + symtab = ((void *) map->l_addr + map->l_info[DT_SYMTAB]->d_un.d_ptr); strtab = ((void *) map->l_addr + map->l_info[DT_STRTAB]->d_un.d_ptr); verstab = map->l_versyms; @@ -214,8 +222,7 @@ _dl_lookup_symbol (const char *undef_name, const ElfW(Sym) **ref, /* Search the relevant loaded objects for a definition. */ for (scope = symbol_scope; *scope; ++scope) if (do_lookup (undef_name, hash, *ref, ¤t_value, - (*scope)->l_searchlist, 0, (*scope)->l_nsearchlist, - reference_name, NULL, NULL, reloc_type)) + *scope, 0, reference_name, NULL, NULL, reloc_type)) break; if (current_value.s == NULL) @@ -261,12 +268,10 @@ _dl_lookup_symbol_skip (const char *undef_name, const ElfW(Sym) **ref, assert (i < (*scope)->l_ndupsearchlist); if (! do_lookup (undef_name, hash, *ref, ¤t_value, - (*scope)->l_dupsearchlist, i, (*scope)->l_ndupsearchlist, - reference_name, NULL, skip_map, 0)) + *scope, i, reference_name, NULL, skip_map, 0)) while (*++scope) if (do_lookup (undef_name, hash, *ref, ¤t_value, - (*scope)->l_dupsearchlist, 0, (*scope)->l_ndupsearchlist, - reference_name, NULL, skip_map, 0)) + *scope, 0, reference_name, NULL, skip_map, 0)) break; if (current_value.s == NULL) @@ -306,8 +311,7 @@ _dl_lookup_versioned_symbol (const char *undef_name, const ElfW(Sym) **ref, for (scope = symbol_scope; *scope; ++scope) { int res = do_lookup (undef_name, hash, *ref, ¤t_value, - (*scope)->l_searchlist, 0, (*scope)->l_nsearchlist, - reference_name, version, NULL, reloc_type); + *scope, 0, reference_name, version, NULL, reloc_type); if (res > 0) break; @@ -369,12 +373,10 @@ _dl_lookup_versioned_symbol_skip (const char *undef_name, assert (i < (*scope)->l_ndupsearchlist); if (! do_lookup (undef_name, hash, *ref, ¤t_value, - (*scope)->l_dupsearchlist, i, (*scope)->l_ndupsearchlist, - reference_name, version, skip_map, 0)) + *scope, i, reference_name, version, skip_map, 0)) while (*++scope) if (do_lookup (undef_name, hash, *ref, ¤t_value, - (*scope)->l_dupsearchlist, 0, (*scope)->l_ndupsearchlist, - reference_name, version, skip_map, 0)) + *scope, 0, reference_name, version, skip_map, 0)) break; if (current_value.s == NULL) -- cgit v1.2.3