summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-21 06:32:16 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-21 06:32:16 +0000
commitc91bc73e3e463ae6a80e548b899703efae256090 (patch)
tree4ffca3b92929cba407f8c4dc68274d83ec697d90 /elf
parent8699e7b1daa5d250b8bc69e1ecffae80170277e5 (diff)
downloadglibc-c91bc73e3e463ae6a80e548b899703efae256090.tar.gz
glibc-c91bc73e3e463ae6a80e548b899703efae256090.tar.xz
glibc-c91bc73e3e463ae6a80e548b899703efae256090.zip
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.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c4
1 files changed, 3 insertions, 1 deletions
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.  */