Module Name: src
Committed By: skrll
Date: Sat Oct 16 17:48:13 UTC 2010
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
Add cast so that usr.bin/ldd/elf32 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 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.36 src/libexec/ld.elf_so/headers.c:1.37
--- src/libexec/ld.elf_so/headers.c:1.36 Sat Oct 16 10:27:07 2010
+++ src/libexec/ld.elf_so/headers.c Sat Oct 16 17:48:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.36 2010/10/16 10:27:07 skrll Exp $ */
+/* $NetBSD: headers.c,v 1.37 2010/10/16 17:48:12 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.36 2010/10/16 10:27:07 skrll Exp $");
+__RCSID("$NetBSD: headers.c,v 1.37 2010/10/16 17:48:12 skrll Exp $");
#endif /* not lint */
#include <err.h>
@@ -325,7 +325,7 @@
assert(obj->phdr == phdr);
for (ph = phdr; ph < phlimit; ++ph) {
- vaddr = (Elf_Addr)obj->relocbase + ph->p_vaddr;
+ vaddr = (Elf_Addr)(uintptr_t)(obj->relocbase + ph->p_vaddr);
switch (ph->p_type) {
case PT_INTERP:
