Hi all,
attached is a first step toward a new handling of the symbol table
embedding. The patch currently always links the kernel twice, but I plan
to refine it in a second step, so that size of the first step is
estimated based on either the default kernel or the last round and to
skip the relink if the estimation matches. I would prefer to make that
an incremental improvement though.
Joerg
Index: external/gpl3/binutils/usr.sbin/dbsym/dbsym.8
===================================================================
RCS file: /home/joerg/repo/netbsd/src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.8,v
retrieving revision 1.3
diff -u -p -r1.3 dbsym.8
--- external/gpl3/binutils/usr.sbin/dbsym/dbsym.8 19 Mar 2012 09:13:33 -0000 1.3
+++ external/gpl3/binutils/usr.sbin/dbsym/dbsym.8 14 Aug 2014 20:42:14 -0000
@@ -1,6 +1,6 @@
.\" $NetBSD: dbsym.8,v 1.3 2012/03/19 09:13:33 wiz Exp $
.\"
-.Dd March 19, 2012
+.Dd August 14, 2014
.Dt DBSYM 8
.Os
.Sh NAME
@@ -8,7 +8,7 @@
.Nd copy kernel symbol table into db_symtab space
.Sh SYNOPSIS
.Nm
-.Op Fl pv
+.Op Fl pPv
.Op Fl b Ar bfdname
.Ar kernel
.Sh DESCRIPTION
@@ -42,6 +42,12 @@ db_symtab space.
Two values are printed out in a line separated by a space.
.Pp
If the
+.Fl P
+flag is given,
+.Nm
+will report the size of the kernel symbol table.
+.Pp
+If the
.Fl v
flag is given,
.Nm
Index: external/gpl3/binutils/usr.sbin/dbsym/dbsym.c
===================================================================
RCS file: /home/joerg/repo/netbsd/src/external/gpl3/binutils/usr.sbin/dbsym/dbsym.c,v
retrieving revision 1.3
diff -u -p -r1.3 dbsym.c
--- external/gpl3/binutils/usr.sbin/dbsym/dbsym.c 19 Mar 2012 09:14:15 -0000 1.3
+++ external/gpl3/binutils/usr.sbin/dbsym/dbsym.c 14 Aug 2014 20:41:40 -0000
@@ -76,6 +76,7 @@ int load_symtab(bfd *, int fd, char **,
int verbose;
int printsize;
+int printsize2;
int
main(int argc, char **argv)
@@ -91,7 +92,7 @@ main(int argc, char **argv)
setprogname(argv[0]);
bfdname = NULL;
- while ((ch = getopt(argc, argv, "b:pv")) != -1)
+ while ((ch = getopt(argc, argv, "b:pPv")) != -1)
switch (ch) {
case 'b':
bfdname = optarg;
@@ -102,6 +103,9 @@ main(int argc, char **argv)
case 'p':
printsize = 1;
break;
+ case 'P':
+ printsize2 = 1;
+ break;
case '?':
default:
usage();
@@ -158,6 +162,10 @@ main(int argc, char **argv)
printf("%d %d\n", symtabsize, symtab_space);
goto done;
}
+ if (printsize2) {
+ printf("%d\n", symtabsize);
+ goto done;
+ }
if (symtabsize > symtab_space)
errx(1, "symbol table (%u bytes) too big for buffer (%u bytes)\n"
Index: sys/arch/aarch64/conf/Makefile.aarch64
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/aarch64/conf/Makefile.aarch64,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.aarch64
--- sys/arch/aarch64/conf/Makefile.aarch64 14 Aug 2014 18:39:39 -0000 1.2
+++ sys/arch/aarch64/conf/Makefile.aarch64 14 Aug 2014 19:55:10 -0000
@@ -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: sys/arch/acorn32/conf/EB7500ATX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/acorn32/conf/EB7500ATX,v
retrieving revision 1.55
diff -u -p -r1.55 EB7500ATX
--- sys/arch/acorn32/conf/EB7500ATX 30 Jun 2013 21:38:55 -0000 1.55
+++ sys/arch/acorn32/conf/EB7500ATX 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/algor/conf/P4032
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P4032,v
retrieving revision 1.70
diff -u -p -r1.70 P4032
--- sys/arch/algor/conf/P4032 20 Jul 2014 10:06:10 -0000 1.70
+++ sys/arch/algor/conf/P4032 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/algor/conf/P5064
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P5064,v
retrieving revision 1.80
diff -u -p -r1.80 P5064
--- sys/arch/algor/conf/P5064 20 Jul 2014 10:06:10 -0000 1.80
+++ sys/arch/algor/conf/P5064 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/algor/conf/P5064-64
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P5064-64,v
retrieving revision 1.4
diff -u -p -r1.4 P5064-64
--- sys/arch/algor/conf/P5064-64 5 Feb 2012 19:30:42 -0000 1.4
+++ sys/arch/algor/conf/P5064-64 14 Aug 2014 22:32:40 -0000
@@ -7,6 +7,6 @@ include "arch/algor/conf/P5064"
include "arch/algor/conf/std.algor64"
-no options SYMTAB_SPACE
-options SYMTAB_SPACE=620000
+no makeoptions COPY_SYMTAB
+makeoptions COPY_SYMTAB=1
#ident "P5064-64-$Revision: 1.4 $"
Index: sys/arch/algor/conf/P6032
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/algor/conf/P6032,v
retrieving revision 1.71
diff -u -p -r1.71 P6032
--- sys/arch/algor/conf/P6032 20 Jul 2014 10:06:10 -0000 1.71
+++ sys/arch/algor/conf/P6032 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/amd64/amd64/locore.S
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/amd64/amd64/locore.S,v
retrieving revision 1.76
diff -u -p -r1.76 locore.S
--- sys/arch/amd64/amd64/locore.S 16 May 2014 00:48:41 -0000 1.76
+++ sys/arch/amd64/amd64/locore.S 14 Aug 2014 22:16:09 -0000
@@ -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: sys/arch/arm/conf/Makefile.arm
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/arm/conf/Makefile.arm,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile.arm
--- sys/arch/arm/conf/Makefile.arm 14 Aug 2014 20:59:54 -0000 1.44
+++ sys/arch/arm/conf/Makefile.arm 14 Aug 2014 20:59:58 -0000
@@ -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: sys/arch/cats/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/cats/conf/GENERIC,v
retrieving revision 1.150
diff -u -p -r1.150 GENERIC
--- sys/arch/cats/conf/GENERIC 3 Aug 2014 08:53:56 -0000 1.150
+++ sys/arch/cats/conf/GENERIC 14 Aug 2014 22:33:10 -0000
@@ -187,7 +187,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: sys/arch/dreamcast/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/dreamcast/conf/GENERIC,v
retrieving revision 1.115
diff -u -p -r1.115 GENERIC
--- sys/arch/dreamcast/conf/GENERIC 30 Jun 2013 21:38:56 -0000 1.115
+++ sys/arch/dreamcast/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/epoc32/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/epoc32/conf/GENERIC,v
retrieving revision 1.3
diff -u -p -r1.3 GENERIC
--- sys/arch/epoc32/conf/GENERIC 3 Aug 2014 08:53:56 -0000 1.3
+++ sys/arch/epoc32/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/ADI_BRH
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ADI_BRH,v
retrieving revision 1.66
diff -u -p -r1.66 ADI_BRH
--- sys/arch/evbarm/conf/ADI_BRH 3 Aug 2014 08:53:56 -0000 1.66
+++ sys/arch/evbarm/conf/ADI_BRH 14 Aug 2014 22:31:33 -0000
@@ -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=600000
+makeoptions COPY_SYMTAB=1
config netbsd root on ? type ?
config netbsd-fxp0 root on fxp0 type nfs
Index: sys/arch/evbarm/conf/ARMADAXP
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ARMADAXP,v
retrieving revision 1.12
diff -u -p -r1.12 ARMADAXP
--- sys/arch/evbarm/conf/ARMADAXP 3 Aug 2014 08:53:56 -0000 1.12
+++ sys/arch/evbarm/conf/ARMADAXP 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/ARMADILLO210
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ARMADILLO210,v
retrieving revision 1.31
diff -u -p -r1.31 ARMADILLO210
--- sys/arch/evbarm/conf/ARMADILLO210 3 Aug 2014 08:53:56 -0000 1.31
+++ sys/arch/evbarm/conf/ARMADILLO210 14 Aug 2014 22:33:10 -0000
@@ -123,7 +123,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: sys/arch/evbarm/conf/ARMADILLO9
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ARMADILLO9,v
retrieving revision 1.45
diff -u -p -r1.45 ARMADILLO9
--- sys/arch/evbarm/conf/ARMADILLO9 3 Aug 2014 08:53:56 -0000 1.45
+++ sys/arch/evbarm/conf/ARMADILLO9 14 Aug 2014 22:31:33 -0000
@@ -123,7 +123,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: sys/arch/evbarm/conf/BCM5301X
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/BCM5301X,v
retrieving revision 1.19
diff -u -p -r1.19 BCM5301X
--- sys/arch/evbarm/conf/BCM5301X 3 Aug 2014 08:53:56 -0000 1.19
+++ sys/arch/evbarm/conf/BCM5301X 14 Aug 2014 22:31:33 -0000
@@ -153,7 +153,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: sys/arch/evbarm/conf/BCM56340
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/BCM56340,v
retrieving revision 1.4
diff -u -p -r1.4 BCM56340
--- sys/arch/evbarm/conf/BCM56340 3 Aug 2014 08:53:56 -0000 1.4
+++ sys/arch/evbarm/conf/BCM56340 14 Aug 2014 22:31:33 -0000
@@ -153,7 +153,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: sys/arch/evbarm/conf/BEAGLEBOARD
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/BEAGLEBOARD,v
retrieving revision 1.54
diff -u -p -r1.54 BEAGLEBOARD
--- sys/arch/evbarm/conf/BEAGLEBOARD 3 Aug 2014 08:53:56 -0000 1.54
+++ sys/arch/evbarm/conf/BEAGLEBOARD 14 Aug 2014 22:31:33 -0000
@@ -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=800000
+makeoptions COPY_SYMTAB=1
## USB Debugging options
options USB_DEBUG
Index: sys/arch/evbarm/conf/BEAGLEBOARDXM
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/BEAGLEBOARDXM,v
retrieving revision 1.14
diff -u -p -r1.14 BEAGLEBOARDXM
--- sys/arch/evbarm/conf/BEAGLEBOARDXM 3 Aug 2014 08:53:56 -0000 1.14
+++ sys/arch/evbarm/conf/BEAGLEBOARDXM 14 Aug 2014 22:31:33 -0000
@@ -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=530000
+makeoptions COPY_SYMTAB=1
## USB Debugging options
options USB_DEBUG
Index: sys/arch/evbarm/conf/BEAGLEBONE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/BEAGLEBONE,v
retrieving revision 1.24
diff -u -p -r1.24 BEAGLEBONE
--- sys/arch/evbarm/conf/BEAGLEBONE 3 Aug 2014 08:53:56 -0000 1.24
+++ sys/arch/evbarm/conf/BEAGLEBONE 14 Aug 2014 22:31:33 -0000
@@ -137,7 +137,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: sys/arch/evbarm/conf/CP3100
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/CP3100,v
retrieving revision 1.39
diff -u -p -r1.39 CP3100
--- sys/arch/evbarm/conf/CP3100 3 Aug 2014 08:53:56 -0000 1.39
+++ sys/arch/evbarm/conf/CP3100 14 Aug 2014 22:31:33 -0000
@@ -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=640000
+makeoptions COPY_SYMTAB=1
config netbsd root on ? type ?
config netbsd-wm0 root on wm0 type nfs
Index: sys/arch/evbarm/conf/CUBIEBOARD
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/CUBIEBOARD,v
retrieving revision 1.12
diff -u -p -r1.12 CUBIEBOARD
--- sys/arch/evbarm/conf/CUBIEBOARD 3 Aug 2014 08:53:56 -0000 1.12
+++ sys/arch/evbarm/conf/CUBIEBOARD 14 Aug 2014 22:31:33 -0000
@@ -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=820000
+makeoptions COPY_SYMTAB=1
## USB Debugging options
options USB_DEBUG
Index: sys/arch/evbarm/conf/DNS323
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/DNS323,v
retrieving revision 1.6
diff -u -p -r1.6 DNS323
--- sys/arch/evbarm/conf/DNS323 27 Jul 2014 03:34:41 -0000 1.6
+++ sys/arch/evbarm/conf/DNS323 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/GEMINI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GEMINI,v
retrieving revision 1.28
diff -u -p -r1.28 GEMINI
--- sys/arch/evbarm/conf/GEMINI 3 Aug 2014 08:53:56 -0000 1.28
+++ sys/arch/evbarm/conf/GEMINI 14 Aug 2014 22:33:43 -0000
@@ -122,7 +122,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: sys/arch/evbarm/conf/GEMINI_MASTER
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GEMINI_MASTER,v
retrieving revision 1.28
diff -u -p -r1.28 GEMINI_MASTER
--- sys/arch/evbarm/conf/GEMINI_MASTER 3 Aug 2014 08:53:56 -0000 1.28
+++ sys/arch/evbarm/conf/GEMINI_MASTER 14 Aug 2014 22:33:43 -0000
@@ -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: sys/arch/evbarm/conf/GEMINI_SLAVE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GEMINI_SLAVE,v
retrieving revision 1.28
diff -u -p -r1.28 GEMINI_SLAVE
--- sys/arch/evbarm/conf/GEMINI_SLAVE 3 Aug 2014 08:53:56 -0000 1.28
+++ sys/arch/evbarm/conf/GEMINI_SLAVE 14 Aug 2014 22:33:43 -0000
@@ -122,7 +122,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: sys/arch/evbarm/conf/GOLDENGATE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GOLDENGATE,v
retrieving revision 1.7
diff -u -p -r1.7 GOLDENGATE
--- sys/arch/evbarm/conf/GOLDENGATE 3 Aug 2014 08:53:56 -0000 1.7
+++ sys/arch/evbarm/conf/GOLDENGATE 14 Aug 2014 22:31:33 -0000
@@ -149,7 +149,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: sys/arch/evbarm/conf/GUMSTIX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/GUMSTIX,v
retrieving revision 1.81
diff -u -p -r1.81 GUMSTIX
--- sys/arch/evbarm/conf/GUMSTIX 3 Aug 2014 08:53:56 -0000 1.81
+++ sys/arch/evbarm/conf/GUMSTIX 14 Aug 2014 22:31:33 -0000
@@ -158,7 +158,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: sys/arch/evbarm/conf/HAWK
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/HAWK,v
retrieving revision 1.3
diff -u -p -r1.3 HAWK
--- sys/arch/evbarm/conf/HAWK 3 Aug 2014 09:18:16 -0000 1.3
+++ sys/arch/evbarm/conf/HAWK 14 Aug 2014 22:33:10 -0000
@@ -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: sys/arch/evbarm/conf/HDL_G
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/HDL_G,v
retrieving revision 1.40
diff -u -p -r1.40 HDL_G
--- sys/arch/evbarm/conf/HDL_G 3 Aug 2014 09:18:16 -0000 1.40
+++ sys/arch/evbarm/conf/HDL_G 14 Aug 2014 22:31:33 -0000
@@ -136,7 +136,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: sys/arch/evbarm/conf/HPT5325
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/HPT5325,v
retrieving revision 1.20
diff -u -p -r1.20 HPT5325
--- sys/arch/evbarm/conf/HPT5325 3 Aug 2014 09:18:16 -0000 1.20
+++ sys/arch/evbarm/conf/HPT5325 14 Aug 2014 22:31:33 -0000
@@ -161,7 +161,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: sys/arch/evbarm/conf/IGEPV2
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IGEPV2,v
retrieving revision 1.23
diff -u -p -r1.23 IGEPV2
--- sys/arch/evbarm/conf/IGEPV2 10 Aug 2014 22:55:29 -0000 1.23
+++ sys/arch/evbarm/conf/IGEPV2 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/IMX23_OLINUXINO
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IMX23_OLINUXINO,v
retrieving revision 1.5
diff -u -p -r1.5 IMX23_OLINUXINO
--- sys/arch/evbarm/conf/IMX23_OLINUXINO 3 Aug 2014 09:18:16 -0000 1.5
+++ sys/arch/evbarm/conf/IMX23_OLINUXINO 14 Aug 2014 22:31:33 -0000
@@ -89,7 +89,7 @@ options COMPAT_NETBSD32 # allow running
options COMPAT_60 # NetBSD 6.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: sys/arch/evbarm/conf/IMX31LITE
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IMX31LITE,v
retrieving revision 1.26
diff -u -p -r1.26 IMX31LITE
--- sys/arch/evbarm/conf/IMX31LITE 3 Aug 2014 09:18:16 -0000 1.26
+++ sys/arch/evbarm/conf/IMX31LITE 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/INTEGRATOR
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/INTEGRATOR,v
retrieving revision 1.76
diff -u -p -r1.76 INTEGRATOR
--- sys/arch/evbarm/conf/INTEGRATOR 3 Aug 2014 09:18:16 -0000 1.76
+++ sys/arch/evbarm/conf/INTEGRATOR 14 Aug 2014 22:31:33 -0000
@@ -130,7 +130,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: sys/arch/evbarm/conf/INTEGRATOR_CP
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/INTEGRATOR_CP,v
retrieving revision 1.6
diff -u -p -r1.6 INTEGRATOR_CP
--- sys/arch/evbarm/conf/INTEGRATOR_CP 3 Aug 2014 09:18:16 -0000 1.6
+++ sys/arch/evbarm/conf/INTEGRATOR_CP 14 Aug 2014 22:31:33 -0000
@@ -130,7 +130,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: sys/arch/evbarm/conf/IQ31244
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IQ31244,v
retrieving revision 1.66
diff -u -p -r1.66 IQ31244
--- sys/arch/evbarm/conf/IQ31244 3 Aug 2014 09:18:16 -0000 1.66
+++ sys/arch/evbarm/conf/IQ31244 14 Aug 2014 22:31:33 -0000
@@ -130,7 +130,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: sys/arch/evbarm/conf/IQ80310
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IQ80310,v
retrieving revision 1.84
diff -u -p -r1.84 IQ80310
--- sys/arch/evbarm/conf/IQ80310 3 Aug 2014 09:18:16 -0000 1.84
+++ sys/arch/evbarm/conf/IQ80310 14 Aug 2014 22:31:33 -0000
@@ -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-fxp0 root on fxp0 type nfs
Index: sys/arch/evbarm/conf/IQ80321
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IQ80321,v
retrieving revision 1.81
diff -u -p -r1.81 IQ80321
--- sys/arch/evbarm/conf/IQ80321 3 Aug 2014 09:18:16 -0000 1.81
+++ sys/arch/evbarm/conf/IQ80321 14 Aug 2014 22:31:33 -0000
@@ -130,7 +130,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: sys/arch/evbarm/conf/IXDP425
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IXDP425,v
retrieving revision 1.46
diff -u -p -r1.46 IXDP425
--- sys/arch/evbarm/conf/IXDP425 3 Aug 2014 09:18:16 -0000 1.46
+++ sys/arch/evbarm/conf/IXDP425 14 Aug 2014 22:31:33 -0000
@@ -135,7 +135,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: sys/arch/evbarm/conf/IXM1200
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/IXM1200,v
retrieving revision 1.57
diff -u -p -r1.57 IXM1200
--- sys/arch/evbarm/conf/IXM1200 3 Aug 2014 09:18:16 -0000 1.57
+++ sys/arch/evbarm/conf/IXM1200 14 Aug 2014 22:31:33 -0000
@@ -128,7 +128,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: sys/arch/evbarm/conf/KUROBOX_PRO
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/KUROBOX_PRO,v
retrieving revision 1.6
diff -u -p -r1.6 KUROBOX_PRO
--- sys/arch/evbarm/conf/KUROBOX_PRO 27 Jul 2014 03:34:41 -0000 1.6
+++ sys/arch/evbarm/conf/KUROBOX_PRO 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/LUBBOCK
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/LUBBOCK,v
retrieving revision 1.50
diff -u -p -r1.50 LUBBOCK
--- sys/arch/evbarm/conf/LUBBOCK 3 Aug 2014 09:18:16 -0000 1.50
+++ sys/arch/evbarm/conf/LUBBOCK 14 Aug 2014 22:33:10 -0000
@@ -124,7 +124,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: sys/arch/evbarm/conf/MMNET_GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/MMNET_GENERIC,v
retrieving revision 1.18
diff -u -p -r1.18 MMNET_GENERIC
--- sys/arch/evbarm/conf/MMNET_GENERIC 3 Aug 2014 09:18:16 -0000 1.18
+++ sys/arch/evbarm/conf/MMNET_GENERIC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/MPCSA_GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/MPCSA_GENERIC,v
retrieving revision 1.41
diff -u -p -r1.41 MPCSA_GENERIC
--- sys/arch/evbarm/conf/MPCSA_GENERIC 3 Aug 2014 09:18:16 -0000 1.41
+++ sys/arch/evbarm/conf/MPCSA_GENERIC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/MV2120
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/MV2120,v
retrieving revision 1.21
diff -u -p -r1.21 MV2120
--- sys/arch/evbarm/conf/MV2120 3 Aug 2014 09:18:16 -0000 1.21
+++ sys/arch/evbarm/conf/MV2120 14 Aug 2014 22:31:33 -0000
@@ -5,7 +5,7 @@
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: sys/arch/evbarm/conf/N900
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/N900,v
retrieving revision 1.17
diff -u -p -r1.17 N900
--- sys/arch/evbarm/conf/N900 3 Aug 2014 09:18:16 -0000 1.17
+++ sys/arch/evbarm/conf/N900 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbarm/conf/NAPPI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/NAPPI,v
retrieving revision 1.53
diff -u -p -r1.53 NAPPI
--- sys/arch/evbarm/conf/NAPPI 3 Aug 2014 09:18:16 -0000 1.53
+++ sys/arch/evbarm/conf/NAPPI 14 Aug 2014 22:31:33 -0000
@@ -122,7 +122,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: sys/arch/evbarm/conf/NSLU2
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/NSLU2,v
retrieving revision 1.35
diff -u -p -r1.35 NSLU2
--- sys/arch/evbarm/conf/NSLU2 3 Aug 2014 09:18:16 -0000 1.35
+++ sys/arch/evbarm/conf/NSLU2 14 Aug 2014 22:31:33 -0000
@@ -135,7 +135,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: sys/arch/evbarm/conf/ODROID
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ODROID,v
retrieving revision 1.5
diff -u -p -r1.5 ODROID
--- sys/arch/evbarm/conf/ODROID 3 Aug 2014 09:18:16 -0000 1.5
+++ sys/arch/evbarm/conf/ODROID 14 Aug 2014 22:31:33 -0000
@@ -153,7 +153,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: sys/arch/evbarm/conf/ODROID-U
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ODROID-U,v
retrieving revision 1.9
diff -u -p -r1.9 ODROID-U
--- sys/arch/evbarm/conf/ODROID-U 3 Aug 2014 09:18:16 -0000 1.9
+++ sys/arch/evbarm/conf/ODROID-U 14 Aug 2014 22:31:33 -0000
@@ -147,7 +147,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: sys/arch/evbarm/conf/OMAP5EVM
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/OMAP5EVM,v
retrieving revision 1.4
diff -u -p -r1.4 OMAP5EVM
--- sys/arch/evbarm/conf/OMAP5EVM 3 Aug 2014 09:18:16 -0000 1.4
+++ sys/arch/evbarm/conf/OMAP5EVM 14 Aug 2014 22:31:33 -0000
@@ -139,7 +139,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: sys/arch/evbarm/conf/OPENBLOCKS_A6
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/OPENBLOCKS_A6,v
retrieving revision 1.20
diff -u -p -r1.20 OPENBLOCKS_A6
--- sys/arch/evbarm/conf/OPENBLOCKS_A6 3 Aug 2014 09:18:16 -0000 1.20
+++ sys/arch/evbarm/conf/OPENBLOCKS_A6 14 Aug 2014 22:31:33 -0000
@@ -154,7 +154,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: sys/arch/evbarm/conf/OPENBLOCKS_AX3
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/OPENBLOCKS_AX3,v
retrieving revision 1.9
diff -u -p -r1.9 OPENBLOCKS_AX3
--- sys/arch/evbarm/conf/OPENBLOCKS_AX3 3 Aug 2014 09:18:16 -0000 1.9
+++ sys/arch/evbarm/conf/OPENBLOCKS_AX3 14 Aug 2014 22:31:33 -0000
@@ -156,7 +156,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: sys/arch/evbarm/conf/OSK5912
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/OSK5912,v
retrieving revision 1.24
diff -u -p -r1.24 OSK5912
--- sys/arch/evbarm/conf/OSK5912 3 Aug 2014 09:18:16 -0000 1.24
+++ sys/arch/evbarm/conf/OSK5912 14 Aug 2014 22:33:10 -0000
@@ -120,7 +120,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: sys/arch/evbarm/conf/OVERO
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/OVERO,v
retrieving revision 1.37
diff -u -p -r1.37 OVERO
--- sys/arch/evbarm/conf/OVERO 3 Aug 2014 09:18:16 -0000 1.37
+++ sys/arch/evbarm/conf/OVERO 14 Aug 2014 22:31:33 -0000
@@ -151,7 +151,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: sys/arch/evbarm/conf/PANDABOARD
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/PANDABOARD,v
retrieving revision 1.13
diff -u -p -r1.13 PANDABOARD
--- sys/arch/evbarm/conf/PANDABOARD 3 Aug 2014 09:18:16 -0000 1.13
+++ sys/arch/evbarm/conf/PANDABOARD 14 Aug 2014 22:31:33 -0000
@@ -137,7 +137,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: sys/arch/evbarm/conf/RPI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/RPI,v
retrieving revision 1.46
diff -u -p -r1.46 RPI
--- sys/arch/evbarm/conf/RPI 3 Aug 2014 09:18:16 -0000 1.46
+++ sys/arch/evbarm/conf/RPI 14 Aug 2014 22:31:33 -0000
@@ -140,7 +140,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: sys/arch/evbarm/conf/SHEEVAPLUG
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/SHEEVAPLUG,v
retrieving revision 1.39
diff -u -p -r1.39 SHEEVAPLUG
--- sys/arch/evbarm/conf/SHEEVAPLUG 3 Aug 2014 09:18:16 -0000 1.39
+++ sys/arch/evbarm/conf/SHEEVAPLUG 14 Aug 2014 22:31:33 -0000
@@ -164,7 +164,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: sys/arch/evbarm/conf/TEAMASA_NPWR
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TEAMASA_NPWR,v
retrieving revision 1.85
diff -u -p -r1.85 TEAMASA_NPWR
--- sys/arch/evbarm/conf/TEAMASA_NPWR 10 Aug 2014 22:55:49 -0000 1.85
+++ sys/arch/evbarm/conf/TEAMASA_NPWR 14 Aug 2014 22:31:33 -0000
@@ -138,7 +138,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: sys/arch/evbarm/conf/TEAMASA_NPWR_FC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC,v
retrieving revision 1.45
diff -u -p -r1.45 TEAMASA_NPWR_FC
--- sys/arch/evbarm/conf/TEAMASA_NPWR_FC 3 Aug 2014 09:18:16 -0000 1.45
+++ sys/arch/evbarm/conf/TEAMASA_NPWR_FC 14 Aug 2014 22:31:33 -0000
@@ -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=380000
+makeoptions COPY_SYMTAB=1
config netbsd root on ? type ?
config netbsd-wm0 root on wm0 type nfs
Index: sys/arch/evbarm/conf/TISDP2420
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TISDP2420,v
retrieving revision 1.29
diff -u -p -r1.29 TISDP2420
--- sys/arch/evbarm/conf/TISDP2420 3 Aug 2014 09:18:16 -0000 1.29
+++ sys/arch/evbarm/conf/TISDP2420 14 Aug 2014 22:31:33 -0000
@@ -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=600000
+makeoptions COPY_SYMTAB=1
## USB Debugging options
options USB_DEBUG
Index: sys/arch/evbarm/conf/TISDP2430
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TISDP2430,v
retrieving revision 1.29
diff -u -p -r1.29 TISDP2430
--- sys/arch/evbarm/conf/TISDP2430 3 Aug 2014 09:18:16 -0000 1.29
+++ sys/arch/evbarm/conf/TISDP2430 14 Aug 2014 22:31:33 -0000
@@ -132,7 +132,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: sys/arch/evbarm/conf/TS7200
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TS7200,v
retrieving revision 1.59
diff -u -p -r1.59 TS7200
--- sys/arch/evbarm/conf/TS7200 3 Aug 2014 09:18:16 -0000 1.59
+++ sys/arch/evbarm/conf/TS7200 14 Aug 2014 22:31:33 -0000
@@ -135,7 +135,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: sys/arch/evbarm/conf/TWINTAIL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/TWINTAIL,v
retrieving revision 1.61
diff -u -p -r1.61 TWINTAIL
--- sys/arch/evbarm/conf/TWINTAIL 3 Aug 2014 09:18:16 -0000 1.61
+++ sys/arch/evbarm/conf/TWINTAIL 14 Aug 2014 22:31:33 -0000
@@ -134,7 +134,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: sys/arch/evbarm/conf/VIPER
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/VIPER,v
retrieving revision 1.34
diff -u -p -r1.34 VIPER
--- sys/arch/evbarm/conf/VIPER 3 Aug 2014 09:18:16 -0000 1.34
+++ sys/arch/evbarm/conf/VIPER 14 Aug 2014 22:31:33 -0000
@@ -125,7 +125,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: sys/arch/evbarm/conf/ZAO425
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbarm/conf/ZAO425,v
retrieving revision 1.54
diff -u -p -r1.54 ZAO425
--- sys/arch/evbarm/conf/ZAO425 3 Aug 2014 09:18:16 -0000 1.54
+++ sys/arch/evbarm/conf/ZAO425 14 Aug 2014 22:31:33 -0000
@@ -135,7 +135,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: sys/arch/evbmips/conf/ADM5120
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/ADM5120,v
retrieving revision 1.18
diff -u -p -r1.18 ADM5120
--- sys/arch/evbmips/conf/ADM5120 20 Jul 2014 10:06:11 -0000 1.18
+++ sys/arch/evbmips/conf/ADM5120 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/ADM5120-NB
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/ADM5120-NB,v
retrieving revision 1.17
diff -u -p -r1.17 ADM5120-NB
--- sys/arch/evbmips/conf/ADM5120-NB 20 Jul 2014 10:06:11 -0000 1.17
+++ sys/arch/evbmips/conf/ADM5120-NB 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/ADM5120-USB
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/ADM5120-USB,v
retrieving revision 1.17
diff -u -p -r1.17 ADM5120-USB
--- sys/arch/evbmips/conf/ADM5120-USB 20 Jul 2014 10:06:11 -0000 1.17
+++ sys/arch/evbmips/conf/ADM5120-USB 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/ALCHEMY
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/ALCHEMY,v
retrieving revision 1.53
diff -u -p -r1.53 ALCHEMY
--- sys/arch/evbmips/conf/ALCHEMY 20 Jul 2014 10:06:11 -0000 1.53
+++ sys/arch/evbmips/conf/ALCHEMY 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/AP30
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/AP30,v
retrieving revision 1.31
diff -u -p -r1.31 AP30
--- sys/arch/evbmips/conf/AP30 20 Jul 2014 10:06:11 -0000 1.31
+++ sys/arch/evbmips/conf/AP30 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/CPMBR1400
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/CPMBR1400,v
retrieving revision 1.17
diff -u -p -r1.17 CPMBR1400
--- sys/arch/evbmips/conf/CPMBR1400 20 Jul 2014 10:06:11 -0000 1.17
+++ sys/arch/evbmips/conf/CPMBR1400 14 Aug 2014 22:31:33 -0000
@@ -2,7 +2,7 @@
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: sys/arch/evbmips/conf/DB120
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/DB120,v
retrieving revision 1.13
diff -u -p -r1.13 DB120
--- sys/arch/evbmips/conf/DB120 20 Jul 2014 10:06:11 -0000 1.13
+++ sys/arch/evbmips/conf/DB120 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/GDIUM64
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/GDIUM64,v
retrieving revision 1.1
diff -u -p -r1.1 GDIUM64
--- sys/arch/evbmips/conf/GDIUM64 24 Aug 2011 16:02:26 -0000 1.1
+++ sys/arch/evbmips/conf/GDIUM64 14 Aug 2014 22:34:07 -0000
@@ -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: sys/arch/evbmips/conf/MALTA
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/MALTA,v
retrieving revision 1.78
diff -u -p -r1.78 MALTA
--- sys/arch/evbmips/conf/MALTA 20 Jul 2014 10:06:11 -0000 1.78
+++ sys/arch/evbmips/conf/MALTA 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/MALTA64
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/MALTA64,v
retrieving revision 1.6
diff -u -p -r1.6 MALTA64
--- sys/arch/evbmips/conf/MALTA64 13 Oct 2012 06:08:11 -0000 1.6
+++ sys/arch/evbmips/conf/MALTA64 14 Aug 2014 22:32:40 -0000
@@ -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: sys/arch/evbmips/conf/MERAKI
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/MERAKI,v
retrieving revision 1.25
diff -u -p -r1.25 MERAKI
--- sys/arch/evbmips/conf/MERAKI 20 Jul 2014 10:06:11 -0000 1.25
+++ sys/arch/evbmips/conf/MERAKI 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/RB153
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/RB153,v
retrieving revision 1.15
diff -u -p -r1.15 RB153
--- sys/arch/evbmips/conf/RB153 20 Jul 2014 10:06:11 -0000 1.15
+++ sys/arch/evbmips/conf/RB153 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/RB433UAH
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/RB433UAH,v
retrieving revision 1.10
diff -u -p -r1.10 RB433UAH
--- sys/arch/evbmips/conf/RB433UAH 20 Jul 2014 10:06:11 -0000 1.10
+++ sys/arch/evbmips/conf/RB433UAH 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/WGT624V3
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/WGT624V3,v
retrieving revision 1.22
diff -u -p -r1.22 WGT624V3
--- sys/arch/evbmips/conf/WGT624V3 20 Jul 2014 10:06:11 -0000 1.22
+++ sys/arch/evbmips/conf/WGT624V3 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/XLSATX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/XLSATX,v
retrieving revision 1.19
diff -u -p -r1.19 XLSATX
--- sys/arch/evbmips/conf/XLSATX 20 Jul 2014 10:06:11 -0000 1.19
+++ sys/arch/evbmips/conf/XLSATX 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbmips/conf/ZYXELKX
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbmips/conf/ZYXELKX,v
retrieving revision 1.2
diff -u -p -r1.2 ZYXELKX
--- sys/arch/evbmips/conf/ZYXELKX 20 Jul 2014 10:06:11 -0000 1.2
+++ sys/arch/evbmips/conf/ZYXELKX 14 Aug 2014 22:31:33 -0000
@@ -2,7 +2,7 @@
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: sys/arch/evbppc/conf/EV64260
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/EV64260,v
retrieving revision 1.60
diff -u -p -r1.60 EV64260
--- sys/arch/evbppc/conf/EV64260 6 Mar 2014 23:13:58 -0000 1.60
+++ sys/arch/evbppc/conf/EV64260 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/EXPLORA451
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/EXPLORA451,v
retrieving revision 1.55
diff -u -p -r1.55 EXPLORA451
--- sys/arch/evbppc/conf/EXPLORA451 10 Aug 2014 17:56:23 -0000 1.55
+++ sys/arch/evbppc/conf/EXPLORA451 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/MPC8536DS
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/MPC8536DS,v
retrieving revision 1.19
diff -u -p -r1.19 MPC8536DS
--- sys/arch/evbppc/conf/MPC8536DS 30 Jun 2013 21:38:56 -0000 1.19
+++ sys/arch/evbppc/conf/MPC8536DS 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/MPC8548CDS
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/MPC8548CDS,v
retrieving revision 1.18
diff -u -p -r1.18 MPC8548CDS
--- sys/arch/evbppc/conf/MPC8548CDS 30 Jun 2013 21:38:56 -0000 1.18
+++ sys/arch/evbppc/conf/MPC8548CDS 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/OPENBLOCKS200
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/OPENBLOCKS200,v
retrieving revision 1.40
diff -u -p -r1.40 OPENBLOCKS200
--- sys/arch/evbppc/conf/OPENBLOCKS200 30 Jun 2013 21:38:56 -0000 1.40
+++ sys/arch/evbppc/conf/OPENBLOCKS200 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/OPENBLOCKS266
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/OPENBLOCKS266,v
retrieving revision 1.66
diff -u -p -r1.66 OPENBLOCKS266
--- sys/arch/evbppc/conf/OPENBLOCKS266 30 Jun 2013 21:38:56 -0000 1.66
+++ sys/arch/evbppc/conf/OPENBLOCKS266 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/OPENBLOCKS600
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/OPENBLOCKS600,v
retrieving revision 1.16
diff -u -p -r1.16 OPENBLOCKS600
--- sys/arch/evbppc/conf/OPENBLOCKS600 21 Nov 2013 14:03:02 -0000 1.16
+++ sys/arch/evbppc/conf/OPENBLOCKS600 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/P2020DS
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/P2020DS,v
retrieving revision 1.21
diff -u -p -r1.21 P2020DS
--- sys/arch/evbppc/conf/P2020DS 10 Aug 2014 17:56:23 -0000 1.21
+++ sys/arch/evbppc/conf/P2020DS 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/P2020RDB
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/P2020RDB,v
retrieving revision 1.22
diff -u -p -r1.22 P2020RDB
--- sys/arch/evbppc/conf/P2020RDB 23 Aug 2013 06:31:09 -0000 1.22
+++ sys/arch/evbppc/conf/P2020RDB 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/PMPPC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/PMPPC,v
retrieving revision 1.31
diff -u -p -r1.31 PMPPC
--- sys/arch/evbppc/conf/PMPPC 10 Aug 2014 17:56:23 -0000 1.31
+++ sys/arch/evbppc/conf/PMPPC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/RB800
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/RB800,v
retrieving revision 1.26
diff -u -p -r1.26 RB800
--- sys/arch/evbppc/conf/RB800 30 Jun 2013 21:38:56 -0000 1.26
+++ sys/arch/evbppc/conf/RB800 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/TWRP1025
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/TWRP1025,v
retrieving revision 1.14
diff -u -p -r1.14 TWRP1025
--- sys/arch/evbppc/conf/TWRP1025 6 Mar 2014 23:30:28 -0000 1.14
+++ sys/arch/evbppc/conf/TWRP1025 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/VIRTEX_DFC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/VIRTEX_DFC,v
retrieving revision 1.23
diff -u -p -r1.23 VIRTEX_DFC
--- sys/arch/evbppc/conf/VIRTEX_DFC 30 Jun 2013 21:38:56 -0000 1.23
+++ sys/arch/evbppc/conf/VIRTEX_DFC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/VIRTEX_GSRD1
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/VIRTEX_GSRD1,v
retrieving revision 1.21
diff -u -p -r1.21 VIRTEX_GSRD1
--- sys/arch/evbppc/conf/VIRTEX_GSRD1 30 Jun 2013 21:38:56 -0000 1.21
+++ sys/arch/evbppc/conf/VIRTEX_GSRD1 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/VIRTEX_GSRD2
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/VIRTEX_GSRD2,v
retrieving revision 1.22
diff -u -p -r1.22 VIRTEX_GSRD2
--- sys/arch/evbppc/conf/VIRTEX_GSRD2 30 Jun 2013 21:38:56 -0000 1.22
+++ sys/arch/evbppc/conf/VIRTEX_GSRD2 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbppc/conf/WALNUT
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbppc/conf/WALNUT,v
retrieving revision 1.67
diff -u -p -r1.67 WALNUT
--- sys/arch/evbppc/conf/WALNUT 10 Aug 2014 17:56:23 -0000 1.67
+++ sys/arch/evbppc/conf/WALNUT 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbsh3/conf/AP_MS104_SH4
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbsh3/conf/AP_MS104_SH4,v
retrieving revision 1.6
diff -u -p -r1.6 AP_MS104_SH4
--- sys/arch/evbsh3/conf/AP_MS104_SH4 24 Mar 2014 14:15:38 -0000 1.6
+++ sys/arch/evbsh3/conf/AP_MS104_SH4 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbsh3/conf/T_SH7706LAN
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbsh3/conf/T_SH7706LAN,v
retrieving revision 1.8
diff -u -p -r1.8 T_SH7706LAN
--- sys/arch/evbsh3/conf/T_SH7706LAN 24 Mar 2014 14:15:38 -0000 1.8
+++ sys/arch/evbsh3/conf/T_SH7706LAN 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/evbsh3/conf/T_SH7706LSR
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/evbsh3/conf/T_SH7706LSR,v
retrieving revision 1.10
diff -u -p -r1.10 T_SH7706LSR
--- sys/arch/evbsh3/conf/T_SH7706LSR 24 Mar 2014 14:15:38 -0000 1.10
+++ sys/arch/evbsh3/conf/T_SH7706LSR 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/i386/i386/locore.S
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/i386/i386/locore.S,v
retrieving revision 1.112
diff -u -p -r1.112 locore.S
--- sys/arch/i386/i386/locore.S 20 Feb 2014 18:19:10 -0000 1.112
+++ sys/arch/i386/i386/locore.S 14 Aug 2014 22:16:04 -0000
@@ -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: sys/arch/iyonix/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/iyonix/conf/GENERIC,v
retrieving revision 1.83
diff -u -p -r1.83 GENERIC
--- sys/arch/iyonix/conf/GENERIC 3 Aug 2014 08:53:56 -0000 1.83
+++ sys/arch/iyonix/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/luna68k/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/luna68k/conf/GENERIC,v
retrieving revision 1.113
diff -u -p -r1.113 GENERIC
--- sys/arch/luna68k/conf/GENERIC 20 Jul 2014 11:33:31 -0000 1.113
+++ sys/arch/luna68k/conf/GENERIC 14 Aug 2014 22:33:10 -0000
@@ -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: sys/arch/luna68k/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/luna68k/conf/INSTALL,v
retrieving revision 1.16
diff -u -p -r1.16 INSTALL
--- sys/arch/luna68k/conf/INSTALL 5 Aug 2014 15:52:38 -0000 1.16
+++ sys/arch/luna68k/conf/INSTALL 14 Aug 2014 22:33:10 -0000
@@ -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: sys/arch/mac68k/mac68k/machdep.c
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/mac68k/mac68k/machdep.c,v
retrieving revision 1.347
diff -u -p -r1.347 machdep.c
--- sys/arch/mac68k/mac68k/machdep.c 24 Mar 2014 20:06:32 -0000 1.347
+++ sys/arch/mac68k/mac68k/machdep.c 14 Aug 2014 22:15:50 -0000
@@ -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: sys/arch/netwinder/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/netwinder/conf/GENERIC,v
retrieving revision 1.121
diff -u -p -r1.121 GENERIC
--- sys/arch/netwinder/conf/GENERIC 3 Aug 2014 08:53:56 -0000 1.121
+++ sys/arch/netwinder/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -164,7 +164,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: sys/arch/sbmips/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sbmips/conf/GENERIC,v
retrieving revision 1.96
diff -u -p -r1.96 GENERIC
--- sys/arch/sbmips/conf/GENERIC 20 Jul 2014 10:06:11 -0000 1.96
+++ sys/arch/sbmips/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -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: sys/arch/sbmips/conf/GENERIC.MP
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sbmips/conf/GENERIC.MP,v
retrieving revision 1.2
diff -u -p -r1.2 GENERIC.MP
--- sys/arch/sbmips/conf/GENERIC.MP 20 Feb 2011 07:47:38 -0000 1.2
+++ sys/arch/sbmips/conf/GENERIC.MP 14 Aug 2014 22:32:40 -0000
@@ -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: sys/arch/sbmips/conf/GENERIC64
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sbmips/conf/GENERIC64,v
retrieving revision 1.2
diff -u -p -r1.2 GENERIC64
--- sys/arch/sbmips/conf/GENERIC64 14 Dec 2009 00:46:11 -0000 1.2
+++ sys/arch/sbmips/conf/GENERIC64 14 Aug 2014 22:32:40 -0000
@@ -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: sys/arch/sbmips/conf/GENERIC64.MP
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/sbmips/conf/GENERIC64.MP,v
retrieving revision 1.2
diff -u -p -r1.2 GENERIC64.MP
--- sys/arch/sbmips/conf/GENERIC64.MP 20 Feb 2011 07:47:38 -0000 1.2
+++ sys/arch/sbmips/conf/GENERIC64.MP 14 Aug 2014 22:32:40 -0000
@@ -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: sys/arch/shark/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/shark/conf/GENERIC,v
retrieving revision 1.115
diff -u -p -r1.115 GENERIC
--- sys/arch/shark/conf/GENERIC 3 Aug 2014 08:53:56 -0000 1.115
+++ sys/arch/shark/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -154,7 +154,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: sys/arch/usermode/conf/GENERIC.common
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/usermode/conf/GENERIC.common,v
retrieving revision 1.19
diff -u -p -r1.19 GENERIC.common
--- sys/arch/usermode/conf/GENERIC.common 17 Oct 2012 14:48:18 -0000 1.19
+++ sys/arch/usermode/conf/GENERIC.common 14 Aug 2014 22:31:33 -0000
@@ -8,7 +8,7 @@ maxusers 32
makeoptions DEBUG="-O1 -g3"
-options SYMTAB_SPACE=450000
+makeoptions COPY_SYMTAB=1
options RTC_OFFSET=0
options NTP
Index: sys/arch/zaurus/conf/GENERIC
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/zaurus/conf/GENERIC,v
retrieving revision 1.57
diff -u -p -r1.57 GENERIC
--- sys/arch/zaurus/conf/GENERIC 3 Aug 2014 08:53:57 -0000 1.57
+++ sys/arch/zaurus/conf/GENERIC 14 Aug 2014 22:31:33 -0000
@@ -166,7 +166,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: sys/arch/zaurus/conf/INSTALL
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/arch/zaurus/conf/INSTALL,v
retrieving revision 1.22
diff -u -p -r1.22 INSTALL
--- sys/arch/zaurus/conf/INSTALL 4 Aug 2014 20:59:19 -0000 1.22
+++ sys/arch/zaurus/conf/INSTALL 14 Aug 2014 22:32:40 -0000
@@ -64,7 +64,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: sys/conf/Makefile.kern.inc
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile.kern.inc
--- sys/conf/Makefile.kern.inc 8 Aug 2014 14:42:58 -0000 1.169
+++ sys/conf/Makefile.kern.inc 14 Aug 2014 22:15:35 -0000
@@ -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 kern_ksyms_buf.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 [email protected] --cref ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \
${LD} -Map [email protected] --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 $@ [email protected]; mv -f $@ [email protected]; \
echo ${STRIP} ${STRIPFLAGS} -o $@ [email protected]; \
${STRIP} ${STRIPFLAGS} -o $@ [email protected]
-.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} [email protected]"; \
- ${DBSYM} [email protected] || (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,36 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
+locore.o machdep.o kern_ksyms.o kern_ksyms_buf.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
+
+kern_ksyms_buf.o: $S/kern/kern_ksyms_buf.c
+ ${NORMAL_C}
+
+.if !defined(COPY_SYMTAB})
+build_kernel: .USE
+ ${SYSTEM_LD_HEAD}
+ ${SYSTEM_LD} swap${.TARGET}.o
+ ${SYSTEM_LD_TAIL_STAGE2}
+.else
+build_kernel: .USE
+ ${SYSTEM_LD_HEAD}
+ ${SYSTEM_LD} swap${.TARGET}.o kern_ksyms_buf.o
+ ${SYSTEM_LD_TAIL_STAGE1}
+ ${CC} ${CFLAGS} ${CPPFLAGS} \
+ -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: sys/conf/files
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/conf/files,v
retrieving revision 1.1096
diff -u -p -r1.1096 files
--- sys/conf/files 10 Aug 2014 16:44:35 -0000 1.1096
+++ sys/conf/files 14 Aug 2014 21:44:52 -0000
@@ -1354,7 +1354,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: sys/kern/kern_ksyms.c
===================================================================
RCS file: /home/joerg/repo/netbsd/src/sys/kern/kern_ksyms.c,v
retrieving revision 1.72
diff -u -p -r1.72 kern_ksyms.c
--- sys/kern/kern_ksyms.c 25 Jul 2014 08:10:40 -0000 1.72
+++ sys/kern/kern_ksyms.c 14 Aug 2014 21:52:41 -0000
@@ -76,7 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c
#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: sys/kern/kern_ksyms_buf.c
===================================================================
RCS file: sys/kern/kern_ksyms_buf.c
diff -N sys/kern/kern_ksyms_buf.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sys/kern/kern_ksyms_buf.c 14 Aug 2014 21:53:23 -0000
@@ -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
Index: usr.bin/config/mkmakefile.c
===================================================================
RCS file: /home/joerg/repo/netbsd/src/usr.bin/config/mkmakefile.c,v
retrieving revision 1.15
diff -u -p -r1.15 mkmakefile.c
--- usr.bin/config/mkmakefile.c 8 Jun 2012 08:56:45 -0000 1.15
+++ usr.bin/config/mkmakefile.c 14 Aug 2014 21:39:37 -0000
@@ -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 "
+ "kern_ksyms_buf.o build_kernel\n", nm, nm);
}
+ fputs("\n", fp);
}
/*
