CVS commit: src

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Sun Aug 17 21:17:44 UTC 2014

Modified Files:
        src/sys/arch/aarch64/conf: Makefile.aarch64
        src/sys/arch/acorn32/conf: EB7500ATX
        src/sys/arch/algor/conf: P4032 P5064 P5064-64 P6032
        src/sys/arch/amd64/amd64: locore.S
        src/sys/arch/arm/conf: Makefile.arm
        src/sys/arch/cats/conf: GENERIC
        src/sys/arch/dreamcast/conf: GENERIC
        src/sys/arch/epoc32/conf: GENERIC
        src/sys/arch/evbarm/conf: ADI_BRH ARMADAXP ARMADILLO210 ARMADILLO9
            BCM5301X BCM56340 BEAGLEBOARD BEAGLEBOARDXM BEAGLEBONE CP3100
            CUBIEBOARD DNS323 GEMINI GEMINI_MASTER GEMINI_SLAVE GOLDENGATE
            GUMSTIX HAWK HDL_G HPT5325 IGEPV2 IMX23_OLINUXINO IMX31LITE
            INTEGRATOR INTEGRATOR_CP IQ31244 IQ80310 IQ80321 IXDP425 IXM1200
            KUROBOX_PRO LUBBOCK MMNET_GENERIC MPCSA_GENERIC MV2120 N900 NAPPI
            NSLU2 ODROID ODROID-U OMAP5EVM OPENBLOCKS_A6 OPENBLOCKS_AX3 OSK5912
            OVERO PANDABOARD RPI SHEEVAPLUG TEAMASA_NPWR TEAMASA_NPWR_FC
            TISDP2420 TISDP2430 TS7200 TWINTAIL VIPER ZAO425
        src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB ALCHEMY AP30
            CPMBR1400 DB120 GDIUM64 MALTA MALTA64 MERAKI RB153 RB433UAH
            WGT624V3 XLSATX ZYXELKX
        src/sys/arch/evbppc/conf: EV64260 EXPLORA451 MPC8536DS MPC8548CDS
            OPENBLOCKS200 OPENBLOCKS266 OPENBLOCKS600 P2020DS P2020RDB PMPPC
            RB800 TWRP1025 VIRTEX_DFC VIRTEX_GSRD1 VIRTEX_GSRD2 WALNUT
        src/sys/arch/evbsh3/conf: AP_MS104_SH4 T_SH7706LAN T_SH7706LSR
        src/sys/arch/i386/i386: locore.S
        src/sys/arch/iyonix/conf: GENERIC
        src/sys/arch/luna68k/conf: GENERIC INSTALL
        src/sys/arch/mac68k/mac68k: machdep.c
        src/sys/arch/netwinder/conf: GENERIC
        src/sys/arch/sbmips/conf: GENERIC GENERIC.MP GENERIC64 GENERIC64.MP
        src/sys/arch/shark/conf: GENERIC
        src/sys/arch/usermode/conf: GENERIC.common
        src/sys/arch/zaurus/conf: GENERIC INSTALL
        src/sys/conf: Makefile.kern.inc files
        src/sys/kern: kern_ksyms.c
        src/usr.bin/config: mkmakefile.c
Added Files:
        src/sys/kern: kern_ksyms_buf.c

Log Message:
Reorganize symbol table embedding.  The existing option SYMTAB_SPACE is
replaced by the make option COPY_SYMTAB set to any value. The copy of
the symbol table is no longer put into a buffer in kern_ksyms.o, but a
small helper object. This object is build first with a dummy size, then
the kernel is linked to compute the real dimension of the symbol table
buffer. After that, the helper object is rebuild and the kernel linked
again.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/conf/P5064-64
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/algor/conf/P6032
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/conf/Makefile.arm
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/conf/ADI_BRH \
    src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/ARMADAXP
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/ARMADILLO210
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/conf/ARMADILLO9 \
    src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/BCM5301X
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/BCM56340 \
    src/sys/arch/evbarm/conf/OMAP5EVM
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/conf/BEAGLEBOARD \
    src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/BEAGLEBOARDXM
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/BEAGLEBONE \
    src/sys/arch/evbarm/conf/OSK5912
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/CP3100 \
    src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/DNS323 \
    src/sys/arch/evbarm/conf/IMX23_OLINUXINO \
    src/sys/arch/evbarm/conf/KUROBOX_PRO src/sys/arch/evbarm/conf/ODROID
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/GEMINI \
    src/sys/arch/evbarm/conf/GEMINI_MASTER \
    src/sys/arch/evbarm/conf/GEMINI_SLAVE
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/GOLDENGATE
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/evbarm/conf/GUMSTIX \
    src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/HAWK
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/HDL_G \
    src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/HPT5325 \
    src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/IGEPV2
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/IMX31LITE
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/conf/INTEGRATOR
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/INTEGRATOR_CP
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/evbarm/conf/IQ80310
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/IXDP425 \
    src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/IXM1200
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/MMNET_GENERIC \
    src/sys/arch/evbarm/conf/N900
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/NAPPI
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/NSLU2
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/ODROID-U \
    src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/OVERO
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/PANDABOARD
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/TISDP2420 \
    src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/VIPER
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbmips/conf/ADM5120 \
    src/sys/arch/evbmips/conf/CPMBR1400
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/conf/ADM5120-NB \
    src/sys/arch/evbmips/conf/ADM5120-USB
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbmips/conf/ALCHEMY
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbmips/conf/AP30
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/conf/DB120
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/GDIUM64
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/conf/MALTA64
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbmips/conf/MERAKI
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbmips/conf/RB153
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/conf/RB433UAH
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbmips/conf/WGT624V3
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/conf/XLSATX
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/ZYXELKX
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbppc/conf/EV64260
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbppc/conf/EXPLORA451
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbppc/conf/MPC8536DS
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbppc/conf/MPC8548CDS
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbppc/conf/OPENBLOCKS200
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbppc/conf/OPENBLOCKS266
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/OPENBLOCKS600
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/conf/P2020DS \
    src/sys/arch/evbppc/conf/VIRTEX_GSRD1
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/conf/P2020RDB \
    src/sys/arch/evbppc/conf/VIRTEX_GSRD2
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbppc/conf/RB800
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/conf/TWRP1025
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/conf/VIRTEX_DFC
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/evbppc/conf/WALNUT
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbsh3/conf/AP_MS104_SH4
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbsh3/conf/T_SH7706LAN
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbsh3/conf/T_SH7706LSR
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/luna68k/conf/INSTALL
cvs rdiff -u -r1.347 -r1.348 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sbmips/conf/GENERIC
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sbmips/conf/GENERIC.MP \
    src/sys/arch/sbmips/conf/GENERIC64 src/sys/arch/sbmips/conf/GENERIC64.MP
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.169 -r1.170 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1097 -r1.1098 src/sys/conf/files
cvs rdiff -u -r1.72 -r1.73 src/sys/kern/kern_ksyms.c
cvs rdiff -u -r0 -r1.1 src/sys/kern/kern_ksyms_buf.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/config/mkmakefile.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/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.2 src/sys/arch/aarch64/conf/Makefile.aarch64:1.3
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.2	Thu Aug 14 18:39:39 2014
+++ src/sys/arch/aarch64/conf/Makefile.aarch64	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.aarch64,v 1.2 2014/08/14 18:39:39 joerg Exp $
+#	$NetBSD: Makefile.aarch64,v 1.3 2014/08/17 21:17:43 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -68,8 +68,7 @@ LINKFLAGS_NORMAL+=	-T ${LDSCRIPT}
 # Strip AArch64 mapping symbols from the kernel image, as they interfere
 # with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified.
 .if !defined(DEBUG) || empty(DEBUG:M-g*)
-SYSTEM_LD_TAIL?=	${SYSTEM_LD_TAIL_DBSYM}; \
-			${OBJCOPY} -w --strip-symbol='[$$][dx]'	\
+SYSTEM_LD_TAIL?=	${OBJCOPY} -w --strip-symbol='[$$][dx]'	\
 				   --strip-symbol='[$$][dx]\.*' $@ ;\
 			${SIZE} $@; chmod 755 $@
 .else

Index: src/sys/arch/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.55 src/sys/arch/acorn32/conf/EB7500ATX:1.56
--- src/sys/arch/acorn32/conf/EB7500ATX:1.55	Sun Jun 30 21:38:55 2013
+++ src/sys/arch/acorn32/conf/EB7500ATX	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: EB7500ATX,v 1.55 2013/06/30 21:38:55 rmind Exp $
+#	$NetBSD: EB7500ATX,v 1.56 2014/08/17 21:17:43 joerg Exp $
 #
 #	EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"EB7500ATX-$Revision: 1.55 $"
+#ident		"EB7500ATX-$Revision: 1.56 $"
 
 # estimated number of users
 maxusers	32
@@ -135,7 +135,7 @@ options 	KMEMSTATS	# kernel memory stati
 options 	USERCONF	# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 #options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
-options		SYMTAB_SPACE=275000
+makeoptions	COPY_SYMTAB=1
 
 # Enable experimental buffer queue strategy for better responsiveness under 
 # high disk I/O load. Use it with caution - it's not proven to be stable yet.

Index: src/sys/arch/algor/conf/P4032
diff -u src/sys/arch/algor/conf/P4032:1.70 src/sys/arch/algor/conf/P4032:1.71
--- src/sys/arch/algor/conf/P4032:1.70	Sun Jul 20 10:06:10 2014
+++ src/sys/arch/algor/conf/P4032	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: P4032,v 1.70 2014/07/20 10:06:10 alnsn Exp $
+#	$NetBSD: P4032,v 1.71 2014/08/17 21:17:43 joerg Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P4032-$Revision: 1.70 $"
+#ident 		"P4032-$Revision: 1.71 $"
 
 maxusers 32
 
@@ -30,7 +30,7 @@ options 	DIAGNOSTIC		# Cheap kernel cons
 options 	DDB			# kernel debugger
 makeoptions	DEBUG="-g"
 #makeoptions	DEBUGLIST="pattern1 pattern2 ..."
-options 	SYMTAB_SPACE=425000
+makeoptions	COPY_SYMTAB=1
 
 # File systems
 file-system	FFS		# Fast file system

Index: src/sys/arch/algor/conf/P5064
diff -u src/sys/arch/algor/conf/P5064:1.80 src/sys/arch/algor/conf/P5064:1.81
--- src/sys/arch/algor/conf/P5064:1.80	Sun Jul 20 10:06:10 2014
+++ src/sys/arch/algor/conf/P5064	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: P5064,v 1.80 2014/07/20 10:06:10 alnsn Exp $
+#	$NetBSD: P5064,v 1.81 2014/08/17 21:17:43 joerg Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P5064-$Revision: 1.80 $"
+#ident 		"P5064-$Revision: 1.81 $"
 
 maxusers 32
 
@@ -25,7 +25,7 @@ options 	DIAGNOSTIC		# Cheap kernel cons
 options 	DDB			# kernel debugger
 makeoptions	DEBUG="-g"
 #makeoptions	DEBUGLIST="pattern1 pattern2 ..."
-options 	SYMTAB_SPACE=485000
+makeoptions	COPY_SYMTAB=1
 
 # File systems
 file-system	FFS		# Fast file system

Index: src/sys/arch/algor/conf/P5064-64
diff -u src/sys/arch/algor/conf/P5064-64:1.4 src/sys/arch/algor/conf/P5064-64:1.5
--- src/sys/arch/algor/conf/P5064-64:1.4	Sun Feb  5 19:30:42 2012
+++ src/sys/arch/algor/conf/P5064-64	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: P5064-64,v 1.4 2012/02/05 19:30:42 matt Exp $
+#	$NetBSD: P5064-64,v 1.5 2014/08/17 21:17:43 joerg Exp $
 #
 # Algorithmics P-5064 kernel (64-bit).
 #
@@ -7,6 +7,6 @@ include	"arch/algor/conf/P5064"
 
 include	"arch/algor/conf/std.algor64"
 
-no options	SYMTAB_SPACE
-options 	SYMTAB_SPACE=620000
-#ident 		"P5064-64-$Revision: 1.4 $"
+no makeoptions	COPY_SYMTAB
+makeoptions	COPY_SYMTAB=1
+#ident 		"P5064-64-$Revision: 1.5 $"

