about summary refs log tree commit diff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-16 07:39:03 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-16 07:39:03 +0000
commit4cfde89657ffccbfb2801986d767964da400c7ec (patch)
treece5425783f8c4d8503a6dee2e1c7472e442cc614 /elf/rtld.c
parent553eca268c4d06b0c0c5966b1b8a0b01cd80cc02 (diff)
downloadglibc-4cfde89657ffccbfb2801986d767964da400c7ec.tar.gz
glibc-4cfde89657ffccbfb2801986d767964da400c7ec.tar.xz
glibc-4cfde89657ffccbfb2801986d767964da400c7ec.zip
Update.
2003-06-16  Ulrich Drepper  <drepper@redhat.com>

	* elf/rtld.c (dl_main): Use l_map_start not l_addr in Phdr
	computation so that prelinking wroks.

	* inet/netinet/ip6.h (IP6OPT_PAD1, IP6OPT_PADN): Define.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 5347a5f7b8..4a086c2d32 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -933,8 +933,8 @@ of this helper program; chances are you did not intend to run this program.\n\
 
   /* Set up the program header information for the dynamic linker
      itself.  It is needed in the dl_iterate_phdr() callbacks.  */
-  ElfW(Ehdr) *rtld_ehdr = (ElfW(Ehdr) *) GL(dl_rtld_map.l_addr);
-  GL(dl_rtld_map).l_phdr = (ElfW(Phdr) *) (GL(dl_rtld_map.l_addr)
+  ElfW(Ehdr) *rtld_ehdr = (ElfW(Ehdr) *) GL(dl_rtld_map).l_map_start;
+  GL(dl_rtld_map).l_phdr = (ElfW(Phdr) *) (GL(dl_rtld_map).l_map_start
 					   + rtld_ehdr->e_phoff);
   GL(dl_rtld_map).l_phnum = rtld_ehdr->e_phnum;