Module Name: src
Committed By: martin
Date: Sun Jul 22 09:16:36 UTC 2012
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 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.41 src/libexec/ld.elf_so/headers.c:1.42
--- src/libexec/ld.elf_so/headers.c:1.41 Sat Jun 25 05:45:12 2011
+++ src/libexec/ld.elf_so/headers.c Sun Jul 22 09:16:35 2012
@@ -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 @@ _rtld_digest_phdr(const Elf_Phdr *phdr,
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);
