From: Jakub Jelinek <jakub@redhat.com>
Date: Sat, 12 Feb 2005 10:01:55 +0000 (+0000)
Subject: 	* elf/rtld.c (dlmain): If LD_TRACE_PRELINKING, clear l_relocated flag
X-Git-Tag: cvs/fedora-glibc-2_3_4-10~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=231d429bea9a9e68fb58e3c5d7585ed31e4c1901;p=thirdparty%2Fglibc.git

	* elf/rtld.c (dlmain): If LD_TRACE_PRELINKING, clear l_relocated flag
	before relocating ld.so again.
---

diff --git a/ChangeLog b/ChangeLog
index be37c4732a6..b762bd97c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/rtld.c (dlmain): If LD_TRACE_PRELINKING, clear l_relocated flag
+	before relocating ld.so again.
+
 2005-02-11  Jakub Jelinek  <jakub@redhat.com>
 
 	* debug/chk_fail.c (__chk_fail): Add a while (1) loop around
diff --git a/elf/rtld.c b/elf/rtld.c
index 2c42336f14a..b72216ba967 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2027,10 +2027,13 @@ ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n",
 
 	      if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
 		  && GL(dl_rtld_map).l_opencount > 1)
-		_dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope,
-				     0, 0);
-	    }
-
+		{
+		  /* Mark the link map as not yet relocated again.  */
+		  GL(dl_rtld_map).l_relocated = 0;
+		  _dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope,
+				       0, 0);
+		}
+            }
 #define VERNEEDTAG (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (DT_VERNEED))
 	  if (version_info)
 	    {