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 Remove a debug assert that does not hold f...



details:   https://anonhg.NetBSD.org/src/rev/16d10570232f
branches:  trunk
changeset: 780370:16d10570232f
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jul 22 09:16:35 2012 +0000

description:
Remove a debug assert that does not hold for PIE (e.g. phdr = 0x40, but
obj has not been mapped at 0, so obj->phdr is 0x100040).
OK: skrll

diffstat:

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

diffs (26 lines):

diff -r 063444c36373 -r 16d10570232f libexec/ld.elf_so/headers.c
--- a/libexec/ld.elf_so/headers.c       Sun Jul 22 00:53:18 2012 +0000
+++ b/libexec/ld.elf_so/headers.c       Sun Jul 22 09:16:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: headers.c,v 1.41 2011/06/25 05:45:12 nonaka Exp $       */
+/*     $NetBSD: headers.c,v 1.42 2012/07/22 09:16:35 martin Exp $       */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.41 2011/06/25 05:45:12 nonaka Exp $");
+__RCSID("$NetBSD: headers.c,v 1.42 2012/07/22 09:16:35 martin Exp $");
 #endif /* not lint */
 
 #include <err.h>
@@ -356,7 +356,6 @@
                    obj->phsize, (long)obj->relocbase));
                break;
        }
-       assert(obj->phdr == phdr);
        
        for (ph = phdr; ph < phlimit; ++ph) {
                vaddr = (Elf_Addr)(uintptr_t)(obj->relocbase + ph->p_vaddr);



Home | Main Index | Thread Index | Old Index