Index: src/sys/arch/algor/conf/P6032
diff -u src/sys/arch/algor/conf/P6032:1.71 src/sys/arch/algor/conf/P6032:1.72
--- src/sys/arch/algor/conf/P6032:1.71	Sun Jul 20 10:06:10 2014
+++ src/sys/arch/algor/conf/P6032	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: P6032,v 1.71 2014/07/20 10:06:10 alnsn Exp $
+#	$NetBSD: P6032,v 1.72 2014/08/17 21:17:43 joerg Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P6032-$Revision: 1.71 $"
+#ident 		"P6032-$Revision: 1.72 $"
 
 maxusers 32
 
@@ -25,7 +25,7 @@ options 	DIAGNOSTIC		# Cheap kernel cons
 options 	DDB			# kernel debugger
 makeoptions	DEBUG="-g"
 #makeoptions	DEBUGLIST="pattern1 pattern2 ..."
-options 	SYMTAB_SPACE=450000
+makeoptions	COPY_SYMTAB=1
 
 # File systems
 file-system	FFS		# Fast file system

Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.76 src/sys/arch/amd64/amd64/locore.S:1.77
--- src/sys/arch/amd64/amd64/locore.S:1.76	Fri May 16 00:48:41 2014
+++ src/sys/arch/amd64/amd64/locore.S	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.76 2014/05/16 00:48:41 rmind Exp $	*/
+/*	$NetBSD: locore.S,v 1.77 2014/08/17 21:17:43 joerg Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -520,7 +520,7 @@ ENTRY(start)
 
 	/* Find end of kernel image. */
 	movl	$RELOC(end),%edi
-#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(SYMTAB_SPACE)
+#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(COPY_SYMTAB)
 	/* Save the symbols (if loaded). */
 	movl	RELOC(esym),%eax
 	testl	%eax,%eax

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.44 src/sys/arch/arm/conf/Makefile.arm:1.45
--- src/sys/arch/arm/conf/Makefile.arm:1.44	Thu Aug 14 20:59:54 2014
+++ src/sys/arch/arm/conf/Makefile.arm	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.44 2014/08/14 20:59:54 joerg Exp $
+#	$NetBSD: Makefile.arm,v 1.45 2014/08/17 21:17:43 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -82,8 +82,7 @@ LINKFLAGS_NORMAL=	-X
 # Strip ARM mapping symbols from the kernel image, as they interfere
 # with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified.
 .if !defined(DEBUG) || empty(DEBUG:M-g*)
-SYSTEM_LD_TAIL?=	${SYSTEM_LD_TAIL_DBSYM} ; \
-			${OBJCOPY} --wildcard --strip-symbol='[$$][atd]' \
+SYSTEM_LD_TAIL?=	${OBJCOPY} --wildcard --strip-symbol='[$$][atd]' \
 				    --strip-symbol='[$$][atd]\.*' $@;   \
 			${SIZE} $@; chmod 755 $@
 .else

Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.151 src/sys/arch/cats/conf/GENERIC:1.152
--- src/sys/arch/cats/conf/GENERIC:1.151	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/cats/conf/GENERIC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.151 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: GENERIC,v 1.152 2014/08/17 21:17:43 joerg Exp $
 #
 # GENERIC machine description file
 # 
@@ -188,7 +188,7 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can 
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-#options 	SYMTAB_SPACE=900000
+#makeoptions	COPY_SYMTAB=1
 
 config		netbsd	root on ? type ?
 

Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.116 src/sys/arch/dreamcast/conf/GENERIC:1.117
--- src/sys/arch/dreamcast/conf/GENERIC:1.116	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/dreamcast/conf/GENERIC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.116 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: GENERIC,v 1.117 2014/08/17 21:17:43 joerg Exp $
 #
 # GENERIC machine description file
 # 
@@ -51,7 +51,7 @@ options 	DDB		# in-kernel debugger
 #options 	KGDB			# remote debugger
 #options 	"KGDB_DEVNAME=\"scif\"",KGDB_DEVRATE=57600
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=330000
+makeoptions	COPY_SYMTAB=1
 #options 	SYSCALL_DEBUG
 #options 	UVMHIST
 #options 	UVMHIST_PRINT

Index: src/sys/arch/epoc32/conf/GENERIC
diff -u src/sys/arch/epoc32/conf/GENERIC:1.3 src/sys/arch/epoc32/conf/GENERIC:1.4
--- src/sys/arch/epoc32/conf/GENERIC:1.3	Sun Aug  3 08:53:56 2014
+++ src/sys/arch/epoc32/conf/GENERIC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.3 2014/08/03 08:53:56 martin Exp $
+#	$NetBSD: GENERIC,v 1.4 2014/08/17 21:17:43 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/epoc32/conf/std.epoc32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.3 $"
+#ident 		"GENERIC-$Revision: 1.4 $"
 
 maxusers	32			# estimated number of users
 
@@ -113,7 +113,7 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can 
 options 	DDB             # in-kernel debugger
 options 	DDB_HISTORY_SIZE=100    # Enable history editing in DDB
 #makeoptions 	DEBUG="-g"  # compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 
 
 # Kernel root file system and dump configuration.

Index: src/sys/arch/evbarm/conf/ADI_BRH
diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.67 src/sys/arch/evbarm/conf/ADI_BRH:1.68
--- src/sys/arch/evbarm/conf/ADI_BRH:1.67	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/ADI_BRH	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: ADI_BRH,v 1.67 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: ADI_BRH,v 1.68 2014/08/17 21:17:43 joerg Exp $
 #
 #	ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
 #
@@ -132,7 +132,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-fxp0	root on fxp0 type nfs
Index: src/sys/arch/evbarm/conf/IQ31244
diff -u src/sys/arch/evbarm/conf/IQ31244:1.67 src/sys/arch/evbarm/conf/IQ31244:1.68
--- src/sys/arch/evbarm/conf/IQ31244:1.67	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IQ31244	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ31244,v 1.67 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: IQ31244,v 1.68 2014/08/17 21:17:43 joerg Exp $
 #
 #	IQ31244 -- Intel IQ31244 Evaluation Board Kernel
 #
@@ -131,7 +131,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=550000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs

Index: src/sys/arch/evbarm/conf/ARMADAXP
diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.12 src/sys/arch/evbarm/conf/ARMADAXP:1.13
--- src/sys/arch/evbarm/conf/ARMADAXP:1.12	Sun Aug  3 08:53:56 2014
+++ src/sys/arch/evbarm/conf/ARMADAXP	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ARMADAXP,v 1.12 2014/08/03 08:53:56 martin Exp $
+#	$NetBSD: ARMADAXP,v 1.13 2014/08/17 21:17:43 joerg Exp $
 #
 #	ARMADA XP DEV BOARD
 #
@@ -139,7 +139,7 @@ options 	DDB_KEYCODE=0x1d	# Enter ddb on
 #options 	KGDB
 options 	KGDB_DEVADDR=0xd0012000
 makeoptions 	DEBUG="-g"		# compile full symbol table
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 #options 	USB_DEBUG

Index: src/sys/arch/evbarm/conf/ARMADILLO210
diff -u src/sys/arch/evbarm/conf/ARMADILLO210:1.32 src/sys/arch/evbarm/conf/ARMADILLO210:1.33
--- src/sys/arch/evbarm/conf/ARMADILLO210:1.32	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/ARMADILLO210	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADILLO210,v 1.32 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: ARMADILLO210,v 1.33 2014/08/17 21:17:43 joerg Exp $
 #
 #	ARMADILLO210 -- Atmark Techno, Armadillo-210
 #
@@ -124,7 +124,7 @@ options		PIPE_SOCKETPAIR	# smaller, but 
 #options	DDB_ONPANIC=1
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-#options 	SYMTAB_SPACE=600000
+#makeoptions	COPY_SYMTAB=1
 
 #options 	PMAP_INCLUDE_PTE_SYNC
 #options 	LOCKDEBUG

Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.46 src/sys/arch/evbarm/conf/ARMADILLO9:1.47
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.46	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/ARMADILLO9	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADILLO9,v 1.46 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: ARMADILLO9,v 1.47 2014/08/17 21:17:43 joerg Exp $
 #
 #	ARMADILLO9 -- Atmark Techno, Armadillo-9
 #
@@ -124,7 +124,7 @@ options 	DDB		# in-kernel debugger
 #options	DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 #options 	PMAP_INCLUDE_PTE_SYNC
 #options 	LOCKDEBUG
Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.46 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.47
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.46	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR_FC,v 1.46 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: TEAMASA_NPWR_FC,v 1.47 2014/08/17 21:17:43 joerg Exp $
 #
 #	TeamASA NPWR-FC, i80321-based SBC
 #
@@ -132,7 +132,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=380000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs

Index: src/sys/arch/evbarm/conf/BCM5301X
diff -u src/sys/arch/evbarm/conf/BCM5301X:1.20 src/sys/arch/evbarm/conf/BCM5301X:1.21
--- src/sys/arch/evbarm/conf/BCM5301X:1.20	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/BCM5301X	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BCM5301X,v 1.20 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: BCM5301X,v 1.21 2014/08/17 21:17:43 joerg Exp $
 #
 #	BCM5301X -- Broadcom BCM5301X Eval Board Kernel
 #
@@ -154,7 +154,7 @@ options 	DDB_COMMANDONENTER="show event"
 options 	DB_MAX_LINE=INT_MAX
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/BCM56340
diff -u src/sys/arch/evbarm/conf/BCM56340:1.5 src/sys/arch/evbarm/conf/BCM56340:1.6
--- src/sys/arch/evbarm/conf/BCM56340:1.5	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/BCM56340	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BCM56340,v 1.5 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: BCM56340,v 1.6 2014/08/17 21:17:43 joerg Exp $
 #
 #	BCM5301X -- Broadcom BCM5301X Eval Board Kernel
 #
@@ -154,7 +154,7 @@ options 	DDB_COMMANDONENTER="show event"
 options 	DB_MAX_LINE=INT_MAX
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=590000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG
Index: src/sys/arch/evbarm/conf/OMAP5EVM
diff -u src/sys/arch/evbarm/conf/OMAP5EVM:1.5 src/sys/arch/evbarm/conf/OMAP5EVM:1.6
--- src/sys/arch/evbarm/conf/OMAP5EVM:1.5	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/OMAP5EVM	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: OMAP5EVM,v 1.5 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: OMAP5EVM,v 1.6 2014/08/17 21:17:43 joerg Exp $
 #
 #	PANDABOARD -- TI OMAP 4430 Eval Board Kernel
 #
@@ -140,7 +140,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=540000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.55 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.56
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.55	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARD,v 1.55 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: BEAGLEBOARD,v 1.56 2014/08/17 21:17:43 joerg Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -135,7 +135,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG
Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.55 src/sys/arch/evbarm/conf/ZAO425:1.56
--- src/sys/arch/evbarm/conf/ZAO425:1.55	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/ZAO425	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: ZAO425,v 1.55 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: ZAO425,v 1.56 2014/08/17 21:17:43 joerg Exp $
 #
 #	ZAO425 -- Intel IXP425
 #
@@ -136,7 +136,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/BEAGLEBOARDXM
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.15 src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.16
--- src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.15	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/BEAGLEBOARDXM	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARDXM,v 1.15 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: BEAGLEBOARDXM,v 1.16 2014/08/17 21:17:43 joerg Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -134,7 +134,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=530000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/BEAGLEBONE
diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.25 src/sys/arch/evbarm/conf/BEAGLEBONE:1.26
--- src/sys/arch/evbarm/conf/BEAGLEBONE:1.25	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/BEAGLEBONE	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBONE,v 1.25 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: BEAGLEBONE,v 1.26 2014/08/17 21:17:43 joerg Exp $
 #
 #	BEAGLEBONE -- TI AM335x board Kernel
 #
