From c5e70d92cea817642c369b785554947bda297e6d Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sun, 15 Apr 2001 19:37:28 +0000 Subject: [PATCH] Turn on kernel debugging support (DDB, INVARIANTS, INVARIANT_SUPPORT, WITNESS) by default while SMPng is still being developed. Submitted by: jhb --- release/Makefile | 1 + release/alpha/dokern.sh | 15 +++++++++++++++ release/amd64/dokern.sh | 15 +++++++++++++++ release/i386/dokern.sh | 15 +++++++++++++++ release/pc98/dokern.sh | 15 +++++++++++++++ release/scripts/dokern.sh | 15 +++++++++++++++ sys/alpha/conf/GENERIC | 8 +++++++- sys/alpha/conf/NOTES | 8 +++++++- sys/amd64/conf/GENERIC | 8 +++++++- sys/i386/conf/GENERIC | 8 +++++++- sys/ia64/conf/GENERIC | 8 +++++++- sys/pc98/conf/GENERIC | 8 +++++++- 12 files changed, 118 insertions(+), 6 deletions(-) diff --git a/release/Makefile b/release/Makefile index 18644b0cbfde..c15e13e7d22d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -847,6 +847,7 @@ doSTDKERNEL: make KERNEL=${KERNEL} DESTDIR=${RD}/kernels install && \ [ -r ${.CURDIR}/../sys/${MACHINE}/conf/${KERNEL}.hints ] && \ cp ${.CURDIR}/../sys/${MACHINE}/conf/${KERNEL}.hints ${RD}/kernels + make KERNEL=${kernel} DESTDIR=${RD}/kernels kernel-reinstall.debug # # --==## Put a filesystem into a BOOTMFS kernel ##==-- diff --git a/release/alpha/dokern.sh b/release/alpha/dokern.sh index 955663c2e788..572ad5de835b 100755 --- a/release/alpha/dokern.sh +++ b/release/alpha/dokern.sh @@ -54,6 +54,11 @@ sed -e '/ pci$/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/pcm/d' \ -e '/atapist/d' \ -e '/ugen/d' \ @@ -82,6 +87,11 @@ sed -e '/pty/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/ ncr/d' \ -e '/pcm/d' \ -e '/atapist/d' \ @@ -118,6 +128,11 @@ sed \ -e '/SYSV/d' \ -e '/P1003_1B/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/atapist/d' \ -e '/ ncr/d' \ -e '/pass/d' \ diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh index 955663c2e788..572ad5de835b 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -54,6 +54,11 @@ sed -e '/ pci$/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/pcm/d' \ -e '/atapist/d' \ -e '/ugen/d' \ @@ -82,6 +87,11 @@ sed -e '/pty/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/ ncr/d' \ -e '/pcm/d' \ -e '/atapist/d' \ @@ -118,6 +128,11 @@ sed \ -e '/SYSV/d' \ -e '/P1003_1B/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/atapist/d' \ -e '/ ncr/d' \ -e '/pass/d' \ diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh index 955663c2e788..572ad5de835b 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -54,6 +54,11 @@ sed -e '/ pci$/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/pcm/d' \ -e '/atapist/d' \ -e '/ugen/d' \ @@ -82,6 +87,11 @@ sed -e '/pty/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/ ncr/d' \ -e '/pcm/d' \ -e '/atapist/d' \ @@ -118,6 +128,11 @@ sed \ -e '/SYSV/d' \ -e '/P1003_1B/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/atapist/d' \ -e '/ ncr/d' \ -e '/pass/d' \ diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh index 955663c2e788..572ad5de835b 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -54,6 +54,11 @@ sed -e '/ pci$/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/pcm/d' \ -e '/atapist/d' \ -e '/ugen/d' \ @@ -82,6 +87,11 @@ sed -e '/pty/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/ ncr/d' \ -e '/pcm/d' \ -e '/atapist/d' \ @@ -118,6 +128,11 @@ sed \ -e '/SYSV/d' \ -e '/P1003_1B/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/atapist/d' \ -e '/ ncr/d' \ -e '/pass/d' \ diff --git a/release/scripts/dokern.sh b/release/scripts/dokern.sh index 955663c2e788..572ad5de835b 100755 --- a/release/scripts/dokern.sh +++ b/release/scripts/dokern.sh @@ -54,6 +54,11 @@ sed -e '/ pci$/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/pcm/d' \ -e '/atapist/d' \ -e '/ugen/d' \ @@ -82,6 +87,11 @@ sed -e '/pty/d' \ -e '/SOFTUPDATES/d' \ -e '/MFS/d' \ -e '/NFS_ROOT/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/ ncr/d' \ -e '/pcm/d' \ -e '/atapist/d' \ @@ -118,6 +128,11 @@ sed \ -e '/SYSV/d' \ -e '/P1003_1B/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DEBUG/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ -e '/atapist/d' \ -e '/ ncr/d' \ -e '/pass/d' \ diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 6340bb2ad211..21edd4564b71 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -30,7 +30,7 @@ maxusers 32 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) @@ -70,6 +70,12 @@ options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING +# Debugging for use in -current +options DDB +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + # Standard busses device isa device pci diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index 6340bb2ad211..21edd4564b71 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -30,7 +30,7 @@ maxusers 32 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) @@ -70,6 +70,12 @@ options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING +# Debugging for use in -current +options DDB +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + # Standard busses device isa device pci diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index b61243451a0f..2dada597328e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -27,7 +27,7 @@ maxusers 32 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking @@ -55,6 +55,12 @@ options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev +# Debugging for use in -current +options DDB +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index b61243451a0f..2dada597328e 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -27,7 +27,7 @@ maxusers 32 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking @@ -55,6 +55,12 @@ options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev +# Debugging for use in -current +options DDB +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index effabbcca0b2..9c6f5a0f67b8 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -29,7 +29,7 @@ maxusers 32 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options INET #InterNETworking options INET6 #IPv6 communications protocols @@ -53,6 +53,12 @@ options SYSVSEM #SYSV-style semaphores options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING +# Debugging for use in -current +options DDB +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + # Standard busses device isa device pci diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 0df4da57c537..dd26cac60c34 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -28,7 +28,7 @@ maxusers 32 #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. -#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options PC98 #PC98 options MATH_EMULATE #Support for x87 emulation @@ -60,6 +60,12 @@ options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev +# Debugging for use in -current +options DDB +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS + # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O