summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2013-08-03 13:17:05 +0000
committerskrll <skrll@NetBSD.org>2013-08-03 13:17:05 +0000
commit55aa635d1efe3a4c55f13ea4c0a6b60da6571393 (patch)
treeb3eadcf27acaac401a617e4939b862a1a890bcaa /libexec
parent2107df79af1747e1819d7dfa5e741b066739680a (diff)
Fix DEBUG build.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ld.elf_so/debug.h8
-rw-r--r--libexec/ld.elf_so/headers.c14
-rw-r--r--libexec/ld.elf_so/map_object.c9
3 files changed, 16 insertions, 15 deletions
diff --git a/libexec/ld.elf_so/debug.h b/libexec/ld.elf_so/debug.h
index 26e54607d3d..5e78344fb71 100644
--- a/libexec/ld.elf_so/debug.h
+++ b/libexec/ld.elf_so/debug.h
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.h,v 1.6 2013/05/06 08:02:20 skrll Exp $ */
+/* $NetBSD: debug.h,v 1.7 2013/08/03 13:17:05 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -55,4 +55,10 @@ extern int debug;
# define rdbg(a) ((void) 0)
#endif
+#if ELFSIZE == 64
+#define PRImemsz PRIu64
+#else
+#define PRImemsz PRIu32
+#endif
+
#endif
diff --git a/libexec/ld.elf_so/headers.c b/libexec/ld.elf_so/headers.c
index 42241ca1490..6da1695afb6 100644
--- a/libexec/ld.elf_so/headers.c
+++ b/libexec/ld.elf_so/headers.c
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.51 2013/05/06 19:59:29 christos Exp $ */
+/* $NetBSD: headers.c,v 1.52 2013/08/03 13:17:05 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.51 2013/05/06 19:59:29 christos Exp $");
+__RCSID("$NetBSD: headers.c,v 1.52 2013/08/03 13:17:05 skrll Exp $");
#endif /* not lint */
#include <err.h>
@@ -400,7 +400,7 @@ _rtld_digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry)
case PT_INTERP:
obj->interp = (const char *)(uintptr_t)vaddr;
- dbg(("headers: %s %p phsize %zu",
+ dbg(("headers: %s %p phsize %" PRImemsz,
"PT_INTERP", (void *)(uintptr_t)vaddr,
ph->p_memsz));
break;
@@ -417,14 +417,14 @@ _rtld_digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry)
obj->vaddrbase;
}
++nsegs;
- dbg(("headers: %s %p phsize %zu",
+ dbg(("headers: %s %p phsize %" PRImemsz,
"PT_LOAD", (void *)(uintptr_t)vaddr,
ph->p_memsz));
break;
case PT_DYNAMIC:
obj->dynamic = (Elf_Dyn *)(uintptr_t)vaddr;
- dbg(("headers: %s %p phsize %zu",
+ dbg(("headers: %s %p phsize %" PRImemsz,
"PT_DYNAMIC", (void *)(uintptr_t)vaddr,
ph->p_memsz));
break;
@@ -436,7 +436,7 @@ _rtld_digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry)
obj->tlsalign = ph->p_align;
obj->tlsinitsize = ph->p_filesz;
obj->tlsinit = (void *)(uintptr_t)ph->p_vaddr;
- dbg(("headers: %s %p phsize %zu",
+ dbg(("headers: %s %p phsize %" PRImemsz,
"PT_TLS", (void *)(uintptr_t)vaddr,
ph->p_memsz));
break;
@@ -445,7 +445,7 @@ _rtld_digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry)
case PT_ARM_EXIDX:
obj->exidx_start = (void *)(uintptr_t)vaddr;
obj->exidx_sz = ph->p_memsz;
- dbg(("headers: %s %p phsize %zu",
+ dbg(("headers: %s %p phsize %" PRImemsz,
"PT_ARM_EXIDX", (void *)(uintptr_t)vaddr,
ph->p_memsz));
break;
diff --git a/libexec/ld.elf_so/map_object.c b/libexec/ld.elf_so/map_object.c
index 45f9b977e42..425b972982b 100644
--- a/libexec/ld.elf_so/map_object.c
+++ b/libexec/ld.elf_so/map_object.c
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.51 2013/05/09 15:38:14 christos Exp $ */
+/* $NetBSD: map_object.c,v 1.52 2013/08/03 13:17:05 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.51 2013/05/09 15:38:14 christos Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.52 2013/08/03 13:17:05 skrll Exp $");
#endif /* not lint */
#include <errno.h>
@@ -189,11 +189,6 @@ _rtld_map_object(const char *path, int fd, const struct stat *sb)
segs[nsegs] = phdr;
++nsegs;
-#if ELFSIZE == 64
-#define PRImemsz PRIu64
-#else
-#define PRImemsz PRIu32
-#endif
dbg(("%s: %s %p phsize %" PRImemsz, obj->path, "PT_LOAD",
(void *)(uintptr_t)phdr->p_vaddr, phdr->p_memsz));
break;