@@ -138,7 +138,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=530000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG
Index: src/sys/arch/evbarm/conf/OSK5912
diff -u src/sys/arch/evbarm/conf/OSK5912:1.25 src/sys/arch/evbarm/conf/OSK5912:1.26
--- src/sys/arch/evbarm/conf/OSK5912:1.25	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/OSK5912	Sun Aug 17 21:17:43 2014
@@ -121,7 +121,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-#options 	SYMTAB_SPACE=200000
+#makeoptions	COPY_SYMTAB=1
 
 # Valid options for BOOT_ARGS:
 #  single		Boot to single user only

Index: src/sys/arch/evbarm/conf/CP3100
diff -u src/sys/arch/evbarm/conf/CP3100:1.40 src/sys/arch/evbarm/conf/CP3100:1.41
--- src/sys/arch/evbarm/conf/CP3100:1.40	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/CP3100	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: CP3100,v 1.40 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: CP3100,v 1.41 2014/08/17 21:17:43 joerg Exp $
 #
 #	CP3100 -- Certance CP3100 Kernel
 #
@@ -133,7 +133,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=640000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.40 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.41
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.40	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: SHEEVAPLUG,v 1.40 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: SHEEVAPLUG,v 1.41 2014/08/17 21:17:43 joerg Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -165,7 +165,7 @@ options 	DDB		# in-kernel debugger
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O1"
-options 	SYMTAB_SPACE=840000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.13 src/sys/arch/evbarm/conf/CUBIEBOARD:1.14
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.13	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/CUBIEBOARD	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: CUBIEBOARD,v 1.13 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: CUBIEBOARD,v 1.14 2014/08/17 21:17:43 joerg Exp $
 #
 #	CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
 #
@@ -141,7 +141,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=820000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/DNS323
diff -u src/sys/arch/evbarm/conf/DNS323:1.6 src/sys/arch/evbarm/conf/DNS323:1.7
--- src/sys/arch/evbarm/conf/DNS323:1.6	Sun Jul 27 03:34:41 2014
+++ src/sys/arch/evbarm/conf/DNS323	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: DNS323,v 1.6 2014/07/27 03:34:41 dholland Exp $
+#	$NetBSD: DNS323,v 1.7 2014/08/17 21:17:43 joerg Exp $
 #
 #  DNS323 -- D-Link. DNS-323 platform kernel
 #
@@ -25,7 +25,7 @@ options 	DDB		# in-kernel debugger
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O2"
-options 	SYMTAB_SPACE=810000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 
Index: src/sys/arch/evbarm/conf/IMX23_OLINUXINO
diff -u src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.6 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.7
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.6	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.6 2014/08/16 17:56:31 apb Exp $
+# $Id: IMX23_OLINUXINO,v 1.7 2014/08/17 21:17:43 joerg Exp $
 #
 # IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
 #
@@ -90,7 +90,7 @@ options		COMPAT_60	# NetBSD 6.0 compatib
 options		COMPAT_70	# NetBSD 7.0 compatibility
 
 makeoptions     DEBUG="-g"      # compile full symbol table
-options         SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 options		SYSVMSG		# System V-like message queues
 options		SYSVSEM		# System V-like semaphores
Index: src/sys/arch/evbarm/conf/KUROBOX_PRO
diff -u src/sys/arch/evbarm/conf/KUROBOX_PRO:1.6 src/sys/arch/evbarm/conf/KUROBOX_PRO:1.7
--- src/sys/arch/evbarm/conf/KUROBOX_PRO:1.6	Sun Jul 27 03:34:41 2014
+++ src/sys/arch/evbarm/conf/KUROBOX_PRO	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: KUROBOX_PRO,v 1.6 2014/07/27 03:34:41 dholland Exp $
+#	$NetBSD: KUROBOX_PRO,v 1.7 2014/08/17 21:17:43 joerg Exp $
 #
 #  KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
 #
@@ -29,7 +29,7 @@ options 	DDB		# in-kernel debugger
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O2"
-options 	SYMTAB_SPACE=780000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 
Index: src/sys/arch/evbarm/conf/ODROID
diff -u src/sys/arch/evbarm/conf/ODROID:1.6 src/sys/arch/evbarm/conf/ODROID:1.7
--- src/sys/arch/evbarm/conf/ODROID:1.6	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/ODROID	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ODROID,v 1.6 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: ODROID,v 1.7 2014/08/17 21:17:43 joerg Exp $
 #
 #	ODROID -- ODROID series Exynos Kernel
 #
@@ -154,7 +154,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/GEMINI
diff -u src/sys/arch/evbarm/conf/GEMINI:1.29 src/sys/arch/evbarm/conf/GEMINI:1.30
--- src/sys/arch/evbarm/conf/GEMINI:1.29	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/GEMINI	Sun Aug 17 21:17:43 2014
@@ -123,7 +123,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-##options 	SYMTAB_SPACE=280000
+##makeoptions	COPY_SYMTAB=1
 ##options	ATADEBUG
 
 # Valid options for BOOT_ARGS:
Index: src/sys/arch/evbarm/conf/GEMINI_MASTER
diff -u src/sys/arch/evbarm/conf/GEMINI_MASTER:1.29 src/sys/arch/evbarm/conf/GEMINI_MASTER:1.30
--- src/sys/arch/evbarm/conf/GEMINI_MASTER:1.29	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/GEMINI_MASTER	Sun Aug 17 21:17:43 2014
@@ -124,7 +124,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-##options 	SYMTAB_SPACE=280000
+##makeoptions	COPY_SYMTAB=1
 ##options	ATADEBUG
 
 # Valid options for BOOT_ARGS:
Index: src/sys/arch/evbarm/conf/GEMINI_SLAVE
diff -u src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.29 src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.30
--- src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.29	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/GEMINI_SLAVE	Sun Aug 17 21:17:43 2014
@@ -123,7 +123,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-##options 	SYMTAB_SPACE=280000
+##makeoptions	COPY_SYMTAB=1
 ##options	ATADEBUG
 
 # Valid options for BOOT_ARGS:

Index: src/sys/arch/evbarm/conf/GOLDENGATE
diff -u src/sys/arch/evbarm/conf/GOLDENGATE:1.8 src/sys/arch/evbarm/conf/GOLDENGATE:1.9
--- src/sys/arch/evbarm/conf/GOLDENGATE:1.8	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/GOLDENGATE	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GOLDENGATE,v 1.8 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: GOLDENGATE,v 1.9 2014/08/17 21:17:43 joerg Exp $
 #
 #	GOLDENGATE -- Cortina GOLDENGATE Eval Board Kernel
 #
@@ -150,7 +150,7 @@ options 	DDB_COMMANDONENTER="show event"
 options 	DB_MAX_LINE=INT_MAX
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=575000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.82 src/sys/arch/evbarm/conf/GUMSTIX:1.83
--- src/sys/arch/evbarm/conf/GUMSTIX:1.82	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/GUMSTIX	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.82 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: GUMSTIX,v 1.83 2014/08/17 21:17:43 joerg Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -159,7 +159,7 @@ options 	DDB		# in-kernel debugger
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O2"
-options 	SYMTAB_SPACE=790000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?
Index: src/sys/arch/evbarm/conf/IQ80321
diff -u src/sys/arch/evbarm/conf/IQ80321:1.82 src/sys/arch/evbarm/conf/IQ80321:1.83
--- src/sys/arch/evbarm/conf/IQ80321:1.82	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IQ80321	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.82 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: IQ80321,v 1.83 2014/08/17 21:17:43 joerg Exp $
 #
 #	IQ80321 -- Intel IQ80321 Evaluation Board Kernel
 #
@@ -131,7 +131,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=610000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs

Index: src/sys/arch/evbarm/conf/HAWK
diff -u src/sys/arch/evbarm/conf/HAWK:1.3 src/sys/arch/evbarm/conf/HAWK:1.4
--- src/sys/arch/evbarm/conf/HAWK:1.3	Sun Aug  3 09:18:16 2014
+++ src/sys/arch/evbarm/conf/HAWK	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HAWK,v 1.3 2014/08/03 09:18:16 martin Exp $
+# $NetBSD: HAWK,v 1.4 2014/08/17 21:17:43 joerg Exp $
 #
 #	HAWK -- TI OMAPL138 based Board Kernel
 #
@@ -99,7 +99,7 @@ options 	DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-#options 	SYMTAB_SPACE=200000
+#makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.41 src/sys/arch/evbarm/conf/HDL_G:1.42
--- src/sys/arch/evbarm/conf/HDL_G:1.41	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/HDL_G	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.41 2014/08/16 17:56:31 apb Exp $
+# $NetBSD: HDL_G,v 1.42 2014/08/17 21:17:43 joerg Exp $
 #
 #       HDL_G -- I-O DATA HDL-G Kernel
 #
@@ -137,7 +137,7 @@ options 	USERCONF	# userconf(4) support
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=750000
+makeoptions	COPY_SYMTAB=1
 
 #config		netbsd		root on ? type ?
 config		netbsd		root on wd0a type ?
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.41 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.42
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.41	Sun Aug  3 09:18:16 2014
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.41 2014/08/03 09:18:16 martin Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.42 2014/08/17 21:17:43 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mpcsa"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.41 $"
+#ident 		"GENERIC-$Revision: 1.42 $"
 
 maxusers	32		# estimated number of users
 
@@ -88,7 +88,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPTS="-Os"
-options 	SYMTAB_SPACE=640000
+makeoptions	COPY_SYMTAB=1
 #options 	SYSCALL_STATS	# per syscall counts
 #options 	SYSCALL_TIMES	# per syscall times
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)

Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.21 src/sys/arch/evbarm/conf/HPT5325:1.22
--- src/sys/arch/evbarm/conf/HPT5325:1.21	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/HPT5325	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: HPT5325,v 1.21 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: HPT5325,v 1.22 2014/08/17 21:17:43 joerg Exp $
 #
 #  This configuration supports for HP T5325 Thin Client
 #
@@ -162,7 +162,7 @@ options 	DDB		# in-kernel debugger
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O2"
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.21 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.22
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.21	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_A6,v 1.21 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: OPENBLOCKS_A6,v 1.22 2014/08/17 21:17:43 joerg Exp $
 #
 #	OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
 #
@@ -155,7 +155,7 @@ options 	DDB		# in-kernel debugger
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O2"
-options 	SYMTAB_SPACE=850000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/IGEPV2
diff -u src/sys/arch/evbarm/conf/IGEPV2:1.23 src/sys/arch/evbarm/conf/IGEPV2:1.24
--- src/sys/arch/evbarm/conf/IGEPV2:1.23	Sun Aug 10 22:55:29 2014
+++ src/sys/arch/evbarm/conf/IGEPV2	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: IGEPV2,v 1.23 2014/08/10 22:55:29 chs Exp $
+#	$NetBSD: IGEPV2,v 1.24 2014/08/17 21:17:43 joerg Exp $
 #
 #	IGEPv2 -- TI OMAP 3530 Eval Board Kernel
 #
@@ -133,7 +133,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=520000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/IMX31LITE
diff -u src/sys/arch/evbarm/conf/IMX31LITE:1.27 src/sys/arch/evbarm/conf/IMX31LITE:1.28
--- src/sys/arch/evbarm/conf/IMX31LITE:1.27	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IMX31LITE	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: IMX31LITE,v 1.27 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: IMX31LITE,v 1.28 2014/08/17 21:17:43 joerg Exp $
 #
 #	IMX31LITE -- Freescale IMX31LITE Evaluation Board Kernel
 #
@@ -130,7 +130,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/INTEGRATOR
diff -u src/sys/arch/evbarm/conf/INTEGRATOR:1.77 src/sys/arch/evbarm/conf/INTEGRATOR:1.78
--- src/sys/arch/evbarm/conf/INTEGRATOR:1.77	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/INTEGRATOR	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR,v 1.77 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: INTEGRATOR,v 1.78 2014/08/17 21:17:43 joerg Exp $
 #
 #	GENERIC -- ARM Integrator board Generic kernel
 #
@@ -131,7 +131,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	UVMHIST
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 options 	PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=38400,PLCONMODE=0xB00
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/INTEGRATOR_CP
diff -u src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.7 src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.8
--- src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.7	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/INTEGRATOR_CP	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR_CP,v 1.7 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: INTEGRATOR_CP,v 1.8 2014/08/17 21:17:43 joerg Exp $
 #
 #	INTEGRATOR_CP -- ARM Integrator CP kernel
 #
