Remove option DDB_STRUCTINFO. Now that ddb(4) is CTF aware, similar

functionnalities are available in GENERIC.

ok jasper@, deraadt@, guenther@, dlg@

1 files changed, 2 insertions, 27 deletions

diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 1449daacff3..adc890e3a9c 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.117 2017/08/12 20:26:11 mpi Exp $
+#	$OpenBSD: Makefile.i386,v 1.118 2017/09/12 08:23:42 mpi Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -53,12 +53,6 @@ AFLAGS+=	-m32
 LINKFLAGS+= -melf_i386_obsd
 .endif
 
-.if ${IDENT:M-DDDB_STRUCT}
-DB_STRUCTINFO=	db_structinfo.h
-.else
-DB_STRUCTINFO=
-.endif
-
 HOSTCC?=	${CC}
 HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
 HOSTED_CFLAGS=	${CFLAGS}
@@ -142,7 +136,7 @@ vers.o: ${SYSTEM_DEP:Ngap.o}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
 clean:
-	rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* ${DB_STRUCTINFO} \
+	rm -f *bsd *bsd.gdb *.[dio] [a-z]*.s assym.* \
 	    gap.link ld.script lorder makegap.sh param.c
 
 cleandir: clean
@@ -150,11 +144,6 @@ cleandir: clean
 
 depend obj:
 
-db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.pl
-	${CC} ${CFLAGS} ${CPPFLAGS} -MT $@ -gstabs -c $S/ddb/db_structinfo.c
-	objdump -g db_structinfo.o | perl $S/ddb/parse_structinfo.pl > $@
-	rm -f db_structinfo.o
-
 locore0.o: ${_machdir}/${_mach}/locore0.S assym.h
 locore.o mutex.o in_cksum.o mptramp.o: assym.h
 kvm86call.o acpi_wakecode.o vmm_support.o: assym.h
@@ -166,18 +155,4 @@ newinstall:
 
 install: update-link newinstall
 
-# pull in the dependency information
-.if !empty(DB_STRUCTINFO) && !exists(${DB_STRUCTINFO})
- ${SYSTEM_OBJ}: ${DB_STRUCTINFO}
-.endif
-.ifnmake clean
-. for o in ${SYSTEM_OBJ:Ngap.o} assym.h ${DB_STRUCTINFO}
-.  if exists(${o:R}.d)
-.   include "${o:R}.d"
-.  elif exists($o)
-    .PHONY: $o
-.  endif
-. endfor
-.endif
-
 %RULES