Add options KDB and GDB. KDB takes on the function of what DDB used

to be. Both DDB and GDB specify which KDB backends to include.

5 files changed, 15 insertions, 5 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index f546713..143f085 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -61,7 +61,9 @@ options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 options 	PFIL_HOOKS		# pfil(9) framework
 
 # Debugging for use in -current
-options 	DDB			# Enable the kernel debugger
+options 	KDB			# Enable kernel debugger support.
+options 	DDB			# Support DDB.
+options 	GDB			# Support remote GDB.
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 0ee57a5..b874fc4 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -61,7 +61,9 @@ options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 options 	PFIL_HOOKS		# pfil(9) framework
 
 # Debugging for use in -current
-options 	DDB			# Enable the kernel debugger
+options 	KDB			# Enable kernel debugger support.
+options 	DDB			# Support DDB.
+options 	GDB			# Support remote GDB.
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 9006237..859cd9d 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -28,10 +28,12 @@ makeoptions	DEBUG=-g	# Build kernel with debug information.
 
 options 	CD9660		# ISO 9660 Filesystem
 options 	COMPAT_43	# Compatible with BSD 4.3 [KEEP THIS!]
-options 	DDB		# Enable the kernel debugger
+options 	DDB		# Support DDB
 options 	FFS		# Berkeley Fast Filesystem
+options 	GDB		# Support remote GDB
 options 	INET		# InterNETworking
 options 	INET6		# IPv6 communications protocols
+options 	KDB		# Enable kernel debugger support
 options 	KTRACE		# ktrace(1) syscall trace support
 options 	MD_ROOT		# MD usable as root device
 options 	MSDOSFS		# MSDOS Filesystem
diff --git a/sys/ia64/conf/SKI b/sys/ia64/conf/SKI
index b7dad7d..c36ae65 100644
--- a/sys/ia64/conf/SKI
+++ b/sys/ia64/conf/SKI
@@ -27,10 +27,12 @@ makeoptions	DEBUG=-g	# Build kernel with debug information.
 makeoptions	NO_MODULES=yes	# Don't build any modules.
 
 options 	COMPAT_43	# Compatible with BSD 4.3 [KEEP THIS!]
-options 	DDB		# Enable the kernel debugger
+options 	DDB		# Support DDB
 options 	FFS		# Berkeley Fast Filesystem
+options 	GDB		# Support remote GDB
 options 	INET		# InterNETworking
 options 	INET6		# IPv6 communications protocols
+options 	KDB		# Enable kernel debugger support
 options 	KTRACE		# ktrace(1) syscall trace support
 options 	MD_ROOT		# MD usable as root device
 options 	PFIL_HOOKS	# pfil(9) framework
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index acbb240..889fe33 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -59,7 +59,9 @@ options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	PFIL_HOOKS		# pfil(9) framework
 
 # Debugging for use in -current
-options 	DDB			#Enable the kernel debugger
+options 	KDB			#Enable kernel debugger support
+options 	DDB			#Support DDB
+options 	GDB			#Support remote GDB
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			#Enable checks to detect deadlocks and cycles