@@ -131,7 +131,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	UVMHIST
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 options 	PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=38400,PLCONMODE=0xB00
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/IQ80310
diff -u src/sys/arch/evbarm/conf/IQ80310:1.85 src/sys/arch/evbarm/conf/IQ80310:1.86
--- src/sys/arch/evbarm/conf/IQ80310:1.85	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IQ80310	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310,v 1.85 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: IQ80310,v 1.86 2014/08/17 21:17:43 joerg Exp $
 #
 #	IQ80310 -- Intel IQ80310 Evaluation Board Kernel
 #
@@ -132,7 +132,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=550000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-fxp0	root on fxp0 type nfs

Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.47 src/sys/arch/evbarm/conf/IXDP425:1.48
--- src/sys/arch/evbarm/conf/IXDP425:1.47	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IXDP425	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: IXDP425,v 1.47 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: IXDP425,v 1.48 2014/08/17 21:17:43 joerg Exp $
 #
 #	IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
 #
@@ -136,7 +136,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.47 src/sys/arch/evbarm/conf/RPI:1.48
--- src/sys/arch/evbarm/conf/RPI:1.47	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/RPI	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: RPI,v 1.47 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: RPI,v 1.48 2014/08/17 21:17:43 joerg Exp $
 #
 #	RPi -- Raspberry Pi
 #
@@ -141,7 +141,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB,KGDB_PLCOMUNIT=0,KGDB_DEVRATE=115200,KGDB_CONMODE=0xB00
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=880000
+makeoptions	COPY_SYMTAB=1
 options 	PLCONSOLE
 #options 	PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=115200,PLCONMODE=0xB00
 

Index: src/sys/arch/evbarm/conf/IXM1200
diff -u src/sys/arch/evbarm/conf/IXM1200:1.58 src/sys/arch/evbarm/conf/IXM1200:1.59
--- src/sys/arch/evbarm/conf/IXM1200:1.58	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/IXM1200	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: IXM1200,v 1.58 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: IXM1200,v 1.59 2014/08/17 21:17:43 joerg Exp $
 #
 #	IXM1200 -- Intel IXM1200 Evaluation Board Kernel
 #
@@ -129,7 +129,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.51 src/sys/arch/evbarm/conf/LUBBOCK:1.52
--- src/sys/arch/evbarm/conf/LUBBOCK:1.51	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/LUBBOCK	Sun Aug 17 21:17:43 2014
@@ -125,7 +125,7 @@ options 	DIAGNOSTIC	# internal consisten
 #options 	KGDB
 #options  	DEBUG_KGDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-#options 	SYMTAB_SPACE=200000
+#makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-sm0	root on sm0 type nfs

Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.18 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.19
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.18	Sun Aug  3 09:18:16 2014
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.18 2014/08/03 09:18:16 martin Exp $
+# $NetBSD: MMNET_GENERIC,v 1.19 2014/08/17 21:17:43 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mmnet"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 maxusers	32		# estimated number of users
 
@@ -88,7 +88,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPTS="-Os"
-options     SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 #options 	SYSCALL_STATS	# per syscall counts
 #options 	SYSCALL_TIMES	# per syscall times
 #options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
Index: src/sys/arch/evbarm/conf/N900
diff -u src/sys/arch/evbarm/conf/N900:1.18 src/sys/arch/evbarm/conf/N900:1.19
--- src/sys/arch/evbarm/conf/N900:1.18	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/N900	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: N900,v 1.18 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: N900,v 1.19 2014/08/17 21:17:43 joerg Exp $
 #
 #	N900 -- Nokia N900 Kernel
 #
@@ -136,7 +136,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.22 src/sys/arch/evbarm/conf/MV2120:1.23
--- src/sys/arch/evbarm/conf/MV2120:1.22	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/MV2120	Sun Aug 17 21:17:43 2014
@@ -1,11 +1,11 @@
-#	$NetBSD: MV2120,v 1.22 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: MV2120,v 1.23 2014/08/17 21:17:43 joerg Exp $
 #
 #  This configuration supports for HP MV2120/MV5140/MV5150.
 
 include 	"arch/evbarm/conf/std.mv2120"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-options 	SYMTAB_SPACE=1024000
+makeoptions	COPY_SYMTAB=1
 
 makeoptions	DEBUG="-g"
 

Index: src/sys/arch/evbarm/conf/NAPPI
diff -u src/sys/arch/evbarm/conf/NAPPI:1.54 src/sys/arch/evbarm/conf/NAPPI:1.55
--- src/sys/arch/evbarm/conf/NAPPI:1.54	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/NAPPI	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: NAPPI,v 1.54 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: NAPPI,v 1.55 2014/08/17 21:17:43 joerg Exp $
 #
 #	NAPPI -- Netwise APlication Platform Board Kernel
 #
@@ -123,7 +123,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/NSLU2
diff -u src/sys/arch/evbarm/conf/NSLU2:1.36 src/sys/arch/evbarm/conf/NSLU2:1.37
--- src/sys/arch/evbarm/conf/NSLU2:1.36	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/NSLU2	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: NSLU2,v 1.36 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: NSLU2,v 1.37 2014/08/17 21:17:43 joerg Exp $
 #
 #	Linksys NSLU2 "Slug" NAS Device
 #
@@ -136,7 +136,7 @@ options 	DEBUG
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=530000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/ODROID-U
diff -u src/sys/arch/evbarm/conf/ODROID-U:1.10 src/sys/arch/evbarm/conf/ODROID-U:1.11
--- src/sys/arch/evbarm/conf/ODROID-U:1.10	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/ODROID-U	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ODROID-U,v 1.10 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: ODROID-U,v 1.11 2014/08/17 21:17:43 joerg Exp $
 #
 #	ODROID-U -- ODROID-U series Exynos Kernel
 #
@@ -148,7 +148,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.10 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.11
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.10	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_AX3,v 1.10 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: OPENBLOCKS_AX3,v 1.11 2014/08/17 21:17:43 joerg Exp $
 #
 #	OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
 #
@@ -157,7 +157,7 @@ options 	DDB_ONPANIC=1
 #options 	KGDB
 #options 	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=800000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.38 src/sys/arch/evbarm/conf/OVERO:1.39
--- src/sys/arch/evbarm/conf/OVERO:1.38	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/OVERO	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: OVERO,v 1.38 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: OVERO,v 1.39 2014/08/17 21:17:43 joerg Exp $
 #
 #	OVERO -- Gumstix. Inc. Overo COMS platforms kernel
 #
@@ -152,7 +152,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 

Index: src/sys/arch/evbarm/conf/PANDABOARD
diff -u src/sys/arch/evbarm/conf/PANDABOARD:1.14 src/sys/arch/evbarm/conf/PANDABOARD:1.15
--- src/sys/arch/evbarm/conf/PANDABOARD:1.14	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/PANDABOARD	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PANDABOARD,v 1.14 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: PANDABOARD,v 1.15 2014/08/17 21:17:43 joerg Exp $
 #
 #	PANDABOARD -- TI OMAP 4430 Eval Board Kernel
 #
@@ -138,7 +138,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=530000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.86 src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.87
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.86	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR,v 1.86 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: TEAMASA_NPWR,v 1.87 2014/08/17 21:17:43 joerg Exp $
 #
 #	TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
 #	server appliance.
@@ -139,7 +139,7 @@ options 	DIAGNOSTIC	# internal consisten
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=590000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd		root on ? type ?
 config		netbsd-wm0	root on wm0 type nfs

Index: src/sys/arch/evbarm/conf/TISDP2420
diff -u src/sys/arch/evbarm/conf/TISDP2420:1.30 src/sys/arch/evbarm/conf/TISDP2420:1.31
--- src/sys/arch/evbarm/conf/TISDP2420:1.30	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/TISDP2420	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TISDP2420,v 1.30 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: TISDP2420,v 1.31 2014/08/17 21:17:43 joerg Exp $
 #
 #	TISDP2420 -- TI OMAP 2420 Eval Board Kernel
 #
@@ -134,7 +134,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=600000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG
Index: src/sys/arch/evbarm/conf/TISDP2430
diff -u src/sys/arch/evbarm/conf/TISDP2430:1.30 src/sys/arch/evbarm/conf/TISDP2430:1.31
--- src/sys/arch/evbarm/conf/TISDP2430:1.30	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/TISDP2430	Sun Aug 17 21:17:43 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TISDP2430,v 1.30 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: TISDP2430,v 1.31 2014/08/17 21:17:43 joerg Exp $
 #
 #	TISDP2430 -- TI OMAP 2430 Eval Board Kernel
 #
@@ -133,7 +133,7 @@ options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=520000
+makeoptions	COPY_SYMTAB=1
 
 ## USB Debugging options
 options USB_DEBUG

Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.60 src/sys/arch/evbarm/conf/TS7200:1.61
--- src/sys/arch/evbarm/conf/TS7200:1.60	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/TS7200	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TS7200,v 1.60 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: TS7200,v 1.61 2014/08/17 21:17:43 joerg Exp $
 #
 #	TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
 #
@@ -136,7 +136,7 @@ options 	DDB		# in-kernel debugger
 options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=550000
+makeoptions	COPY_SYMTAB=1
 
 ##options 	PMAP_INCLUDE_PTE_SYNC
 ##options 	LOCKDEBUG

Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.62 src/sys/arch/evbarm/conf/TWINTAIL:1.63
--- src/sys/arch/evbarm/conf/TWINTAIL:1.62	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/TWINTAIL	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TWINTAIL,v 1.62 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: TWINTAIL,v 1.63 2014/08/17 21:17:43 joerg Exp $
 #
 #	TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
 #
@@ -135,7 +135,7 @@ options 	DIAGNOSTIC	# internal consisten
 #options  	DEBUG_KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 #makeoptions	COPTS="-O2"
-options 	SYMTAB_SPACE=640000
+makeoptions	COPY_SYMTAB=1
 #options 	AUDIO_DEBUG=2
 
 config		netbsd		root on ? type ?

Index: src/sys/arch/evbarm/conf/VIPER
diff -u src/sys/arch/evbarm/conf/VIPER:1.35 src/sys/arch/evbarm/conf/VIPER:1.36
--- src/sys/arch/evbarm/conf/VIPER:1.35	Sat Aug 16 17:56:31 2014
+++ src/sys/arch/evbarm/conf/VIPER	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: VIPER,v 1.35 2014/08/16 17:56:31 apb Exp $
+#	$NetBSD: VIPER,v 1.36 2014/08/17 21:17:43 joerg Exp $
 #
 #	Arcom Viper
 #
@@ -126,7 +126,7 @@ options 	DDB		# in-kernel debugger
 options		DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=500000
+makeoptions	COPY_SYMTAB=1
 
 ##options 	PMAP_INCLUDE_PTE_SYNC
 ##options 	LOCKDEBUG

Index: src/sys/arch/evbmips/conf/ADM5120
diff -u src/sys/arch/evbmips/conf/ADM5120:1.18 src/sys/arch/evbmips/conf/ADM5120:1.19
--- src/sys/arch/evbmips/conf/ADM5120:1.18	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/ADM5120	Sun Aug 17 21:17:43 2014
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120,v 1.18 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: ADM5120,v 1.19 2014/08/17 21:17:43 joerg Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.adm5120"
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 maxusers	32
 
@@ -33,7 +33,7 @@ options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
 makeoptions 	CPUFLAGS="-march=4kc"
-options 	SYMTAB_SPACE=290000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
Index: src/sys/arch/evbmips/conf/CPMBR1400
diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.18 src/sys/arch/evbmips/conf/CPMBR1400:1.19
--- src/sys/arch/evbmips/conf/CPMBR1400:1.18	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbmips/conf/CPMBR1400	Sun Aug 17 21:17:43 2014
@@ -1,8 +1,8 @@
-#	$NetBSD: CPMBR1400,v 1.18 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: CPMBR1400,v 1.19 2014/08/17 21:17:43 joerg Exp $
 
 include		"arch/evbmips/conf/std.rasoc"
 
-options 	SYMTAB_SPACE=450000		# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1		# size for embedded symbol table
 
 #options 	RALINK_CONSOLE_EARLY
 options 	RT3883

