From 4cfde89657ffccbfb2801986d767964da400c7ec Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Jun 2003 07:39:03 +0000 Subject: Update. 2003-06-16 Ulrich Drepper * 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. --- elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'elf') diff --git a/elf/rtld.c b/elf/rtld.c index 5347a5f..4a086c2 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; -- cgit v1.1