. Have dbsym explicitly suggest increasing SYMTAB_SPACE when

an overflow occurs.
   . Make this error a fatal build time error
   . Move the support for dbsym into the MI Makefile.kern.inc,
     conditional upon the SYMTAB_SPACE option being defined in
     the kernel config file.
This commit is contained in:
dbj 2005-11-24 12:54:29 +00:00
parent 9476e5349e
commit 8000972bbe
19 changed files with 27 additions and 91 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: dbsym.c,v 1.8 2005/06/01 15:12:18 lukem Exp $ */
/* $NetBSD: dbsym.c,v 1.9 2005/11/24 12:54:29 dbj Exp $ */
/*
* Copyright (c) 2001 Simon Burge (for Wasabi Systems)
@ -39,7 +39,7 @@
__COPYRIGHT(
"@(#) Copyright (c) 1996 Christopher G. Demetriou, 2001 Simon Burge.\
All rights reserved.\n");
__RCSID("$NetBSD: dbsym.c,v 1.8 2005/06/01 15:12:18 lukem Exp $");
__RCSID("$NetBSD: dbsym.c,v 1.9 2005/11/24 12:54:29 dbj Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -151,7 +151,8 @@ main(int argc, char **argv)
&mappedkfile[db_symtab_symbols[X_DB_SYMTABSIZE].offset]);
if (symtabsize > symtab_space)
errx(1, "symbol table (%u bytes) too big for buffer (%u bytes)",
errx(1, "symbol table (%u bytes) too big for buffer (%u bytes)\n"
"Increase options SYMTAB_SPACE in your kernel config",
symtabsize, symtab_space);
if (verbose)

View File

@ -1,8 +1,4 @@
# $NetBSD: Makefile.arc.inc,v 1.13 2005/05/07 14:15:05 tsutsui Exp $
# $NetBSD: Makefile.arc.inc,v 1.14 2005/11/24 12:54:29 dbj Exp $
CFLAGS+= -mips2
AFLAGS+= -mips2
SYSTEM_LD_TAIL_EXTRA=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cats.inc,v 1.16 2004/09/13 09:39:40 chs Exp $
# $NetBSD: Makefile.cats.inc,v 1.17 2005/11/24 12:54:29 dbj Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@ -22,8 +22,6 @@ SYSTEM_LD_HEAD_EXTRA+=; \
cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true; \
echo \
"${OBJCOPY} -O a.out-arm-netbsd -R .ident -R .arm.atpcs -R .comment $@ $@.aout"; \
${OBJCOPY} -O a.out-arm-netbsd -R .ident -R .arm.atpcs -R .comment $@ $@.aout

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.dreamcast.inc,v 1.8 2002/10/30 12:22:55 tsutsui Exp $
# $NetBSD: Makefile.dreamcast.inc,v 1.9 2005/11/24 12:54:29 dbj Exp $
MACHINE_ARCH=sh3el
@ -6,7 +6,3 @@ TEXTADDR?=8c010000
.if ${OBJECT_FMT} == "ELF"
LINKFORMAT= -N
.endif
SYSTEM_LD_TAIL_EXTRA=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true

View File

@ -1,8 +1,4 @@
# $NetBSD: Makefile.evbarm.inc,v 1.16 2003/01/03 02:16:26 thorpej Exp $
SYSTEM_LD_TAIL_EXTRA=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
# $NetBSD: Makefile.evbarm.inc,v 1.17 2005/11/24 12:54:29 dbj Exp $
.if defined(BOARDMKFRAG) # Must be a full pathname.
.include "${BOARDMKFRAG}"

View File

@ -1,8 +1,6 @@
# $NetBSD: Makefile.evbmips.inc,v 1.1 2002/03/07 14:43:57 simonb Exp $
# $NetBSD: Makefile.evbmips.inc,v 1.2 2005/11/24 12:54:29 dbj Exp $
SYSTEM_LD_TAIL_EXTRA=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true; \
echo ${STRIP} -O srec -o $@.srec $@; \
${STRIP} -O srec -o $@.srec $@
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.ev64260.inc,v 1.3 2005/03/17 16:45:50 jmc Exp $
# $NetBSD: Makefile.ev64260.inc,v 1.4 2005/11/24 12:54:29 dbj Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@ -7,12 +7,6 @@ TEXTADDR?= 300000
SYSTEM_FIRST_OBJ= ${BOARDTYPE}_locore.o
SYSTEM_FIRST_SFILE= ${THISPPC}/${BOARDTYPE}/${BOARDTYPE}_locore.S
.ifdef DBSYM
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} netbsd netbsd.img ; \
OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.explora.inc,v 1.3 2005/01/16 23:40:34 chs Exp $
# $NetBSD: Makefile.explora.inc,v 1.4 2005/11/24 12:54:29 dbj Exp $
CFLAGS+=-mcpu=403
AFLAGS+=-mcpu=403
@ -6,12 +6,6 @@ AFLAGS+=-mcpu=403
SYSTEM_FIRST_OBJ= explora_start.o
SYSTEM_FIRST_SFILE= ${THISPPC}/explora/explora_start.S
.ifdef DBSYM
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} --adjust-vma 0x81000000 netbsd netbsd.img ; \
${OBJCOPY} --adjust-vma 0x81000000 netbsd netbsd.img

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.obs200.inc,v 1.2 2005/03/29 17:58:15 jmc Exp $
# $NetBSD: Makefile.obs200.inc,v 1.3 2005/11/24 12:54:29 dbj Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@ -9,12 +9,6 @@ TEXTADDR?= 450000
SYSTEM_FIRST_OBJ= obs200_locore.o
SYSTEM_FIRST_SFILE= ${THISPPC}/obs405/obs200_locore.S
.ifdef DBSYM
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} netbsd netbsd.img ; \
OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.obs405.inc,v 1.2 2005/03/17 16:45:50 jmc Exp $
# $NetBSD: Makefile.obs405.inc,v 1.3 2005/11/24 12:54:29 dbj Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
@ -9,12 +9,6 @@ TEXTADDR?= 25000
SYSTEM_FIRST_OBJ= locore.o
SYSTEM_FIRST_SFILE= ${POWERPC}/${PPCDIR}/openbios/locore.S
.ifdef DBSYM
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} netbsd netbsd.img ; \
OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.walnut.inc,v 1.3 2005/03/17 16:45:50 jmc Exp $
# $NetBSD: Makefile.walnut.inc,v 1.4 2005/11/24 12:54:29 dbj Exp $
MKIMG?= ${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
CFLAGS+=-mcpu=403
@ -8,12 +8,6 @@ TEXTADDR?= 25000
SYSTEM_FIRST_OBJ= walnut_start.o
SYSTEM_FIRST_SFILE= ${THISPPC}/walnut/walnut_start.S
.ifdef DBSYM
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
.endif
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${MKIMG} netbsd netbsd.img ; \
OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; export OBJDUMP OBJCOPY; \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.macppc,v 1.23 2005/10/19 09:01:27 dyoung Exp $
# $NetBSD: Makefile.macppc,v 1.24 2005/11/24 12:54:29 dbj Exp $
#
# Makefile for NetBSD
#
@ -75,12 +75,6 @@ TEXTADDR?= 0x100000
LINKFORMAT= -N
ENTRYPOINT= __start
.if defined(NEED_SYMTAB)
SYSTEM_LD_TAIL_EXTRA=; \
echo ${DBSYM} $@; \
${DBSYM} $@
.endif
.if defined(NEED_SREC)
SYSTEM_LD_TAIL_EXTRA+=; \
${OBJCOPY} -v -O srec $@ $@.srec

View File

@ -1,11 +1,7 @@
# $NetBSD: Makefile.netwinder.inc,v 1.7 2003/01/03 02:34:49 thorpej Exp $
# $NetBSD: Makefile.netwinder.inc,v 1.8 2005/11/24 12:54:29 dbj Exp $
CPPFLAGS+= -D${MACHINE}
SYSTEM_LD_TAIL_EXTRA=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true
SYSTEM_FIRST_OBJ= nwmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.19 2005/08/19 05:19:54 christos Exp $
# $NetBSD: INSTALL,v 1.20 2005/11/24 12:54:30 dbj Exp $
#
# INSTALL
#
@ -44,7 +44,6 @@ options MALLOC_NOINLINE # Not inlining MALLOC saves memory
#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options TRAP_PANICWAIT
#options SYMTAB_SPACE=200000 # size for embedded symbol table
no makeoptions NEED_SYMTAB
#makeoptions DEBUG="-g" # compile full symbol table

View File

@ -1,4 +1,4 @@
# $NetBSD: std.pmppc,v 1.6 2005/09/17 09:44:08 yamt Exp $
# $NetBSD: std.pmppc,v 1.7 2005/11/24 12:54:30 dbj Exp $
#
# standard, required NetBSD/pmppc 'options'
@ -16,5 +16,4 @@ options INTSTK=0x2000
makeoptions TEXTADDR=0x40000
makeoptions NEED_SYMTAB=1
makeoptions NEED_BINARY=1

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.powerpc,v 1.35 2005/06/02 14:35:08 he Exp $
# $NetBSD: Makefile.powerpc,v 1.36 2005/11/24 12:54:30 dbj Exp $
#
# Makefile for NetBSD
#
@ -75,12 +75,6 @@ TEXTADDR?= 0x100000
LINKFORMAT= -N
ENTRYPOINT= __start
.if defined(NEED_SYMTAB)
SYSTEM_LD_TAIL_EXTRA=; \
echo ${DBSYM} $@; \
${DBSYM} $@
.endif
.if defined(NEED_SREC)
SYSTEM_LD_TAIL_EXTRA+=; \
${OBJCOPY} -v -O srec $@ $@.srec

View File

@ -1,5 +0,0 @@
# $NetBSD: Makefile.sbmips.inc,v 1.1 2002/03/06 02:13:38 simonb Exp $
SYSTEM_LD_TAIL_EXTRA=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true;

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.shark.inc,v 1.5 2004/09/13 09:39:40 chs Exp $
# $NetBSD: Makefile.shark.inc,v 1.6 2005/11/24 12:54:30 dbj Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@ -17,8 +17,6 @@ SYSTEM_LD_HEAD_EXTRA+=; \
cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${DBSYM} $@ || true"; \
${DBSYM} $@ || true; \
echo \
"${OBJCOPY} -O a.out-arm-netbsd -R .ident -R .arm.atpcs -R .comment $@ $@.aout"; \
${OBJCOPY} -O a.out-arm-netbsd -R .ident -R .arm.atpcs -R .comment $@ $@.aout

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.kern.inc,v 1.69 2005/11/02 14:29:52 yamt Exp $
# $NetBSD: Makefile.kern.inc,v 1.70 2005/11/24 12:54:29 dbj Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@ -208,6 +208,12 @@ EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gdb@}
LINKFLAGS+= ${LINKFLAGS_NORMAL}
.endif
SYSTEM_LD_TAIL+=; \
if grep -q '^\#define.*SYMTAB_SPACE' opt_ddbparam.h; then \
echo "${DBSYM} $@"; \
${DBSYM} $@; \
fi
SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_EXTRA}