Index: src/sys/arch/evbmips/conf/ADM5120-NB
diff -u src/sys/arch/evbmips/conf/ADM5120-NB:1.17 src/sys/arch/evbmips/conf/ADM5120-NB:1.18
--- src/sys/arch/evbmips/conf/ADM5120-NB:1.17	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/ADM5120-NB	Sun Aug 17 21:17:43 2014
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120-NB,v 1.17 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: ADM5120-NB,v 1.18 2014/08/17 21:17:43 joerg Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.adm5120"
 
-#ident 		"GENERIC-$Revision: 1.17 $"
+#ident 		"GENERIC-$Revision: 1.18 $"
 
 maxusers	32
 
@@ -33,7 +33,7 @@ options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
 makeoptions 	CPUFLAGS="-march=4kc"
-options 	SYMTAB_SPACE=180000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk
Index: src/sys/arch/evbmips/conf/ADM5120-USB
diff -u src/sys/arch/evbmips/conf/ADM5120-USB:1.17 src/sys/arch/evbmips/conf/ADM5120-USB:1.18
--- src/sys/arch/evbmips/conf/ADM5120-USB:1.17	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/ADM5120-USB	Sun Aug 17 21:17:43 2014
@@ -1,11 +1,11 @@
-#	$NetBSD: ADM5120-USB,v 1.17 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: ADM5120-USB,v 1.18 2014/08/17 21:17:43 joerg Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.adm5120"
 
-#ident 		"GENERIC-$Revision: 1.17 $"
+#ident 		"GENERIC-$Revision: 1.18 $"
 
 maxusers	32
 
@@ -32,7 +32,7 @@ options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
 makeoptions 	CPUFLAGS="-march=4kc"	# compile full symbol table
-options 	SYMTAB_SPACE=180000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options		MEMORY_DISK_HOOKS
 #options         MEMORY_DISK_IS_ROOT     # Force root on ram-disk

Index: src/sys/arch/evbmips/conf/ALCHEMY
diff -u src/sys/arch/evbmips/conf/ALCHEMY:1.54 src/sys/arch/evbmips/conf/ALCHEMY:1.55
--- src/sys/arch/evbmips/conf/ALCHEMY:1.54	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbmips/conf/ALCHEMY	Sun Aug 17 21:17:43 2014
@@ -1,11 +1,11 @@
-#	$NetBSD: ALCHEMY,v 1.54 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: ALCHEMY,v 1.55 2014/08/17 21:17:43 joerg Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.alchemy"
 
-#ident 		"ALCHEMY-$Revision: 1.54 $"
+#ident 		"ALCHEMY-$Revision: 1.55 $"
 
 maxusers	32
 
@@ -45,7 +45,7 @@ options 	DEBUG		# extra kernel debugging
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=495000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/AP30
diff -u src/sys/arch/evbmips/conf/AP30:1.31 src/sys/arch/evbmips/conf/AP30:1.32
--- src/sys/arch/evbmips/conf/AP30:1.31	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/AP30	Sun Aug 17 21:17:43 2014
@@ -1,10 +1,10 @@
-#	$NetBSD: AP30,v 1.31 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: AP30,v 1.32 2014/08/17 21:17:43 joerg Exp $
 
 include 	"arch/evbmips/conf/std.atheros"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"AP30-$Revision: 1.31 $"
+#ident 		"AP30-$Revision: 1.32 $"
 
 maxusers	32
 
@@ -45,7 +45,7 @@ options 	DIAGNOSTIC	# extra kernel sanit
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=355000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/DB120
diff -u src/sys/arch/evbmips/conf/DB120:1.13 src/sys/arch/evbmips/conf/DB120:1.14
--- src/sys/arch/evbmips/conf/DB120:1.13	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/DB120	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: DB120,v 1.13 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: DB120,v 1.14 2014/08/17 21:17:43 joerg Exp $
 #
 # Qualcomm Atheros AR9344 DB120 evaluation board.
 #
@@ -7,7 +7,7 @@ include 	"arch/evbmips/conf/std.atheros"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"DB120-$Revision: 1.13 $"
+#ident 		"DB120-$Revision: 1.14 $"
 
 maxusers	32
 
@@ -52,7 +52,7 @@ options 	DEBUG		# extra kernel debugging
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=350000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/GDIUM64
diff -u src/sys/arch/evbmips/conf/GDIUM64:1.1 src/sys/arch/evbmips/conf/GDIUM64:1.2
--- src/sys/arch/evbmips/conf/GDIUM64:1.1	Wed Aug 24 16:02:26 2011
+++ src/sys/arch/evbmips/conf/GDIUM64	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM64,v 1.1 2011/08/24 16:02:26 matt Exp $
+# $NetBSD: GDIUM64,v 1.2 2014/08/17 21:17:43 joerg Exp $
 #
 include "arch/evbmips/conf/GDIUM"
 
@@ -6,7 +6,6 @@ makeoptions	LP64="yes"
 
 options 	EXEC_ELF64
 options 	COMPAT_NETBSD32
-#no options 	SYMTAB_SPACE
-#options 	SYMTAB_SPACE=470000	# size for embedded symbol table
+#makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options 	UVMHIST, UVMHIST_PRINT

Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.79 src/sys/arch/evbmips/conf/MALTA:1.80
--- src/sys/arch/evbmips/conf/MALTA:1.79	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbmips/conf/MALTA	Sun Aug 17 21:17:43 2014
@@ -1,10 +1,10 @@
-#	$NetBSD: MALTA,v 1.79 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: MALTA,v 1.80 2014/08/17 21:17:43 joerg Exp $
 
 include 	"arch/evbmips/conf/std.malta"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MALTA-$Revision: 1.79 $"
+#ident 		"MALTA-$Revision: 1.80 $"
 
 maxusers	32
 
@@ -37,7 +37,7 @@ options 	USERCONF	# userconf(4) support
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=475000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/MALTA64
diff -u src/sys/arch/evbmips/conf/MALTA64:1.6 src/sys/arch/evbmips/conf/MALTA64:1.7
--- src/sys/arch/evbmips/conf/MALTA64:1.6	Sat Oct 13 06:08:11 2012
+++ src/sys/arch/evbmips/conf/MALTA64	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: MALTA64,v 1.6 2012/10/13 06:08:11 riz Exp $
+# $NetBSD: MALTA64,v 1.7 2014/08/17 21:17:43 joerg Exp $
 #
 include "arch/evbmips/conf/MALTA"
 
@@ -8,8 +8,8 @@ no options 	MIPS32
 options 	NOFPU			# No FPU
 options 	EXEC_ELF64
 options 	COMPAT_NETBSD32
-no options 	SYMTAB_SPACE
-options 	SYMTAB_SPACE=490000	# size for embedded symbol table
+no makeoptions	COPY_SYMTAB
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options 	UVMHIST, UVMHIST_PRINT
 

Index: src/sys/arch/evbmips/conf/MERAKI
diff -u src/sys/arch/evbmips/conf/MERAKI:1.25 src/sys/arch/evbmips/conf/MERAKI:1.26
--- src/sys/arch/evbmips/conf/MERAKI:1.25	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/MERAKI	Sun Aug 17 21:17:43 2014
@@ -1,10 +1,10 @@
-#	$NetBSD: MERAKI,v 1.25 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: MERAKI,v 1.26 2014/08/17 21:17:43 joerg Exp $
 
 include 	"arch/evbmips/conf/std.meraki"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MERAKI-$Revision: 1.25 $"
+#ident 		"MERAKI-$Revision: 1.26 $"
 
 maxusers	32
 
@@ -45,7 +45,7 @@ options 	DIAGNOSTIC	# extra kernel sanit
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=360000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/RB153
diff -u src/sys/arch/evbmips/conf/RB153:1.15 src/sys/arch/evbmips/conf/RB153:1.16
--- src/sys/arch/evbmips/conf/RB153:1.15	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/RB153	Sun Aug 17 21:17:43 2014
@@ -1,10 +1,10 @@
-#	$NetBSD: RB153,v 1.15 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: RB153,v 1.16 2014/08/17 21:17:43 joerg Exp $
 #
 # Example kernel config for the RouterBOARD 153.
 
 include 	"arch/evbmips/conf/std.adm5120"
 
-#ident 		"RB153-$Revision: 1.15 $"
+#ident 		"RB153-$Revision: 1.16 $"
 
 maxusers	32
 
@@ -33,7 +33,7 @@ options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
 makeoptions 	CPUFLAGS="-march=4kc"
-options 	SYMTAB_SPACE=440000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options 	MEMORY_DISK_HOOKS
 #options 	MEMORY_DISK_IS_ROOT	# Force root on ram-disk

Index: src/sys/arch/evbmips/conf/RB433UAH
diff -u src/sys/arch/evbmips/conf/RB433UAH:1.10 src/sys/arch/evbmips/conf/RB433UAH:1.11
--- src/sys/arch/evbmips/conf/RB433UAH:1.10	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/RB433UAH	Sun Aug 17 21:17:43 2014
@@ -1,10 +1,10 @@
-#	$NetBSD: RB433UAH,v 1.10 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: RB433UAH,v 1.11 2014/08/17 21:17:43 joerg Exp $
 
 include 	"arch/evbmips/conf/std.atheros"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"RB433UAH-$Revision: 1.10 $"
+#ident 		"RB433UAH-$Revision: 1.11 $"
 
 maxusers	32
 
@@ -45,7 +45,7 @@ options 	DEBUG		# extra kernel debugging
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=350000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/WGT624V3
diff -u src/sys/arch/evbmips/conf/WGT624V3:1.22 src/sys/arch/evbmips/conf/WGT624V3:1.23
--- src/sys/arch/evbmips/conf/WGT624V3:1.22	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/WGT624V3	Sun Aug 17 21:17:43 2014
@@ -1,10 +1,10 @@
-#	$NetBSD: WGT624V3,v 1.22 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: WGT624V3,v 1.23 2014/08/17 21:17:43 joerg Exp $
 
 include 	"arch/evbmips/conf/std.atheros"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"WGT624V3-$Revision: 1.22 $"
+#ident 		"WGT624V3-$Revision: 1.23 $"
 
 maxusers	32
 
@@ -46,7 +46,7 @@ options 	DIAGNOSTIC	# extra kernel sanit
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=360000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 #options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/evbmips/conf/XLSATX
diff -u src/sys/arch/evbmips/conf/XLSATX:1.19 src/sys/arch/evbmips/conf/XLSATX:1.20
--- src/sys/arch/evbmips/conf/XLSATX:1.19	Sun Jul 20 10:06:11 2014
+++ src/sys/arch/evbmips/conf/XLSATX	Sun Aug 17 21:17:43 2014
@@ -1,8 +1,8 @@
-#	$NetBSD: XLSATX,v 1.19 2014/07/20 10:06:11 alnsn Exp $
+#	$NetBSD: XLSATX,v 1.20 2014/08/17 21:17:43 joerg Exp $
 
 include 	"arch/evbmips/conf/std.rmixl"
 
-#ident 		"XLSATX-$Revision: 1.19 $"
+#ident 		"XLSATX-$Revision: 1.20 $"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
@@ -41,7 +41,7 @@ options 	USERCONF	# userconf(4) support
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=520000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 #options 	DDB_COMMANDONENTER="trace;show registers"
 options 	DB_MAX_LINE=-1
 

Index: src/sys/arch/evbmips/conf/ZYXELKX
diff -u src/sys/arch/evbmips/conf/ZYXELKX:1.3 src/sys/arch/evbmips/conf/ZYXELKX:1.4
--- src/sys/arch/evbmips/conf/ZYXELKX:1.3	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbmips/conf/ZYXELKX	Sun Aug 17 21:17:43 2014
@@ -1,8 +1,8 @@
-#	$NetBSD: ZYXELKX,v 1.3 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: ZYXELKX,v 1.4 2014/08/17 21:17:43 joerg Exp $
 
 include		"arch/evbmips/conf/std.rasoc"
 
-options 	SYMTAB_SPACE=450000		# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1		# size for embedded symbol table
 
 options 	RALINK_CONSOLE_EARLY
 options 	MT7620

