Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so Use phdr as start of phdrs (duh)



details:   https://anonhg.NetBSD.org/src/rev/69d2b7f672ed
branches:  trunk
changeset: 786295:69d2b7f672ed
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Apr 25 13:45:15 2013 +0000

description:
Use phdr as start of phdrs (duh)

diffstat:

 libexec/ld.elf_so/headers.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 35f6bdada18a -r 69d2b7f672ed libexec/ld.elf_so/headers.c
--- a/libexec/ld.elf_so/headers.c       Thu Apr 25 13:34:10 2013 +0000
+++ b/libexec/ld.elf_so/headers.c       Thu Apr 25 13:45:15 2013 +0000
@@ -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 @@
                
                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;
        }
        



Home | Main Index | Thread Index | Old Index