summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-09-14 12:12:25 +0200
committerAndreas Schwab <schwab@redhat.com>2011-09-14 13:29:24 +0200
commit48b67d71ec677d1b3168e52a68b644784cead604 (patch)
treee7ac09125079076b93f381b193781b0bf6341ef9 /elf
parent1ae12c758f8e40ed16320fea4c928974d2274474 (diff)
downloadglibc-48b67d71ec677d1b3168e52a68b644784cead604.tar.gz
glibc-48b67d71ec677d1b3168e52a68b644784cead604.tar.xz
glibc-48b67d71ec677d1b3168e52a68b644784cead604.zip
Also relocate in dependency order when doing symbol dependency testing
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 764140d3df..324d979107 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2027,24 +2027,21 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
 	    {
 	      /* We have to do symbol dependency testing.  */
 	      struct relocate_args args;
-	      struct link_map *l;
+	      unsigned int i;
 
 	      args.reloc_mode = GLRO(dl_lazy) ? RTLD_LAZY : 0;
 
-	      l = main_map;
-	      while (l->l_next != NULL)
-		l = l->l_next;
-	      do
+	      i = main_map->l_searchlist.r_nlist;
+	      while (i-- > 0)
 		{
+		  struct link_map *l = main_map->l_initfini[i];
 		  if (l != &GL(dl_rtld_map) && ! l->l_faked)
 		    {
 		      args.l = l;
 		      _dl_receive_error (print_unresolved, relocate_doit,
 					 &args);
 		    }
-		  l = l->l_prev;
 		}
-	      while (l != NULL);
 
 	      if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
 		  && rtld_multiple_ref)