Index: src/sys/arch/evbppc/conf/EV64260
diff -u src/sys/arch/evbppc/conf/EV64260:1.61 src/sys/arch/evbppc/conf/EV64260:1.62
--- src/sys/arch/evbppc/conf/EV64260:1.61	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/EV64260	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: EV64260,v 1.61 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: EV64260,v 1.62 2014/08/17 21:17:43 joerg Exp $
 #
 #	MVP -- Motorola's Multiprocessing Verification Platform
 #
@@ -57,7 +57,7 @@ options 	DIAGNOSTIC	# cheap kernel consi
 #options 	DEBUG		# expensive debugging checks/support
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
-options 	SYMTAB_SPACE=340000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #makeoptions	DEFCOPTS="-g"	# compile full symbol table
 makeoptions	DEBUG="-g"

Index: src/sys/arch/evbppc/conf/EXPLORA451
diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.56 src/sys/arch/evbppc/conf/EXPLORA451:1.57
--- src/sys/arch/evbppc/conf/EXPLORA451:1.56	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/EXPLORA451	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: EXPLORA451,v 1.56 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: EXPLORA451,v 1.57 2014/08/17 21:17:43 joerg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -52,7 +52,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=440000
+makeoptions	COPY_SYMTAB=1
 
 # Compatibility options
 options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,

Index: src/sys/arch/evbppc/conf/MPC8536DS
diff -u src/sys/arch/evbppc/conf/MPC8536DS:1.20 src/sys/arch/evbppc/conf/MPC8536DS:1.21
--- src/sys/arch/evbppc/conf/MPC8536DS:1.20	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/MPC8536DS	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: MPC8536DS,v 1.20 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: MPC8536DS,v 1.21 2014/08/17 21:17:43 joerg Exp $
 #
 #	MPC8536DS -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"MPC8536DS-$Revision: 1.20 $"
+ident 		"MPC8536DS-$Revision: 1.21 $"
 
 maxusers	32
 
@@ -40,7 +40,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=410000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/MPC8548CDS
diff -u src/sys/arch/evbppc/conf/MPC8548CDS:1.19 src/sys/arch/evbppc/conf/MPC8548CDS:1.20
--- src/sys/arch/evbppc/conf/MPC8548CDS:1.19	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/MPC8548CDS	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: MPC8548CDS,v 1.19 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: MPC8548CDS,v 1.20 2014/08/17 21:17:43 joerg Exp $
 #
 #	MPC8548CDS -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"MPC8548CDS-$Revision: 1.19 $"
+ident 		"MPC8548CDS-$Revision: 1.20 $"
 
 maxusers	32
 
@@ -42,7 +42,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=410000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/OPENBLOCKS200
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS200:1.41 src/sys/arch/evbppc/conf/OPENBLOCKS200:1.42
--- src/sys/arch/evbppc/conf/OPENBLOCKS200:1.41	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/OPENBLOCKS200	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS200,v 1.41 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: OPENBLOCKS200,v 1.42 2014/08/17 21:17:43 joerg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -39,7 +39,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=410000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/OPENBLOCKS266
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266:1.67 src/sys/arch/evbppc/conf/OPENBLOCKS266:1.68
--- src/sys/arch/evbppc/conf/OPENBLOCKS266:1.67	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266,v 1.67 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: OPENBLOCKS266,v 1.68 2014/08/17 21:17:43 joerg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.obs266"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"OPENBLOCKS266-$Revision: 1.67 $"
+#ident 		"OPENBLOCKS266-$Revision: 1.68 $"
 
 maxusers	32
 
@@ -42,7 +42,7 @@ options 	DEBUG			# expensive debugging c
 options 	DDB			# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=666000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"		# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/OPENBLOCKS600
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS600:1.17 src/sys/arch/evbppc/conf/OPENBLOCKS600:1.18
--- src/sys/arch/evbppc/conf/OPENBLOCKS600:1.17	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/OPENBLOCKS600	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS600,v 1.17 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: OPENBLOCKS600,v 1.18 2014/08/17 21:17:43 joerg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.obs600"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"OPENBLOCKS600-$Revision: 1.17 $"
+#ident 		"OPENBLOCKS600-$Revision: 1.18 $"
 
 maxusers	32
 
@@ -42,7 +42,7 @@ options 	DEBUG			# expensive debugging c
 options 	DDB			# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=430000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"		# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/P2020DS
diff -u src/sys/arch/evbppc/conf/P2020DS:1.22 src/sys/arch/evbppc/conf/P2020DS:1.23
--- src/sys/arch/evbppc/conf/P2020DS:1.22	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/P2020DS	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: P2020DS,v 1.22 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: P2020DS,v 1.23 2014/08/17 21:17:43 joerg Exp $
 #
 #	P2020DS -- everything that's currently supported
 #
@@ -8,7 +8,7 @@ include		"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"P2020DS-$Revision: 1.22 $"
+ident 		"P2020DS-$Revision: 1.23 $"
 
 maxusers	32
 
@@ -46,7 +46,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=435000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 
Index: src/sys/arch/evbppc/conf/VIRTEX_GSRD1
diff -u src/sys/arch/evbppc/conf/VIRTEX_GSRD1:1.22 src/sys/arch/evbppc/conf/VIRTEX_GSRD1:1.23
--- src/sys/arch/evbppc/conf/VIRTEX_GSRD1:1.22	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/VIRTEX_GSRD1	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: VIRTEX_GSRD1,v 1.22 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: VIRTEX_GSRD1,v 1.23 2014/08/17 21:17:43 joerg Exp $
 #
 # VIRTEX_GSRD1
 #
@@ -45,7 +45,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=400000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 options 	MBUFTRACE 	# track mbuf leaks
 options 	KMEMSTATS
 

Index: src/sys/arch/evbppc/conf/P2020RDB
diff -u src/sys/arch/evbppc/conf/P2020RDB:1.23 src/sys/arch/evbppc/conf/P2020RDB:1.24
--- src/sys/arch/evbppc/conf/P2020RDB:1.23	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/P2020RDB	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: P2020RDB,v 1.23 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: P2020RDB,v 1.24 2014/08/17 21:17:43 joerg Exp $
 #
 #	P2020RBD -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"P2020RBD-$Revision: 1.23 $"
+ident 		"P2020RBD-$Revision: 1.24 $"
 
 maxusers	32
 
@@ -42,7 +42,7 @@ options 	DIAGNOSTIC	# cheap kernel consi
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=410000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 
Index: src/sys/arch/evbppc/conf/VIRTEX_GSRD2
diff -u src/sys/arch/evbppc/conf/VIRTEX_GSRD2:1.23 src/sys/arch/evbppc/conf/VIRTEX_GSRD2:1.24
--- src/sys/arch/evbppc/conf/VIRTEX_GSRD2:1.23	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/VIRTEX_GSRD2	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: VIRTEX_GSRD2,v 1.23 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: VIRTEX_GSRD2,v 1.24 2014/08/17 21:17:43 joerg Exp $
 #
 # VIRTEX_GSRD2
 #
@@ -53,7 +53,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=400000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 options 	MBUFTRACE 	# track mbuf leaks
 options 	KMEMSTATS
 

Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.32 src/sys/arch/evbppc/conf/PMPPC:1.33
--- src/sys/arch/evbppc/conf/PMPPC:1.32	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/PMPPC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.32 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: PMPPC,v 1.33 2014/08/17 21:17:43 joerg Exp $
 #
 #	PMPPC
 #
@@ -33,7 +33,7 @@ options 	DIAGNOSTIC	# cheap kernel consi
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=590000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0xff600400,KGDB_DEVRATE=9600

Index: src/sys/arch/evbppc/conf/RB800
diff -u src/sys/arch/evbppc/conf/RB800:1.27 src/sys/arch/evbppc/conf/RB800:1.28
--- src/sys/arch/evbppc/conf/RB800:1.27	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/RB800	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: RB800,v 1.27 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: RB800,v 1.28 2014/08/17 21:17:43 joerg Exp $
 #
 #	RB800 -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"RB800-$Revision: 1.27 $"
+ident 		"RB800-$Revision: 1.28 $"
 
 maxusers	32
 
@@ -43,7 +43,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=410000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/TWRP1025
diff -u src/sys/arch/evbppc/conf/TWRP1025:1.15 src/sys/arch/evbppc/conf/TWRP1025:1.16
--- src/sys/arch/evbppc/conf/TWRP1025:1.15	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/TWRP1025	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TWRP1025,v 1.15 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: TWRP1025,v 1.16 2014/08/17 21:17:43 joerg Exp $
 #
 #	TWRP1025 -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.mpc85xx"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"TWRP1025-$Revision: 1.15 $"
+ident 		"TWRP1025-$Revision: 1.16 $"
 
 maxusers	32
 
@@ -41,7 +41,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=410000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 

Index: src/sys/arch/evbppc/conf/VIRTEX_DFC
diff -u src/sys/arch/evbppc/conf/VIRTEX_DFC:1.24 src/sys/arch/evbppc/conf/VIRTEX_DFC:1.25
--- src/sys/arch/evbppc/conf/VIRTEX_DFC:1.24	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/VIRTEX_DFC	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: VIRTEX_DFC,v 1.24 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: VIRTEX_DFC,v 1.25 2014/08/17 21:17:43 joerg Exp $
 #
 # VIRTEX_DFC
 #
@@ -51,7 +51,7 @@ options 	DEBUG		# expensive debugging ch
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=400000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 options 	MBUFTRACE 	# track mbuf leaks
 options 	KMEMSTATS
 

Index: src/sys/arch/evbppc/conf/WALNUT
diff -u src/sys/arch/evbppc/conf/WALNUT:1.68 src/sys/arch/evbppc/conf/WALNUT:1.69
--- src/sys/arch/evbppc/conf/WALNUT:1.68	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbppc/conf/WALNUT	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: WALNUT,v 1.68 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: WALNUT,v 1.69 2014/08/17 21:17:43 joerg Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -39,7 +39,7 @@ options 	USERCONF	# userconf(4) support
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	TRAP_PANICWAIT
-options 	SYMTAB_SPACE=490000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 makeoptions	DEBUG="-g"	# compile full symbol table
 

Index: src/sys/arch/evbsh3/conf/AP_MS104_SH4
diff -u src/sys/arch/evbsh3/conf/AP_MS104_SH4:1.7 src/sys/arch/evbsh3/conf/AP_MS104_SH4:1.8
--- src/sys/arch/evbsh3/conf/AP_MS104_SH4:1.7	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbsh3/conf/AP_MS104_SH4	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: AP_MS104_SH4,v 1.7 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: AP_MS104_SH4,v 1.8 2014/08/17 21:17:43 joerg Exp $
 #
 #	Alpha project AP-MS104-SH4 config file
 #
@@ -45,7 +45,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	DDB_VERBOSE_HELP
 #makeoptions    DEBUG="-g"      # compile full symbol table
-options 	SYMTAB_SPACE=320000
+makeoptions	COPY_SYMTAB=1
 
 # Compatibility options
 options 	COMPAT_14	# NetBSD 1.4

Index: src/sys/arch/evbsh3/conf/T_SH7706LAN
diff -u src/sys/arch/evbsh3/conf/T_SH7706LAN:1.9 src/sys/arch/evbsh3/conf/T_SH7706LAN:1.10
--- src/sys/arch/evbsh3/conf/T_SH7706LAN:1.9	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbsh3/conf/T_SH7706LAN	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: T_SH7706LAN,v 1.9 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: T_SH7706LAN,v 1.10 2014/08/17 21:17:43 joerg Exp $
 #
 #	TAC T-SH7706LAN Rev.3 config file
 #
@@ -39,7 +39,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	DDB_VERBOSE_HELP
 #makeoptions    DEBUG="-g"      # compile full symbol table
-options 	SYMTAB_SPACE=320000
+makeoptions	COPY_SYMTAB=1
 
 # Compatibility options
 options 	COMPAT_14	# NetBSD 1.4

Index: src/sys/arch/evbsh3/conf/T_SH7706LSR
diff -u src/sys/arch/evbsh3/conf/T_SH7706LSR:1.11 src/sys/arch/evbsh3/conf/T_SH7706LSR:1.12
--- src/sys/arch/evbsh3/conf/T_SH7706LSR:1.11	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/evbsh3/conf/T_SH7706LSR	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: T_SH7706LSR,v 1.11 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: T_SH7706LSR,v 1.12 2014/08/17 21:17:43 joerg Exp $
 #
 #	TAC T-SH7706LSR Rev.1 config file
 #
