[src/trunk]: src Rework ksym defines and includes.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2b19276485b
branches:  trunk
changeset: 338363:d2b19276485b
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 20 04:37:45 2015 +0000

description:
Rework ksym defines and includes.

diffstat:

 lib/libc/gen/nlist_elf32.c           |  7 ++++---
 sys/compat/netbsd32/netbsd32_ioctl.c |  5 +++--
 sys/sys/ksyms.h                      |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (97 lines):

diff -r 5d79303bc5cd -r d2b19276485b lib/libc/gen/nlist_elf32.c
--- a/lib/libc/gen/nlist_elf32.c        Wed May 20 04:09:37 2015 +0000
+++ b/lib/libc/gen/nlist_elf32.c        Wed May 20 04:37:45 2015 +0000
@@ -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 @@
 #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 @@
 #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))
 
diff -r 5d79303bc5cd -r d2b19276485b sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Wed May 20 04:09:37 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Wed May 20 04:37:45 2015 +0000
@@ -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 @@
 #include <sys/envsys.h>
 #include <sys/wdog.h>
 #include <sys/clockctl.h>
+#include <sys/exec_elf.h>
 #include <sys/ksyms.h>
 
 #ifdef __sparc__
diff -r 5d79303bc5cd -r d2b19276485b sys/sys/ksyms.h
--- a/sys/sys/ksyms.h   Wed May 20 04:09:37 2015 +0000
+++ b/sys/sys/ksyms.h   Wed May 20 04:37:45 2015 +0000
@@ -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 (ragge%ludd.luth.se@localhost).
@@ -30,10 +30,8 @@
 #ifndef _SYS_KSYMS_H_
 #define _SYS_KSYMS_H_
 
+#ifdef _KSYMS_PRIVATE
 #include <sys/exec_elf.h>
-
-#ifdef _KSYMS_PRIVATE
-
 #include <sys/queue.h>
 
 struct ksyms_symtab {
@@ -92,12 +90,14 @@
 #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;