summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-08-11 20:50:16 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-08-11 20:50:16 +0000
commitb4b728921807aedab6e41cd0ad9af1d4093aaeca (patch)
tree65a6fe7f240dcda33cf2c90b05aab26d574a50ad /sys/conf
parent6b6b7207939c6ee0212c889d185c8f8773656f84 (diff)
Merge DDBCTF into DDB.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC3
-rw-r--r--sys/conf/files4
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index bc01cc9b7dc..bbac53bcb02 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,11 +1,10 @@
-# $OpenBSD: GENERIC,v 1.245 2017/07/30 18:16:14 florian Exp $
+# $OpenBSD: GENERIC,v 1.246 2017/08/11 20:50:15 mpi Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
option DDB # in-kernel debugger
#option DDBPROF # ddb(4) based profiling
-#option DDBCTF # DDB support for CTF
#option DDB_SAFE_CONSOLE # allow break into ddb during boot
#makeoptions DEBUG="" # do not compile full symbol table
#makeoptions PROF="-pg" # build profiled kernel
diff --git a/sys/conf/files b/sys/conf/files
index 56f13e402a5..8aafd6cc06c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.650 2017/07/31 16:47:03 florian Exp $
+# $OpenBSD: files,v 1.651 2017/08/11 20:50:15 mpi Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -598,7 +598,7 @@ file net/if_pppoe.c pppoe needs-flag
file ddb/db_access.c ddb
file ddb/db_break.c ddb
file ddb/db_command.c ddb
-file ddb/db_ctf.c ddb & ddbctf
+file ddb/db_ctf.c ddb
file ddb/db_dwarf.c ddb
file ddb/db_elf.c ddb
file ddb/db_examine.c ddb