@@ -39,7 +39,7 @@ options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #options 	DDB_VERBOSE_HELP
 #makeoptions    DEBUG="-g"      # compile full symbol table
-options 	SYMTAB_SPACE=320000
+makeoptions	COPY_SYMTAB=1
 
 # Compatibility options
 options 	COMPAT_14	# NetBSD 1.4

Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.112 src/sys/arch/i386/i386/locore.S:1.113
--- src/sys/arch/i386/i386/locore.S:1.112	Thu Feb 20 18:19:10 2014
+++ src/sys/arch/i386/i386/locore.S	Sun Aug 17 21:17:43 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.112 2014/02/20 18:19:10 dsl Exp $	*/
+/*	$NetBSD: locore.S,v 1.113 2014/08/17 21:17:43 joerg Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -129,7 +129,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.112 2014/02/20 18:19:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.113 2014/08/17 21:17:43 joerg Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_ddb.h"
@@ -184,7 +184,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(SYMTAB_SPACE)
+#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(COPY_SYMTAB)
 	.ascii	",BSD_SYMTAB=yes"
 #endif
 	.byte	0
@@ -544,7 +544,7 @@ try586:	/* Use the `cpuid' instruction. 
 	/* Find end of kernel image. */
 	movl	$RELOC(end),%edi
 
-#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(SYMTAB_SPACE)
+#if (NKSYMS || defined(DDB) || defined(MODULAR)) && !defined(COPY_SYMTAB)
 	/* Save the symbols (if loaded). */
 	movl	RELOC(esym),%eax
 	testl	%eax,%eax

Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.84 src/sys/arch/iyonix/conf/GENERIC:1.85
--- src/sys/arch/iyonix/conf/GENERIC:1.84	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/iyonix/conf/GENERIC	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.84 2014/08/16 17:56:32 apb Exp $
+#	$NetBSD: GENERIC,v 1.85 2014/08/17 21:17:44 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/iyonix/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.84 $"
+#ident 		"GENERIC-$Revision: 1.85 $"
 
 maxusers	32		# estimated number of users
 
@@ -86,7 +86,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	KGDB		# remote debugger
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=630000
+makeoptions	COPY_SYMTAB=1
 options 	PERFCTRS	# performance counters
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages

Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.114 src/sys/arch/luna68k/conf/GENERIC:1.115
--- src/sys/arch/luna68k/conf/GENERIC:1.114	Sat Aug 16 17:56:32 2014
+++ src/sys/arch/luna68k/conf/GENERIC	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.114 2014/08/16 17:56:32 apb Exp $
+# $NetBSD: GENERIC,v 1.115 2014/08/17 21:17:44 joerg Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/luna68k/conf/std.luna68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.114 $"
+#ident 		"GENERIC-$Revision: 1.115 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -55,7 +55,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 # Debugging options
 options 	DDB
 #options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
-#options 	SYMTAB_SPACE=448000	# place DDB symbols in data segment
+#makeoptions	COPY_SYMTAB=1	# place DDB symbols in data segment
 #options 	DEBUG			# extra kernel debugging support
 #options 	DIAGNOSTIC		# extra kernel sanity checking
 #options 	SCSIVERBOSE		# Verbose SCSI errors

Index: src/sys/arch/luna68k/conf/INSTALL
diff -u src/sys/arch/luna68k/conf/INSTALL:1.17 src/sys/arch/luna68k/conf/INSTALL:1.18
--- src/sys/arch/luna68k/conf/INSTALL:1.17	Sat Aug 16 17:57:37 2014
+++ src/sys/arch/luna68k/conf/INSTALL	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.17 2014/08/16 17:57:37 apb Exp $
+# $NetBSD: INSTALL,v 1.18 2014/08/17 21:17:44 joerg Exp $
 #
 # config for installation ramdisk kernel
 # 
@@ -36,7 +36,7 @@ options 	PIPE_SOCKETPAIR		# smaller, but
 # Debugging options
 #options 	DDB
 #options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
-#options 	SYMTAB_SPACE=72000	# place DDB symbols in data segment
+#makeoptions	COPY_SYMTAB=1	# place DDB symbols in data segment
 #options 	DEBUG			# extra kernel debugging support
 #options 	DIAGNOSTIC		# extra kernel sanity checking
 #options 	SCSIVERBOSE		# Verbose SCSI errors

Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.347 src/sys/arch/mac68k/mac68k/machdep.c:1.348
--- src/sys/arch/mac68k/mac68k/machdep.c:1.347	Mon Mar 24 20:06:32 2014
+++ src/sys/arch/mac68k/mac68k/machdep.c	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.347 2014/03/24 20:06:32 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.348 2014/08/17 21:17:44 joerg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.347 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.348 2014/08/17 21:17:44 joerg Exp $");
 
 #include "opt_adb.h"
 #include "opt_ddb.h"
@@ -961,7 +961,7 @@ getenvvars(u_long flag, char *buf)
 	 * Get end of symbols for kernel debugging
 	 */
 	esym = (int *)getenv("END_SYM");
-#ifndef SYMTAB_SPACE
+#ifndef COPY_SYMTAB
 	if (esym == (int *)0)
 #endif
 		esym = (int *)&end;

Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.122 src/sys/arch/netwinder/conf/GENERIC:1.123
--- src/sys/arch/netwinder/conf/GENERIC:1.122	Sat Aug 16 17:56:33 2014
+++ src/sys/arch/netwinder/conf/GENERIC	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2014/08/16 17:56:33 apb Exp $
+# $NetBSD: GENERIC,v 1.123 2014/08/17 21:17:44 joerg Exp $
 #
 # GENERIC machine description file
 # 
@@ -165,7 +165,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 makeoptions	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=650000
+makeoptions	COPY_SYMTAB=1
 
 config		netbsd	root on ? type ?
 

Index: src/sys/arch/sbmips/conf/GENERIC
diff -u src/sys/arch/sbmips/conf/GENERIC:1.97 src/sys/arch/sbmips/conf/GENERIC:1.98
--- src/sys/arch/sbmips/conf/GENERIC:1.97	Sat Aug 16 17:56:33 2014
+++ src/sys/arch/sbmips/conf/GENERIC	Sun Aug 17 21:17:44 2014
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.97 2014/08/16 17:56:33 apb Exp $
+# $NetBSD: GENERIC,v 1.98 2014/08/17 21:17:44 joerg Exp $
 
 include 	"arch/sbmips/conf/std.sbmips"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.97 $"
+#ident 		"GENERIC-$Revision: 1.98 $"
 
 #options 	LOCKDEBUG	# XXX XXX XXX XXX
 #options 	DEBUG		# extra kernel debugging support
@@ -32,7 +32,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 options 	DDB		# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100 # enable history editing in DDB
 #makeoptions 	DEBUG="-g"	# compile full symbol table
-options 	SYMTAB_SPACE=390000	# size for embedded symbol table
+makeoptions	COPY_SYMTAB=1	# size for embedded symbol table
 
 # Compatibility options
 options 	COMPAT_43	# compatibility with 4.3BSD binaries

Index: src/sys/arch/sbmips/conf/GENERIC.MP
diff -u src/sys/arch/sbmips/conf/GENERIC.MP:1.2 src/sys/arch/sbmips/conf/GENERIC.MP:1.3
--- src/sys/arch/sbmips/conf/GENERIC.MP:1.2	Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/conf/GENERIC.MP	Sun Aug 17 21:17:44 2014
@@ -6,6 +6,6 @@ options 	LOCKDEBUG
 
 pseudo-device	lockstat
 
-no options	SYMTAB_SPACE
-options		SYMTAB_SPACE=640000
+no makeoptions	COPY_SYMTAB
+makeoptions	COPY_SYMTAB=1
 
Index: src/sys/arch/sbmips/conf/GENERIC64
diff -u src/sys/arch/sbmips/conf/GENERIC64:1.2 src/sys/arch/sbmips/conf/GENERIC64:1.3
--- src/sys/arch/sbmips/conf/GENERIC64:1.2	Mon Dec 14 00:46:11 2009
+++ src/sys/arch/sbmips/conf/GENERIC64	Sun Aug 17 21:17:44 2014
@@ -5,6 +5,6 @@ makeoptions	LP64="yes"
 options 	EXEC_ELF64
 options 	COMPAT_NETBSD32
 
-no options	SYMTAB_SPACE
-options		SYMTAB_SPACE=640000
+no makeoptions	COPY_SYMTAB
+makeoptions	COPY_SYMTAB=1
 
Index: src/sys/arch/sbmips/conf/GENERIC64.MP
diff -u src/sys/arch/sbmips/conf/GENERIC64.MP:1.2 src/sys/arch/sbmips/conf/GENERIC64.MP:1.3
--- src/sys/arch/sbmips/conf/GENERIC64.MP:1.2	Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/conf/GENERIC64.MP	Sun Aug 17 21:17:44 2014
@@ -6,6 +6,6 @@ options 	LOCKDEBUG
 
 pseudo-device	lockstat
 
-no options	SYMTAB_SPACE
-options		SYMTAB_SPACE=640000
+no makeoptions	COPY_SYMTAB
+makeoptions	COPY_SYMTAB=1
 

Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.116 src/sys/arch/shark/conf/GENERIC:1.117
--- src/sys/arch/shark/conf/GENERIC:1.116	Sat Aug 16 17:56:33 2014
+++ src/sys/arch/shark/conf/GENERIC	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.116 2014/08/16 17:56:33 apb Exp $
+#	$NetBSD: GENERIC,v 1.117 2014/08/17 21:17:44 joerg Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.116 $"
+#ident		"GENERIC-$Revision: 1.117 $"
 
 # estimated number of users
 maxusers	32
@@ -155,7 +155,7 @@ options 	MODULAR		# new style module(7) 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 options 	DDB		# in-kernel debugger
-options 	SYMTAB_SPACE=750000 	# reserve symbol space for DDB
+makeoptions	COPY_SYMTAB=1 	# reserve symbol space for DDB
 				# (needed because we boot netbsd.aout)
 #options 	DDB_ONPANIC=0	# don't run DDB at panictime
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.20 src/sys/arch/usermode/conf/GENERIC.common:1.21
--- src/sys/arch/usermode/conf/GENERIC.common:1.20	Sat Aug 16 17:56:34 2014
+++ src/sys/arch/usermode/conf/GENERIC.common	Sun Aug 17 21:17:44 2014
@@ -1,14 +1,14 @@
-# $NetBSD: GENERIC.common,v 1.20 2014/08/16 17:56:34 apb Exp $
+# $NetBSD: GENERIC.common,v 1.21 2014/08/17 21:17:44 joerg Exp $
 
 include "arch/usermode/conf/std.usermode"
 
 options 	INCLUDE_CONFIG_FILE
-#ident 		"GENERIC-$Revision: 1.20 $"
+#ident 		"GENERIC-$Revision: 1.21 $"
 maxusers 	32
 
 makeoptions	DEBUG="-O1 -g3"
 
-options 	SYMTAB_SPACE=450000
+makeoptions	COPY_SYMTAB=1
 
 options 	RTC_OFFSET=0
 options 	NTP

Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.58 src/sys/arch/zaurus/conf/GENERIC:1.59
--- src/sys/arch/zaurus/conf/GENERIC:1.58	Sat Aug 16 17:56:34 2014
+++ src/sys/arch/zaurus/conf/GENERIC	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.58 2014/08/16 17:56:34 apb Exp $
+#	$NetBSD: GENERIC,v 1.59 2014/08/17 21:17:44 joerg Exp $
 #
 # GENERIC machine description file
 #
@@ -167,7 +167,7 @@ options 	DDB			# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB
 #makeoptions 	DEBUG="-g"		# compile full symbol table
