Initiate deorbit burn of i386 a.out kld "support" in loader. Note that

this was quite broken, it never was updated for metadata support.
The a.out kld file support was never really used, as it wasn't necessary.
You could always load elf kld's, even in an a.out kernel.

6 files changed, 2 insertions, 14 deletions

diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index bf76992..3f6c910 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -4,10 +4,6 @@ SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c
 SRCS+=	interp_backslash.c interp_parse.c load_elf.c ls.c misc.c 
 SRCS+=	module.c panic.c
 
-.if defined(LOADER_AOUT_SUPPORT)
-SRCS+=	load_aout.c
-.endif
-
 .if defined(LOADER_NET_SUPPORT)
 SRCS+=	dev_net.c
 .endif
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 1268e02..19fa0bf 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -3,7 +3,7 @@
 LIB=			i386
 INTERNALLIB=		true
 
-SRCS=	aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
+SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
 	biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
 	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
 	time.c vidconsole.c
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 0ad1276..68b6e21 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -6,9 +6,6 @@ STRIP=
 NEWVERSWHAT=	"bootstrap loader" i386
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
-.if !defined(LOADER_NO_AOUT_SUPPORT)
-LOADER_AOUT_SUPPORT=	yes
-.endif
 
 # architecture-specific loader code
 SRCS=		main.c conf.c
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 9e31735..bd70375 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -81,12 +81,10 @@ struct fs_ops *file_system[] = {
  * Sort formats so that those that can detect based on arguments
  * rather than reading the file go first.
  */
-extern struct file_format	i386_aout;
 extern struct file_format	i386_elf;
 
 struct file_format *file_formats[] = {
     &i386_elf,
-    &i386_aout,
     NULL
 };
 
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index a09d0b7..e2991a1 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -5,7 +5,7 @@ INTERNALLIB=		true
 
 .PATH:	${.CURDIR}/../../i386/libi386
 
-SRCS=	aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
+SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
 	biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \
 	i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
 	time.c vidconsole.c
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index eff2fec..1e05ec5 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -6,9 +6,6 @@ STRIP=
 NEWVERSWHAT=	"bootstrap loader" pc98
 BINDIR?=	/boot
 INSTALLFLAGS=	-b
-.if !defined(LOADER_NO_AOUT_SUPPORT)
-LOADER_AOUT_SUPPORT=	yes
-.endif
 
 CFLAGS+=	-ffreestanding
 CFLAGS+=	-DPC98