Module Name: src
Committed By: matt
Date: Wed May 20 04:37:45 UTC 2015
Modified Files:
src/lib/libc/gen: nlist_elf32.c
src/sys/compat/netbsd32: netbsd32_ioctl.c
src/sys/sys: ksyms.h
Log Message:
Rework ksym defines and includes.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/gen/nlist_elf32.c
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.31 -r1.32 src/sys/sys/ksyms.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/nlist_elf32.c
diff -u src/lib/libc/gen/nlist_elf32.c:1.37 src/lib/libc/gen/nlist_elf32.c:1.38
--- src/lib/libc/gen/nlist_elf32.c:1.37 Wed May 20 02:45:20 2015
+++ src/lib/libc/gen/nlist_elf32.c Wed May 20 04:37:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_elf32.c,v 1.37 2015/05/20 02:45:20 matt Exp $ */
+/* $NetBSD: nlist_elf32.c,v 1.38 2015/05/20 04:37:45 matt Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_elf32.c,v 1.37 2015/05/20 02:45:20 matt Exp $");
+__RCSID("$NetBSD: nlist_elf32.c,v 1.38 2015/05/20 04:37:45 matt Exp $");
#endif /* LIBC_SCCS and not lint */
/* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@@ -50,7 +50,6 @@ __RCSID("$NetBSD: nlist_elf32.c,v 1.37 2
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/ioctl.h>
-#include <sys/ksyms.h>
#include <assert.h>
#include <errno.h>
@@ -64,6 +63,8 @@ __RCSID("$NetBSD: nlist_elf32.c,v 1.37 2
#include <sys/exec_elf.h>
#endif
+#include <sys/ksyms.h> /* after sys/exec_elf.h */
+
#if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
(defined(NLIST_ELF64) && (ELFSIZE == 64))
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.71 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.72
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.71 Wed May 20 02:45:20 2015
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Wed May 20 04:37:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.71 2015/05/20 02:45:20 matt Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.72 2015/05/20 04:37:45 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.71 2015/05/20 02:45:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.72 2015/05/20 04:37:45 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ioc
#include <sys/envsys.h>
#include <sys/wdog.h>
#include <sys/clockctl.h>
+#include <sys/exec_elf.h>
#include <sys/ksyms.h>
#ifdef __sparc__
Index: src/sys/sys/ksyms.h
diff -u src/sys/sys/ksyms.h:1.31 src/sys/sys/ksyms.h:1.32
--- src/sys/sys/ksyms.h:1.31 Wed May 20 02:45:20 2015
+++ src/sys/sys/ksyms.h Wed May 20 04:37:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ksyms.h,v 1.31 2015/05/20 02:45:20 matt Exp $ */
+/* $NetBSD: ksyms.h,v 1.32 2015/05/20 04:37:45 matt Exp $ */
/*
* Copyright (c) 2001, 2003 Anders Magnusson ([email protected]).
@@ -30,10 +30,8 @@
#ifndef _SYS_KSYMS_H_
#define _SYS_KSYMS_H_
-#include <sys/exec_elf.h>
-
#ifdef _KSYMS_PRIVATE
-
+#include <sys/exec_elf.h>
#include <sys/queue.h>
struct ksyms_symtab {
@@ -92,12 +90,14 @@ struct ksyms_ogsymbol {
#define kg_value _un.ku_value
};
+#ifdef ELFSIZE
struct ksyms_gsymbol {
const char *kg_name;
union {
Elf_Sym ku_sym;
} _un;
};
+#endif
struct ksyms_gvalue {
const char *kv_name;
