Module Name: src
Committed By: uebayasi
Date: Sun Aug 30 01:46:03 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
src/sys/arch/mac68k/mac68k: machdep.c
src/sys/conf: Makefile.kern.inc files
src/sys/kern: kern_ksyms.c kern_ksyms_buf.c
Log Message:
Use makeoptions_COPY_SYMTAB via opt_copy_symtab.h in sources. Remove a hack
to set -DCOPY_SYMTAB from sys/conf/Makefile.kern.inc. Remove unnecessary
dependencies too.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.348 -r1.349 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.210 -r1.211 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1139 -r1.1140 src/sys/conf/files
cvs rdiff -u -r1.80 -r1.81 src/sys/kern/kern_ksyms.c
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/kern_ksyms_buf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.77 src/sys/arch/amd64/amd64/locore.S:1.78
--- src/sys/arch/amd64/amd64/locore.S:1.77 Sun Aug 17 21:17:43 2014
+++ src/sys/arch/amd64/amd64/locore.S Sun Aug 30 01:46:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.77 2014/08/17 21:17:43 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.78 2015/08/30 01:46:02 uebayasi Exp $ */
/*
* Copyright-o-rama!
@@ -153,6 +153,7 @@
#include <machine/asm.h>
+#include "opt_copy_symtab.h"
#include "opt_ddb.h"
#include "opt_ddbparam.h"
#include "opt_modular.h"
@@ -520,7 +521,7 @@ ENTRY(start)
/* Find end of kernel image. */
movl $RELOC(end),%edi
-#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(COPY_SYMTAB)
+#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB)
/* Save the symbols (if loaded). */
movl RELOC(esym),%eax
testl %eax,%eax
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.113 src/sys/arch/i386/i386/locore.S:1.114
--- src/sys/arch/i386/i386/locore.S:1.113 Sun Aug 17 21:17:43 2014
+++ src/sys/arch/i386/i386/locore.S Sun Aug 30 01:46:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.113 2014/08/17 21:17:43 joerg Exp $ */
+/* $NetBSD: locore.S,v 1.114 2015/08/30 01:46:03 uebayasi Exp $ */
/*
* Copyright-o-rama!
@@ -129,9 +129,10 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.113 2014/08/17 21:17:43 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.114 2015/08/30 01:46:03 uebayasi Exp $");
#include "opt_compat_oldboot.h"
+#include "opt_copy_symtab.h"
#include "opt_ddb.h"
#include "opt_modular.h"
#include "opt_multiboot.h"
@@ -184,7 +185,7 @@ __KERNEL_RCSID(0, "$NetBSD: locore.S,v 1
.ascii ",PAE=yes[extended-cr3]"
#endif
.ascii ",LOADER=generic"
-#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(COPY_SYMTAB)
+#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB)
.ascii ",BSD_SYMTAB=yes"
#endif
.byte 0
@@ -544,7 +545,7 @@ try586: /* Use the `cpuid' instruction.
/* Find end of kernel image. */
movl $RELOC(end),%edi
-#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(COPY_SYMTAB)
+#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(makeoptions_COPY_SYMTAB)
/* Save the symbols (if loaded). */
movl RELOC(esym),%eax
testl %eax,%eax
Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.348 src/sys/arch/mac68k/mac68k/machdep.c:1.349
--- src/sys/arch/mac68k/mac68k/machdep.c:1.348 Sun Aug 17 21:17:44 2014
+++ src/sys/arch/mac68k/mac68k/machdep.c Sun Aug 30 01:46:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.348 2014/08/17 21:17:44 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.349 2015/08/30 01:46:03 uebayasi Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,9 +74,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.348 2014/08/17 21:17:44 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.349 2015/08/30 01:46:03 uebayasi Exp $");
#include "opt_adb.h"
+#include "opt_copy_symtab.h"
#include "opt_ddb.h"
#include "opt_ddbparam.h"
#include "opt_kgdb.h"
@@ -961,7 +962,7 @@ getenvvars(u_long flag, char *buf)
* Get end of symbols for kernel debugging
*/
esym = (int *)getenv("END_SYM");
-#ifndef COPY_SYMTAB
+#ifndef makeoptions_COPY_SYMTAB
if (esym == (int *)0)
#endif
esym = (int *)&end;
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.210 src/sys/conf/Makefile.kern.inc:1.211
--- src/sys/conf/Makefile.kern.inc:1.210 Sat Aug 29 16:27:07 2015
+++ src/sys/conf/Makefile.kern.inc Sun Aug 30 01:46:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.210 2015/08/29 16:27:07 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.211 2015/08/30 01:46:02 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -494,15 +494,6 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
-locore.o machdep.o kern_ksyms.o: Makefile
-
-.if defined(COPY_SYMTAB)
-CPPFLAGS.locore.S+= -DCOPY_SYMTAB
-CPPFLAGS.machdep.c+= -DCOPY_SYMTAB
-CPPFLAGS.kern_ksyms.c+= -DCOPY_SYMTAB
-CPPFLAGS.kern_ksyms_buf.c+= -DCOPY_SYMTAB
-.endif
-
.if !defined(COPY_SYMTAB)
build_kernel: .USE
${SYSTEM_LD_HEAD}
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1139 src/sys/conf/files:1.1140
--- src/sys/conf/files:1.1139 Sat Aug 29 14:07:45 2015
+++ src/sys/conf/files Sun Aug 30 01:46:02 2015
@@ -1,7 +1,7 @@
-# $NetBSD: files,v 1.1139 2015/08/29 14:07:45 uebayasi Exp $
+# $NetBSD: files,v 1.1140 2015/08/30 01:46:02 uebayasi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
-version 20150830
+version 20150831
#
# device classes
@@ -29,6 +29,8 @@ defflag opt_modular.h MODULAR_DEFAULT_A
defflag KEYLOCK
defparam opt_syslimits.h CHILD_MAX OPEN_MAX
+defparam opt_copy_symtab.h makeoptions_COPY_SYMTAB
+
defparam DEFCORENAME
defparam HZ
defparam MAXUPRC
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.80 src/sys/kern/kern_ksyms.c:1.81
--- src/sys/kern/kern_ksyms.c:1.80 Thu Aug 27 02:43:20 2015
+++ src/sys/kern/kern_ksyms.c Sun Aug 30 01:46:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.80 2015/08/27 02:43:20 uebayasi Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.81 2015/08/30 01:46:02 uebayasi Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -73,9 +73,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.80 2015/08/27 02:43:20 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.81 2015/08/30 01:46:02 uebayasi Exp $");
#if defined(_KERNEL) && defined(_KERNEL_OPT)
+#include "opt_copy_symtab.h"
#include "opt_ddb.h"
#include "opt_dtrace.h"
#endif
@@ -127,7 +128,7 @@ static int ksyms_debug;
#define SYMTAB_FILLER "|This is the symbol table!"
-#ifdef COPY_SYMTAB
+#ifdef makeoptions_COPY_SYMTAB
extern char db_symtab[];
extern int db_symtabsize;
#endif
@@ -231,7 +232,7 @@ void
ksyms_init(void)
{
-#ifdef COPY_SYMTAB
+#ifdef makeoptions_COPY_SYMTAB
if (!ksyms_loaded &&
strncmp(db_symtab, SYMTAB_FILLER, sizeof(SYMTAB_FILLER))) {
ksyms_addsyms_elf(db_symtabsize, db_symtab,
Index: src/sys/kern/kern_ksyms_buf.c
diff -u src/sys/kern/kern_ksyms_buf.c:1.3 src/sys/kern/kern_ksyms_buf.c:1.4
--- src/sys/kern/kern_ksyms_buf.c:1.3 Fri May 8 09:43:41 2015
+++ src/sys/kern/kern_ksyms_buf.c Sun Aug 30 01:46:02 2015
@@ -1,6 +1,12 @@
+/* $NetBSD: kern_ksyms_buf.c,v 1.4 2015/08/30 01:46:02 uebayasi Exp $ */
+
+#if defined(_KERNEL_OPT)
+#include "opt_copy_symtab.h"
+#endif
+
#define SYMTAB_FILLER "|This is the symbol table!"
-#ifdef COPY_SYMTAB
+#ifdef makeoptions_COPY_SYMTAB
#ifndef SYMTAB_SPACE
char db_symtab[] = SYMTAB_FILLER;
#else
