summary refs log tree commit diff
path: root/elf/dl-lookup.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-10-25 04:00:08 +0000
committerUlrich Drepper <drepper@redhat.com>2000-10-25 04:00:08 +0000
commite30f2b9828ddff95b687b9818787ab2a99570f11 (patch)
tree0f7d70d62ed062356f97e114a4762d44b0197d14 /elf/dl-lookup.c
parent7d1231f116a3e3019c4ea184e043fb881ba0b207 (diff)
downloadglibc-e30f2b9828ddff95b687b9818787ab2a99570f11.tar.gz
glibc-e30f2b9828ddff95b687b9818787ab2a99570f11.tar.xz
glibc-e30f2b9828ddff95b687b9818787ab2a99570f11.zip
Update.
	* elf/dl-lookup.c (add_dependency): Fix test to check whether
	dependency already exists.
	* elf/Makefile: Add testobj1 and testobj2 as dependencies of testobj6.
	* elf/loadtest.c (main): Add test at the end that everything is
	unloaded.

	* elf/dl-open.c (dl_open_worker): Fix typo in comment.
Diffstat (limited to 'elf/dl-lookup.c')
-rw-r--r--elf/dl-lookup.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 581c6a6c2b..9e0a25da80 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -97,14 +97,13 @@ add_dependency (struct link_map *undef_map, struct link_map *map)
 
   /* Determine whether UNDEF_MAP already has a reference to MAP.  First
      look in the normal dependencies.  */
-  list = undef_map->l_searchlist.r_list;
-  act = undef_map->l_searchlist.r_nlist;
+  list = undef_map->l_initfini;
 
-  for (i = 0; i < act; ++i)
+  for (i = 0; list[i] != NULL; ++i)
     if (list[i] == map)
       break;
 
-  if (__builtin_expect (i == act, 1))
+  if (__builtin_expect (list[i] == NULL, 1))
     {
       /* No normal dependency.  See whether we already had to add it
 	 to the special list of dynamic dependencies.  */