From c91bc73e3e463ae6a80e548b899703efae256090 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 21 Oct 2000 06:32:16 +0000 Subject: Update. * include/link.h (struct link_map): Add l_soname_added bitfield. * elf/dl-load.c (_dl_map_object): Remember when we added the SONAME to the l_libname list and don't try it again. --- elf/dl-load.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'elf/dl-load.c') diff --git a/elf/dl-load.c b/elf/dl-load.c index 55725c3cb3..978a81c30d 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1413,7 +1413,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, { const char *soname; - if (l->l_info[DT_SONAME] == NULL) + if (__builtin_expect (l->l_soname_added, 1) + || l->l_info[DT_SONAME] == NULL) continue; soname = ((const char *) D_PTR (l, l_info[DT_STRTAB]) @@ -1423,6 +1424,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, /* We have a match on a new name -- cache it. */ add_name_to_object (l, soname); + l->l_soname_added = 1; } /* We have a match -- bump the reference count and return it. */ -- cgit 1.4.1