From 1dd643abaeab4c58a74d28ee73edca2f2b7c0570 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 9 Oct 1998 23:26:26 +0000
Subject: [PATCH] Remove DDB_ELF_SYMBOLS and DDB_KLD_SYMBOLS options.  KLD will
 be the sole interface to symbols in an elf kernel.

---
 sys/conf/files   | 5 +++--
 sys/conf/options | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index d132d26f7b7..fbddd0faae1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -66,8 +66,8 @@ cam/scsi/scsi_pass.c	optional pass
 cam/scsi/scsi_scan.c	optional scan
 cam/scsi/scsi_target.c	optional targ
 ddb/db_access.c		optional ddb
-ddb/db_kld.c		optional ddb db_kld_symbols
-ddb/db_elf.c		optional ddb db_elf_symbols
+ddb/db_kld.c		optional ddb
+ddb/db_elf.c		optional ddb
 ddb/db_aout.c		optional ddb
 ddb/db_break.c		optional ddb
 ddb/db_command.c	optional ddb
@@ -205,6 +205,7 @@ kern/kern_intr.c	standard
 kern/kern_module.c	standard
 kern/kern_linker.c	standard
 kern/link_aout.c	standard
+kern/link_elf.c		standard
 kern/kern_acct.c	standard
 kern/kern_clock.c	standard
 kern/kern_conf.c	standard
diff --git a/sys/conf/options b/sys/conf/options
index 90cb8f82ed5..9d89047e267 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.102 1998/10/02 05:15:45 ken Exp $
+#	$Id: options,v 1.103 1998/10/07 03:30:55 gibbs Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -47,8 +47,6 @@ COMPILING_LINT	opt_lint.h
 DDB
 DDB_UNATTENDED	opt_ddb.h
 GDB_REMOTE_CHAT	opt_ddb.h
-DB_KLD_SYMBOLS	opt_ddb.h
-DB_ELF_SYMBOLS	opt_ddb.h
 DEVFS
 FAILSAFE
 HW_WDOG