about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-02-11 15:02:46 +0000
committerJakub Jelinek <jakub@redhat.com>2005-02-11 15:02:46 +0000
commit88da3f5402868f2f90d12d7335ab41de6308ff8a (patch)
tree1dbfada3b45ffe9e0c044c00f73c3ae2e0acc381
parent8426ecf6be9006d5b44f5fa54ac4c75e620f5fd1 (diff)
downloadglibc-88da3f5402868f2f90d12d7335ab41de6308ff8a.tar.gz
glibc-88da3f5402868f2f90d12d7335ab41de6308ff8a.tar.xz
glibc-88da3f5402868f2f90d12d7335ab41de6308ff8a.zip
* elf/rtld.c (_dl_start): Set bootstrap_map.l_relocated even
	for already prelinked ld.so.
-rw-r--r--ChangeLog3
-rw-r--r--elf/rtld.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21071e35d2..b71840f9fd 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 9fda5b8122..2c42336f14 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