[src/trunk]: src/sys Define SYMTAB_SPACE in opt_ksyms.h, not opt_ddbparam.h. ...

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

details:   https://anonhg.NetBSD.org/src/rev/b0f32c6b85d3
branches:  trunk
changeset: 767729:b0f32c6b85d3
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Jul 28 13:42:16 2011 +0000

description:
Define SYMTAB_SPACE in opt_ksyms.h, not opt_ddbparam.h.  Ensure
that ddb(4) code is independent of SYMTAB_SPACE value.

diffstat:

 sys/conf/Makefile.kern.inc |  6 +++---
 sys/conf/files             |  3 ++-
 sys/ddb/files.ddb          |  4 ++--
 sys/kern/kern_ksyms.c      |  6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r 3e68ad59d77c -r b0f32c6b85d3 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Jul 28 12:55:35 2011 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Jul 28 13:42:16 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.142 2011/07/07 08:47:22 mrg Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.143 2011/07/28 13:42:16 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -247,7 +247,7 @@
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gdb@}
 CTFFLAGS+=     -g
 SYSTEM_LD_TAIL+=; \
-       if grep '^\#define.*SYMTAB_SPACE' opt_ddbparam.h > /dev/null; then \
+       if grep '^\#define.*SYMTAB_SPACE' opt_ksyms.h > /dev/null; then \
                echo "${DBSYM} $@.gdb"; \
                ${DBSYM} $@.gdb || (rm -f $@ ; exit 1) || exit 1; \
        fi
@@ -257,7 +257,7 @@
 .endif
 
 SYSTEM_LD_TAIL+=; \
-       if grep '^\#define.*SYMTAB_SPACE' opt_ddbparam.h > /dev/null; then \
+       if grep '^\#define.*SYMTAB_SPACE' opt_ksyms.h > /dev/null; then \
                echo "${DBSYM} $@"; \
                ${DBSYM} $@ || (rm -f $@ ; exit 1) || exit 1; \
        fi
diff -r 3e68ad59d77c -r b0f32c6b85d3 sys/conf/files
--- a/sys/conf/files    Thu Jul 28 12:55:35 2011 +0000
+++ b/sys/conf/files    Thu Jul 28 13:42:16 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1020 2011/07/15 19:19:56 cliff Exp $
+#      $NetBSD: files,v 1.1021 2011/07/28 13:42:16 uebayasi Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20100430
@@ -1280,6 +1280,7 @@
 defpseudo pty:         tty
 defpseudo rnd
 defpseudo ksyms
+defparam opt_ksyms.h   SYMTAB_SPACE
 defpseudo nullcons
 defpseudo lockstat
 defpseudo bio:         sysmon_envsys
diff -r 3e68ad59d77c -r b0f32c6b85d3 sys/ddb/files.ddb
--- a/sys/ddb/files.ddb Thu Jul 28 12:55:35 2011 +0000
+++ b/sys/ddb/files.ddb Thu Jul 28 13:42:16 2011 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: files.ddb,v 1.6 2011/04/11 04:22:32 mrg Exp $
+#      $NetBSD: files.ddb,v 1.7 2011/07/28 13:42:16 uebayasi Exp $
 
 #
 # DDB options
 #
 defflag opt_ddb.h              DDB DDB_VERBOSE_HELP
 defparam opt_ddbparam.h                DDB_FROMCONSOLE DDB_ONPANIC DDB_HISTORY_SIZE
-                               DDB_BREAK_CHAR DDB_KEYCODE SYMTAB_SPACE
+                               DDB_BREAK_CHAR DDB_KEYCODE
                                DDB_COMMANDONENTER 
 
 file   ddb/db_access.c                 ddb | kgdb
diff -r 3e68ad59d77c -r b0f32c6b85d3 sys/kern/kern_ksyms.c
--- a/sys/kern/kern_ksyms.c     Thu Jul 28 12:55:35 2011 +0000
+++ b/sys/kern/kern_ksyms.c     Thu Jul 28 13:42:16 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_ksyms.c,v 1.64 2011/07/27 14:35:34 uebayasi Exp $ */
+/*     $NetBSD: kern_ksyms.c,v 1.65 2011/07/28 13:42:16 uebayasi Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -71,12 +71,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.64 2011/07/27 14:35:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.65 2011/07/28 13:42:16 uebayasi Exp $");
 
 #if defined(_KERNEL) && defined(_KERNEL_OPT)
 #include "opt_ddb.h"
-#include "opt_ddbparam.h"      /* for SYMTAB_SPACE */
 #include "opt_dtrace.h"
+#include "opt_ksyms.h"
 #endif
 
 #define _KSYMS_PRIVATE