about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-12 10:12:33 +0000
committerRoland McGrath <roland@gnu.org>2002-09-12 10:12:33 +0000
commit65da9563c76080002eb5018b4666220e15c9d70d (patch)
treeaa4e195abac749dd64c5b12ed8dd040e689dc51c /elf
parent75aafc716bfcf989abc986c68d506e8a4f991ade (diff)
downloadglibc-65da9563c76080002eb5018b4666220e15c9d70d.tar.gz
glibc-65da9563c76080002eb5018b4666220e15c9d70d.tar.xz
glibc-65da9563c76080002eb5018b4666220e15c9d70d.zip
* elf/rtld.c (_dl_start_final): Move _begin, _end decls outside the fn.
	(_dl_start) [DONT_USE_BOOTSTRAP_MAP]: Use &_begin instead of l_addr to
	find the ELF header.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 22aa48543a..ea9cee1d7e 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -150,6 +150,11 @@ static ElfW(Addr) _dl_start_final (void *arg,
 				   struct link_map *bootstrap_map_p);
 #endif
 
+/* These defined magically in the linker script.  */
+extern char _begin[] attribute_hidden;
+extern char _end[] attribute_hidden;
+
+
 #ifdef RTLD_START
 RTLD_START
 #else
@@ -180,8 +185,6 @@ _dl_start_final (void *arg, struct link_map *bootstrap_map_p)
 #endif
 {
   ElfW(Addr) start_addr;
-  extern char _begin[] attribute_hidden;
-  extern char _end[] attribute_hidden;
 
   if (HP_TIMING_AVAIL)
     {
@@ -313,9 +316,17 @@ _dl_start (void *arg)
   bootstrap_map.l_tls_modid = 0;
 # endif
 
-  /* Get the dynamic linkers program header.  */
+  /* Get the dynamic linker's own program header.  First we need the ELF
+     file header.  The `_begin' symbol created by the linker script points
+     to it.  When we have something like GOTOFF relocs, we can use a plain
+     reference to find the runtime address.  Without that, we have to rely
+     on the `l_addr' value, which is not the value we want when prelinked.  */
+#ifdef DONT_USE_BOOTSTRAP_MAP
+  ehdr = (ElfW(Ehdr) *) &_begin;
+#else
   ehdr = (ElfW(Ehdr) *) bootstrap_map.l_addr;
-  phdr = (ElfW(Phdr) *) (bootstrap_map.l_addr + ehdr->e_phoff);
+#endif
+  phdr = (ElfW(Phdr) *) ((ElfW(Addr)) ehdr + ehdr->e_phoff);
   for (cnt = 0; cnt < ehdr->e_phnum; ++cnt)
     if (phdr[cnt].p_type == PT_TLS)
       {