Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Reorganize symbol table embedding. The existing option SYMT...
details: https://anonhg.NetBSD.org/src/rev/ec000c53ed2b
branches: trunk
changeset: 331637:ec000c53ed2b
user: joerg <joerg%NetBSD.org@localhost>
date: Sun Aug 17 21:17:43 2014 +0000
description:
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.
diffstat:
sys/arch/aarch64/conf/Makefile.aarch64 | 5 +-
sys/arch/acorn32/conf/EB7500ATX | 6 +-
sys/arch/algor/conf/P4032 | 6 +-
sys/arch/algor/conf/P5064 | 6 +-
sys/arch/algor/conf/P5064-64 | 8 +-
sys/arch/algor/conf/P6032 | 6 +-
sys/arch/amd64/amd64/locore.S | 4 +-
sys/arch/arm/conf/Makefile.arm | 5 +-
sys/arch/cats/conf/GENERIC | 4 +-
sys/arch/dreamcast/conf/GENERIC | 4 +-
sys/arch/epoc32/conf/GENERIC | 6 +-
sys/arch/evbarm/conf/ADI_BRH | 4 +-
sys/arch/evbarm/conf/ARMADAXP | 4 +-
sys/arch/evbarm/conf/ARMADILLO210 | 4 +-
sys/arch/evbarm/conf/ARMADILLO9 | 4 +-
sys/arch/evbarm/conf/BCM5301X | 4 +-
sys/arch/evbarm/conf/BCM56340 | 4 +-
sys/arch/evbarm/conf/BEAGLEBOARD | 4 +-
sys/arch/evbarm/conf/BEAGLEBOARDXM | 4 +-
sys/arch/evbarm/conf/BEAGLEBONE | 4 +-
sys/arch/evbarm/conf/CP3100 | 4 +-
sys/arch/evbarm/conf/CUBIEBOARD | 4 +-
sys/arch/evbarm/conf/DNS323 | 4 +-
sys/arch/evbarm/conf/GEMINI | 2 +-
sys/arch/evbarm/conf/GEMINI_MASTER | 2 +-
sys/arch/evbarm/conf/GEMINI_SLAVE | 2 +-
sys/arch/evbarm/conf/GOLDENGATE | 4 +-
sys/arch/evbarm/conf/GUMSTIX | 4 +-
sys/arch/evbarm/conf/HAWK | 4 +-
sys/arch/evbarm/conf/HDL_G | 4 +-
sys/arch/evbarm/conf/HPT5325 | 4 +-
sys/arch/evbarm/conf/IGEPV2 | 4 +-
sys/arch/evbarm/conf/IMX23_OLINUXINO | 4 +-
sys/arch/evbarm/conf/IMX31LITE | 4 +-
sys/arch/evbarm/conf/INTEGRATOR | 4 +-
sys/arch/evbarm/conf/INTEGRATOR_CP | 4 +-
sys/arch/evbarm/conf/IQ31244 | 4 +-
sys/arch/evbarm/conf/IQ80310 | 4 +-
sys/arch/evbarm/conf/IQ80321 | 4 +-
sys/arch/evbarm/conf/IXDP425 | 4 +-
sys/arch/evbarm/conf/IXM1200 | 4 +-
sys/arch/evbarm/conf/KUROBOX_PRO | 4 +-
sys/arch/evbarm/conf/LUBBOCK | 2 +-
sys/arch/evbarm/conf/MMNET_GENERIC | 6 +-
sys/arch/evbarm/conf/MPCSA_GENERIC | 6 +-
sys/arch/evbarm/conf/MV2120 | 4 +-
sys/arch/evbarm/conf/N900 | 4 +-
sys/arch/evbarm/conf/NAPPI | 4 +-
sys/arch/evbarm/conf/NSLU2 | 4 +-
sys/arch/evbarm/conf/ODROID | 4 +-
sys/arch/evbarm/conf/ODROID-U | 4 +-
sys/arch/evbarm/conf/OMAP5EVM | 4 +-
sys/arch/evbarm/conf/OPENBLOCKS_A6 | 4 +-
sys/arch/evbarm/conf/OPENBLOCKS_AX3 | 4 +-
sys/arch/evbarm/conf/OSK5912 | 2 +-
sys/arch/evbarm/conf/OVERO | 4 +-
sys/arch/evbarm/conf/PANDABOARD | 4 +-
sys/arch/evbarm/conf/RPI | 4 +-
sys/arch/evbarm/conf/SHEEVAPLUG | 4 +-
sys/arch/evbarm/conf/TEAMASA_NPWR | 4 +-
sys/arch/evbarm/conf/TEAMASA_NPWR_FC | 4 +-
sys/arch/evbarm/conf/TISDP2420 | 4 +-
sys/arch/evbarm/conf/TISDP2430 | 4 +-
sys/arch/evbarm/conf/TS7200 | 4 +-
sys/arch/evbarm/conf/TWINTAIL | 4 +-
sys/arch/evbarm/conf/VIPER | 4 +-
sys/arch/evbarm/conf/ZAO425 | 4 +-
sys/arch/evbmips/conf/ADM5120 | 6 +-
sys/arch/evbmips/conf/ADM5120-NB | 6 +-
sys/arch/evbmips/conf/ADM5120-USB | 6 +-
sys/arch/evbmips/conf/ALCHEMY | 6 +-
sys/arch/evbmips/conf/AP30 | 6 +-
sys/arch/evbmips/conf/CPMBR1400 | 4 +-
sys/arch/evbmips/conf/DB120 | 6 +-
sys/arch/evbmips/conf/GDIUM64 | 5 +-
sys/arch/evbmips/conf/MALTA | 6 +-
sys/arch/evbmips/conf/MALTA64 | 6 +-
sys/arch/evbmips/conf/MERAKI | 6 +-
sys/arch/evbmips/conf/RB153 | 6 +-
sys/arch/evbmips/conf/RB433UAH | 6 +-
sys/arch/evbmips/conf/WGT624V3 | 6 +-
sys/arch/evbmips/conf/XLSATX | 6 +-
sys/arch/evbmips/conf/ZYXELKX | 4 +-
sys/arch/evbppc/conf/EV64260 | 4 +-
sys/arch/evbppc/conf/EXPLORA451 | 4 +-
sys/arch/evbppc/conf/MPC8536DS | 6 +-
sys/arch/evbppc/conf/MPC8548CDS | 6 +-
sys/arch/evbppc/conf/OPENBLOCKS200 | 4 +-
sys/arch/evbppc/conf/OPENBLOCKS266 | 6 +-
sys/arch/evbppc/conf/OPENBLOCKS600 | 6 +-
sys/arch/evbppc/conf/P2020DS | 6 +-
sys/arch/evbppc/conf/P2020RDB | 6 +-
sys/arch/evbppc/conf/PMPPC | 4 +-
sys/arch/evbppc/conf/RB800 | 6 +-
sys/arch/evbppc/conf/TWRP1025 | 6 +-
sys/arch/evbppc/conf/VIRTEX_DFC | 4 +-
sys/arch/evbppc/conf/VIRTEX_GSRD1 | 4 +-
sys/arch/evbppc/conf/VIRTEX_GSRD2 | 4 +-
sys/arch/evbppc/conf/WALNUT | 4 +-
sys/arch/evbsh3/conf/AP_MS104_SH4 | 4 +-
sys/arch/evbsh3/conf/T_SH7706LAN | 4 +-
sys/arch/evbsh3/conf/T_SH7706LSR | 4 +-
sys/arch/i386/i386/locore.S | 8 +-
sys/arch/iyonix/conf/GENERIC | 6 +-
sys/arch/luna68k/conf/GENERIC | 6 +-
sys/arch/luna68k/conf/INSTALL | 4 +-
sys/arch/mac68k/mac68k/machdep.c | 6 +-
sys/arch/netwinder/conf/GENERIC | 4 +-
sys/arch/sbmips/conf/GENERIC | 6 +-
sys/arch/sbmips/conf/GENERIC.MP | 4 +-
sys/arch/sbmips/conf/GENERIC64 | 4 +-
sys/arch/sbmips/conf/GENERIC64.MP | 4 +-
sys/arch/shark/conf/GENERIC | 6 +-
sys/arch/usermode/conf/GENERIC.common | 6 +-
sys/arch/zaurus/conf/GENERIC | 4 +-
sys/arch/zaurus/conf/INSTALL | 4 +-
sys/conf/Makefile.kern.inc | 101 ++++++++++++--------------------
sys/conf/files | 3 +-
sys/kern/kern_ksyms.c | 13 +--
sys/kern/kern_ksyms_buf.c | 10 +++
usr.bin/config/mkmakefile.c | 13 +--
121 files changed, 324 insertions(+), 349 deletions(-)
diffs (truncated from 2602 to 300 lines):
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/aarch64/conf/Makefile.aarch64
--- a/sys/arch/aarch64/conf/Makefile.aarch64 Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/aarch64/conf/Makefile.aarch64 Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
# 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
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 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.
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/algor/conf/P4032
--- a/sys/arch/algor/conf/P4032 Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/algor/conf/P4032 Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
#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 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/algor/conf/P5064
--- a/sys/arch/algor/conf/P5064 Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/algor/conf/P5064 Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
#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 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/algor/conf/P5064-64
--- a/sys/arch/algor/conf/P5064-64 Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/algor/conf/P5064-64 Sun Aug 17 21:17:43 2014 +0000
@@ -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/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 $"
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/algor/conf/P6032
--- a/sys/arch/algor/conf/P6032 Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/algor/conf/P6032 Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
#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 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/amd64/amd64/locore.S Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
/* 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/arm/conf/Makefile.arm
--- a/sys/arch/arm/conf/Makefile.arm Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/arm/conf/Makefile.arm Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
# 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/cats/conf/GENERIC Sun Aug 17 21:17:43 2014 +0000
@@ -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 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 ?
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/dreamcast/conf/GENERIC
--- a/sys/arch/dreamcast/conf/GENERIC Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC Sun Aug 17 21:17:43 2014 +0000
@@ -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 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/epoc32/conf/GENERIC
--- a/sys/arch/epoc32/conf/GENERIC Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/epoc32/conf/GENERIC Sun Aug 17 21:17:43 2014 +0000
@@ -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 @@
#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 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.
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/evbarm/conf/ADI_BRH
--- a/sys/arch/evbarm/conf/ADI_BRH Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/evbarm/conf/ADI_BRH Sun Aug 17 21:17:43 2014 +0000
@@ -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 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/evbarm/conf/ARMADAXP
--- a/sys/arch/evbarm/conf/ARMADAXP Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/evbarm/conf/ARMADAXP Sun Aug 17 21:17:43 2014 +0000
@@ -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 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
diff -r f9ea38c6d30a -r ec000c53ed2b sys/arch/evbarm/conf/ARMADILLO210
--- a/sys/arch/evbarm/conf/ARMADILLO210 Sun Aug 17 20:22:41 2014 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO210 Sun Aug 17 21:17:43 2014 +0000
@@ -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 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
Home |
Main Index |
Thread Index |
Old Index