Module Name: src Committed By: bouyer Date: Sun Mar 18 14:06:13 UTC 2012
Modified Files: src/libexec/ld.elf_so [netbsd-5]: headers.c Log Message: Apply patch, requested by skrll in ticket 1724: libexec/ld.elf_so/headers.c 1.37 via patch Add cast so that usr.bin/ldd/elf32 builds. To generate a diff of this commit: cvs rdiff -u -r1.26.10.2 -r1.26.10.3 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.26.10.2 src/libexec/ld.elf_so/headers.c:1.26.10.3 --- src/libexec/ld.elf_so/headers.c:1.26.10.2 Sat Mar 17 18:28:33 2012 +++ src/libexec/ld.elf_so/headers.c Sun Mar 18 14:06:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: headers.c,v 1.26.10.2 2012/03/17 18:28:33 bouyer Exp $ */ +/* $NetBSD: headers.c,v 1.26.10.3 2012/03/18 14:06:13 bouyer Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: headers.c,v 1.26.10.2 2012/03/17 18:28:33 bouyer Exp $"); +__RCSID("$NetBSD: headers.c,v 1.26.10.3 2012/03/18 14:06:13 bouyer Exp $"); #endif /* not lint */ #include <err.h> @@ -309,7 +309,7 @@ _rtld_digest_phdr(const Elf_Phdr *phdr, 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: