From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 11 Feb 2005 15:02:46 +0000 (+0000)
Subject: 	* elf/rtld.c (_dl_start): Set bootstrap_map.l_relocated even
X-Git-Tag: cvs/fedora-glibc-2_3_4-9~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88da3f5402868f2f90d12d7335ab41de6308ff8a;p=thirdparty%2Fglibc.git

	* elf/rtld.c (_dl_start): Set bootstrap_map.l_relocated even
	for already prelinked ld.so.
---

diff --git a/ChangeLog b/ChangeLog
index 21071e35d28..b71840f9fde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-11  Jakub Jelinek  <jakub@redhat.com>
 
+	* elf/rtld.c (_dl_start): Set bootstrap_map.l_relocated even
+	for already prelinked ld.so.
+
 	* scripts/soversions.awk: Only record first WORDSIZE{32,64}
 	matching line.
 
diff --git a/elf/rtld.c b/elf/rtld.c
index 9fda5b8122c..2c42336f14a 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -509,8 +509,8 @@ _dl_start (void *arg)
 	 data access using the global offset table.  */
 
       ELF_DYNAMIC_RELOCATE (&bootstrap_map, 0, 0);
-      bootstrap_map.l_relocated = 1;
     }
+  bootstrap_map.l_relocated = 1;
 
   /* Please note that we don't allow profiling of this object and
      therefore need not test whether we have to allocate the array