Module Name: src Committed By: matt Date: Thu Apr 25 13:45:16 UTC 2013
Modified Files: src/libexec/ld.elf_so: headers.c Log Message: Use phdr as start of phdrs (duh) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/libexec/ld.elf_so/headers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/libexec/ld.elf_so/headers.c diff -u src/libexec/ld.elf_so/headers.c:1.46 src/libexec/ld.elf_so/headers.c:1.47 --- src/libexec/ld.elf_so/headers.c:1.46 Thu Apr 25 13:26:17 2013 +++ src/libexec/ld.elf_so/headers.c Thu Apr 25 13:45:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: headers.c,v 1.46 2013/04/25 13:26:17 matt Exp $ */ +/* $NetBSD: headers.c,v 1.47 2013/04/25 13:45:15 matt Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: headers.c,v 1.46 2013/04/25 13:26:17 matt Exp $"); +__RCSID("$NetBSD: headers.c,v 1.47 2013/04/25 13:45:15 matt Exp $"); #endif /* not lint */ #include <err.h> @@ -373,9 +373,9 @@ _rtld_digest_phdr(const Elf_Phdr *phdr, obj->phdr = (void *)(uintptr_t)ph->p_vaddr; obj->phsize = ph->p_memsz; - obj->relocbase = (caddr_t)((uintptr_t)ph - (uintptr_t)ph->p_vaddr); - dbg(("headers: phdr %p phsize %zu relocbase %lx", obj->phdr, - obj->phsize, (long)obj->relocbase)); + obj->relocbase = (caddr_t)((uintptr_t)phdr - (uintptr_t)ph->p_vaddr); + dbg(("headers: phdr %p (%p) phsize %zu relocbase %lx", + obj->phdr, phdr, obj->phsize, (long)obj->relocbase)); break; }