summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-02-12 10:01:55 +0000
committerJakub Jelinek <jakub@redhat.com>2005-02-12 10:01:55 +0000
commit231d429bea9a9e68fb58e3c5d7585ed31e4c1901 (patch)
treeaab71e9b19e276969264e11d28be6231a3fa711e
parent8a581cc8cf94f76ce9ad9f45c63eee94b40f8052 (diff)
* elf/rtld.c (dlmain): If LD_TRACE_PRELINKING, clear l_relocated flag
before relocating ld.so again.
-rw-r--r--ChangeLog5
-rw-r--r--elf/rtld.c11
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index be37c4732a..b762bd97c1 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 2c42336f14..b72216ba96 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)
{