--- Gnu-Mach/i386/Makefrag	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/i386/Makefrag	2020/09/02 04:37:53	1.1.1.2
@@ -17,7 +17,7 @@
 DEFINES += -DCONTINUATIONS -DLINUX_DEV -D__ELF__ -Di386
 
 # Source files for any i386 kernel
-i386at-files = autoconf.c blit.c conf.c cons_conf.c fd.c rtc.c \
+i386at-files = autoconf.c blit.c com.c conf.c cons_conf.c fd.c rtc.c \
 	i386at_ds_routines.c immc.c int_init.c iopl.c kd.c kd_event.c \
 	kd_mouse.c kd_queue.c model_dep.c phys_mem_grab_page.c pic_isa.c
 i386-files = ast_check.c db_disasm.c db_interface.c db_trace.c debug_i386.c \
@@ -26,9 +26,6 @@ i386-files = ast_check.c db_disasm.c db_
 	phys.c pic.c pit.c seg.c trap.c user_ldt.c
 intel-files = pmap.c read_fault.c
 
-# Drivers; not used in all kernel, but only if selected.
-driver-files= com.c
-
 # Assembler source
 i386at-Sfiles = boothdr.S interrupt.S kdasm.S
 i386-Sfiles = cswitch.S debug_trace.S idt_inittab.S locore.S spl.S
@@ -49,6 +46,11 @@ objfiles += fpe.o
 # Mig-generated
 objfiles += mach_i386_server.o
 
+# This file is only needed for KDB support.
+ifeq ($(enable_kdb),yes)
+objfiles += _setjmp.o
+endif
+
 ### Linux device drivers (make this Better, Please)
 
 linux-gen-files = $(addprefix linux_,$(linux-gen-names))
@@ -66,7 +68,7 @@ linux-net-files = 3c501.c 3c503.c 3c505.
 
 linux-pci-files = bios32.c pci.c
 
-linux-scsi-files = 53c7,8xx.c AM53C974.c BusLogic.c NCR53c406a.c advansys.c \
+linux-scsi-files = 53c78xx.c AM53C974.c BusLogic.c NCR53c406a.c advansys.c \
 	aha152x.c aha1542.c aha1740.c aic7xxx.c constants.c eata.c eata_dma.c \
 	eata_pio.c fdomain.c g_NCR5380.c hosts.c in2000.c pas16.c qlogic.c \
 	scsi.c scsi_debug.c scsi_ioctl.c scsi_proc.c scsicam.c sd.c \
@@ -119,7 +121,7 @@ endif
 
 
 include i386/driverlist
-objfiles += $(device_drivers)
+objfiles += $(sort $(device_drivers))