From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 10 Mar 1998 12:44:51 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/libc-ud-980319~34
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=62c349c632dca31385304164ffcd6ca7b9f360cc;p=glibc.git

Update.
---

diff --git a/ChangeLog b/ChangeLog
index ee5cb2f7d1..54421bfae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-1998-03-10 07:54  H.J. Lu  <hjl@gnu.org>
-
-	* elf/rtld.c (dl_main): Load the preloaded objects dependencies.
-
 1998-03-10  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/dl-lookup.c (_dl_lookup_versioned_symbol): Print version
diff --git a/elf/rtld.c b/elf/rtld.c
index c6a45fe2d4..2db6cf3613 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -612,11 +612,6 @@ of this helper program; chances are you did not intend to run this program.\n",
      dependencies in the executable's searchlist for symbol resolution.  */
   _dl_map_object_deps (main_map, preloads, npreloads, mode == trace);
 
-  /* We should also load the preloaded objects dependencies. They
-     may call dlsym (RTLD_NEXT, ...).  */
-  for (i = 0; i < npreloads; i++)
-    _dl_map_object_deps (preloads[i], NULL, 0, 0);
-
 #ifndef MAP_ANON
   /* We are done mapping things, so close the zero-fill descriptor.  */
   __close (_dl_zerofd);