-options 	SYMTAB_SPACE=640000
+makeoptions	COPY_SYMTAB=1
 
 
 # Kernel root file system and dump configuration.

Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.23 src/sys/arch/zaurus/conf/INSTALL:1.24
--- src/sys/arch/zaurus/conf/INSTALL:1.23	Sat Aug 16 17:57:02 2014
+++ src/sys/arch/zaurus/conf/INSTALL	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.23 2014/08/16 17:57:02 apb Exp $
+# $NetBSD: INSTALL,v 1.24 2014/08/17 21:17:44 joerg Exp $
 #
 # INSTALL config file (GENERIC with memory disk root)
 #
@@ -65,7 +65,7 @@ options 		RASOPS_SMALL
 no options 		DIAGNOSTIC
 no options 		DDB
 no options 		DDB_HISTORY_SIZE
-no options 		SYMTAB_SPACE
+no makeoptions	COPY_SYMTAB
 
 no zrc0 at pxaip?
 

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.169 src/sys/conf/Makefile.kern.inc:1.170
--- src/sys/conf/Makefile.kern.inc:1.169	Fri Aug  8 14:42:58 2014
+++ src/sys/conf/Makefile.kern.inc	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.169 2014/08/08 14:42:58 joerg Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.170 2014/08/17 21:17:44 joerg Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -214,10 +214,8 @@ ${_cfile:T:R}.o: ${_cfile}
 ## depending on the value of DEBUG.
 ##
 # load lines for config "xxx" will be emitted as:
-# xxx: ${SYSTEM_DEP} swapxxx.o
-#	${SYSTEM_LD_HEAD}
-#	${SYSTEM_LD} swapxxx.o
-#	${SYSTEM_LD_TAIL}
+# xxx: ${SYSTEM_DEP} swapxxxx.o vers.o build_kernel
+
 SYSTEM_OBJ?=	${MD_OBJS} ${MI_OBJS} ${OBJS:O} ${SYSLIBCOMPAT} ${LIBKERN}
 SYSTEM_DEP+=	Makefile ${SYSTEM_OBJ:O} .gdbinit
 .if defined(KERNLDSCRIPT)
@@ -234,34 +232,6 @@ SYSTEM_LD?=	@${_MKSHMSG} "   link  ${.CU
 		${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
 		${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
 
-AUTO_SYMTAB_SPACE?=   yes
-
-.if empty(AUTO_SYMTAB_SPACE:M[Yy][Ee][Ss]) || defined(_SYMTAB_SPACE_ADJUSTED)
-SYSTEM_LD_TAIL_DBSYM?=	true
-.else
-SYSTEM_LD_TAIL_DBSYM?=	\
-	if grep '^\#define.*SYMTAB_SPACE' opt_ksyms.h > /dev/null; then \
-		_modify_opt_ksyms_h () {				\
-			${TOOL_SED}					\
-	-e 's/^\(\#define.*SYMTAB_SPACE[ 	]*\)[0-9]*/\1'$$1/	\
-	-e 's/\(.equiv[ 	]*_KERNEL_OPT_SYMTAB_SPACE,0x\)[0-9a-f]*/\1'$$(printf %x $$1)/ \
-			opt_ksyms.h > opt_ksyms.h.ADJ &&		\
-			mv opt_ksyms.h.ADJ opt_ksyms.h &&		\
-			${MAKE} ${MFLAGS} _SYMTAB_SPACE_ADJUSTED=1 $@;	\
-		};							\
-		_adj_symtab_space () {				\
-			set -- $$(${DBSYM} -p $@); 		\
-			echo Symtab size: $$1, space: $$2;	\
-			if [ "$$1" -gt "$$2" ]; then		\
-				echo Adjusting symtab space;	\
-				rm -f $@;			\
-				_modify_opt_ksyms_h $$1;	\
-			fi;					\
-		};						\
-		_adj_symtab_space;				\
-	fi
-.endif
-
 TEXTADDR?=	${LOADADDRESS}			# backwards compatibility
 LINKTEXT?=	${TEXTADDR:C/.+/-Ttext &/}
 LINKDATA?=	${DATAADDR:C/.+/-Tdata &/}
@@ -272,23 +242,13 @@ LINKFLAGS?=	${LINKFORMAT} ${LINKTEXT} ${
 
 LINKFLAGS_DEBUG?=	-X
 
-#
-# If we're relinking due to _SYMTAB_SPACE_ADJUSTED then don't perform
-# SYSTEM_LD_TAIL{,_DEBUG}. They'll be done in the parent invocation.
-#
-.if defined(_SYMTAB_SPACE_ADJUSTED)
-SYSTEM_LD_TAIL?=true
-SYSTEM_LD_TAIL_DEBUG?=true
-.else
-SYSTEM_LD_TAIL?=@${SYSTEM_LD_TAIL_DBSYM} ; \
-		${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \
+SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \
 		${SIZE} $@; chmod 755 $@; \
 		${SYSTEM_CTFMERGE}
 SYSTEM_LD_TAIL_DEBUG?=; \
 		echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
 		echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
 		${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
-.endif
 LINKFLAGS_NORMAL?=	-S
 STRIPFLAGS?=	-g
 
@@ -298,31 +258,17 @@ SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_DEBUG}
 LINKFLAGS+=	${LINKFLAGS_DEBUG}
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gdb@}
 CTFFLAGS+=	-g
-.if !defined(_SYMTAB_SPACE_ADJUSTED)
-SYSTEM_LD_TAIL+=; \
-	if grep '^\#define.*SYMTAB_SPACE' opt_ksyms.h > /dev/null; then \
-		echo "${DBSYM} $@.gdb"; \
-		${DBSYM} $@.gdb || (rm -f $@ ; exit 1) || exit 1; \
-	fi
-.endif
 .elifndef PROF
 LINKFLAGS+=	${LINKFLAGS_NORMAL}
 .endif
 
-#
-# More steps to skip if we're relinking due to _SYMTAB_SPACE_ADJUSTED (see
-# above)
-#
-.if !defined(_SYMTAB_SPACE_ADJUSTED)
-SYSTEM_LD_TAIL+=; \
-	if grep '^\#define.*SYMTAB_SPACE' opt_ksyms.h > /dev/null; then \
-		echo "${DBSYM} $@"; \
-		${DBSYM} $@ || (rm -f $@ ; exit 1) || exit 1; \
-	fi
-
 SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
-SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_EXTRA}
+SYSTEM_LD_TAIL_STAGE1=	${SYSTEM_LD_TAIL}
+SYSTEM_LD_TAIL_STAGE2=	${SYSTEM_LD_TAIL}
+.if defined(COPY_SYMTAB})
+SYSTEM_LD_TAIL_STAGE2+=	; echo ${DBSYM} $@; ${DBSYM} $@
 .endif
+SYSTEM_LD_TAIL_STAGE2+=	${SYSTEM_LD_TAIL_EXTRA}
 
 ##
 ## (6) port independent targets and dependencies: assym.h, vers.o
@@ -584,6 +530,35 @@ 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}
+	${SYSTEM_LD} swap${.TARGET}.o
+	${SYSTEM_LD_TAIL_STAGE2}
+.else
+build_kernel: .USE
+	${CC} ${CFLAGS} ${CPPFLAGS} -DCOPY_SYMTAB \
+	    -c $S/kern/kern_ksyms_buf.c -o kern_ksyms_buf.o
+	${SYSTEM_LD_HEAD}
+	${SYSTEM_LD} swap${.TARGET}.o kern_ksyms_buf.o
+	${SYSTEM_LD_TAIL_STAGE1}
+	${CC} ${CFLAGS} ${CPPFLAGS} -DCOPY_SYMTAB \
+	    -DSYMTAB_SPACE=$$(${DBSYM} -P ${.TARGET}) \
+	    -c $S/kern/kern_ksyms_buf.c -o kern_ksyms_buf_real.o
+	${SYSTEM_LD_HEAD}
+	${SYSTEM_LD} swap${.TARGET}.o kern_ksyms_buf_real.o
+	${SYSTEM_LD_TAIL_STAGE2}
+.endif
+
 .include <bsd.files.mk>
 .include <bsd.clang-analyze.mk>
 

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1097 src/sys/conf/files:1.1098
--- src/sys/conf/files:1.1097	Sat Aug 16 17:24:28 2014
+++ src/sys/conf/files	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1097 2014/08/16 17:24:28 apb Exp $
+#	$NetBSD: files,v 1.1098 2014/08/17 21:17:44 joerg Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -1355,7 +1355,6 @@ defpseudodev fss:	disk
 defpseudo pty:		tty
 defpseudo rnd
 defpseudo ksyms
-defparam opt_ksyms.h	SYMTAB_SPACE
 defpseudo nullcons
 defpseudo lockstat
 defpseudo bio:		sysmon_envsys

Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.72 src/sys/kern/kern_ksyms.c:1.73
--- src/sys/kern/kern_ksyms.c:1.72	Fri Jul 25 08:10:40 2014
+++ src/sys/kern/kern_ksyms.c	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_ksyms.c,v 1.72 2014/07/25 08:10:40 dholland Exp $	*/
+/*	$NetBSD: kern_ksyms.c,v 1.73 2014/08/17 21:17:44 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -71,12 +71,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.72 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.73 2014/08/17 21:17:44 joerg Exp $");
 
 #if defined(_KERNEL) && defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #include "opt_dtrace.h"
-#include "opt_ksyms.h"
 #endif
 
 #define _KSYMS_PRIVATE
@@ -122,11 +121,11 @@ static void ksyms_sizes_calc(void);
 static int ksyms_debug;
 #endif
 
-#ifdef SYMTAB_SPACE
 #define		SYMTAB_FILLER	"|This is the symbol table!"
 
-char		db_symtab[SYMTAB_SPACE] = SYMTAB_FILLER;
-int		db_symtabsize = SYMTAB_SPACE;
+#ifdef COPY_SYMTAB
+extern char db_symtab[];
+extern int db_symtabsize;
 #endif
 
 /*
@@ -220,7 +219,7 @@ void
 ksyms_init(void)
 {
 
-#ifdef SYMTAB_SPACE
+#ifdef COPY_SYMTAB
 	if (!ksyms_loaded &&
 	    strncmp(db_symtab, SYMTAB_FILLER, sizeof(SYMTAB_FILLER))) {
 		ksyms_addsyms_elf(db_symtabsize, db_symtab,

Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.15 src/usr.bin/config/mkmakefile.c:1.16
--- src/usr.bin/config/mkmakefile.c:1.15	Fri Jun  8 08:56:45 2012
+++ src/usr.bin/config/mkmakefile.c	Sun Aug 17 21:17:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkmakefile.c,v 1.15 2012/06/08 08:56:45 martin Exp $	*/
+/*	$NetBSD: mkmakefile.c,v 1.16 2014/08/17 21:17:44 joerg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -526,15 +526,10 @@ emitload(FILE *fp)
 		swname =
 		    cf->cf_root != NULL ? cf->cf_name : "generic";
 		fprintf(fp, "KERNELS+=%s\n", nm);
-		fprintf(fp, "%s: ${SYSTEM_DEP} swap${.TARGET}.o vers.o", nm);
-		fprintf(fp, "\n"
-			    "\t${SYSTEM_LD_HEAD}\n"
-			    "\t${SYSTEM_LD} swap${.TARGET}.o\n"
-			    "\t${SYSTEM_LD_TAIL}\n"
-			    "\n"
-			    "swap%s.o: swap%s.c\n"
-			    "\t${NORMAL_C}\n\n", swname, swname);
+		fprintf(fp, "%s: ${SYSTEM_DEP} swap%s.o vers.o build_kernel\n",
+			nm, nm);
 	}
+	fputs("\n", fp);
 }
 
 /*

Added files:

Index: src/sys/kern/kern_ksyms_buf.c
diff -u /dev/null src/sys/kern/kern_ksyms_buf.c:1.1
--- /dev/null	Sun Aug 17 21:17:45 2014
+++ src/sys/kern/kern_ksyms_buf.c	Sun Aug 17 21:17:44 2014
@@ -0,0 +1,10 @@
+#define		SYMTAB_FILLER	"|This is the symbol table!"
+
+#ifdef COPY_SYMTAB
+#ifndef SYMTAB_SPACE
+char		db_symtab[] = SYMTAB_FILLER;
+#else
+char		db_symtab[SYMTAB_SPACE] = SYMTAB_FILLER;
+#endif
+int		db_symtabsize = sizeof(db_symtab);
+#endif