Module Name: src Committed By: martin Date: Sat Nov 4 12:14:41 UTC 2017
Modified Files: src/sys/kern: subr_kobj.c src/sys/sys: kobj.h Log Message: Make kobj_sym_lookup's result type an Elf_Addr. Fixes the arm builds. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/kern/subr_kobj.c cvs rdiff -u -r1.17 -r1.18 src/sys/sys/kobj.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_kobj.c diff -u src/sys/kern/subr_kobj.c:1.63 src/sys/kern/subr_kobj.c:1.64 --- src/sys/kern/subr_kobj.c:1.63 Fri Nov 3 09:59:07 2017 +++ src/sys/kern/subr_kobj.c Sat Nov 4 12:14:41 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_kobj.c,v 1.63 2017/11/03 09:59:07 maxv Exp $ */ +/* $NetBSD: subr_kobj.c,v 1.64 2017/11/04 12:14:41 martin Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.63 2017/11/03 09:59:07 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.64 2017/11/04 12:14:41 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_modular.h" @@ -874,7 +874,7 @@ kobj_jettison(kobj_t ko) * is known (ie during relocation). */ int -kobj_sym_lookup(kobj_t ko, uintptr_t symidx, uintptr_t *val) +kobj_sym_lookup(kobj_t ko, uintptr_t symidx, Elf_Addr *val) { const Elf_Sym *sym; const char *symbol; Index: src/sys/sys/kobj.h diff -u src/sys/sys/kobj.h:1.17 src/sys/sys/kobj.h:1.18 --- src/sys/sys/kobj.h:1.17 Fri Nov 3 09:59:07 2017 +++ src/sys/sys/kobj.h Sat Nov 4 12:14:41 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: kobj.h,v 1.17 2017/11/03 09:59:07 maxv Exp $ */ +/* $NetBSD: kobj.h,v 1.18 2017/11/04 12:14:41 martin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ int kobj_stat(kobj_t, vaddr_t *, size_t int kobj_find_section(kobj_t, const char *, void **, size_t *); /* MI-MD interface. */ -int kobj_sym_lookup(kobj_t, uintptr_t, uintptr_t *); +int kobj_sym_lookup(kobj_t, uintptr_t, Elf_Addr *); int kobj_reloc(kobj_t, uintptr_t, const void *, bool, bool); int kobj_machdep(kobj_t, void *, size_t, bool);