3 files changed, 6 insertions, 30 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 096b541b014a..8d089feedcce 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.126 1998/10/10 01:00:56 peter Exp $
+#	$Id: Makefile.i386,v 1.127 1998/10/23 17:05:05 bde Exp $
 #
 # Makefile for FreeBSD
 #
@@ -86,14 +86,7 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
-.if ${KERNFORMAT} == aout
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
-SYSTEM_LD= @${LD} -aout -Bstatic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
-SYSTEM_LD_TAIL= @echo rearranging symbols; \
-	symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \
-	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
-.endif
-.if ${KERNFORMAT} == aoutkld
+.if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
@@ -101,7 +94,6 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 .if ${KERNFORMAT} == elf
-# kld compatable export of symbols.
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.so
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 096b541b014a..8d089feedcce 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.126 1998/10/10 01:00:56 peter Exp $
+#	$Id: Makefile.i386,v 1.127 1998/10/23 17:05:05 bde Exp $
 #
 # Makefile for FreeBSD
 #
@@ -86,14 +86,7 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
-.if ${KERNFORMAT} == aout
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
-SYSTEM_LD= @${LD} -aout -Bstatic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
-SYSTEM_LD_TAIL= @echo rearranging symbols; \
-	symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \
-	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
-.endif
-.if ${KERNFORMAT} == aoutkld
+.if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
@@ -101,7 +94,6 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 .if ${KERNFORMAT} == elf
-# kld compatable export of symbols.
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.so
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 096b541b014a..8d089feedcce 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.126 1998/10/10 01:00:56 peter Exp $
+#	$Id: Makefile.i386,v 1.127 1998/10/23 17:05:05 bde Exp $
 #
 # Makefile for FreeBSD
 #
@@ -86,14 +86,7 @@ SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS}
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_HEAD= @echo loading ${.TARGET}; rm -f ${.TARGET}
-.if ${KERNFORMAT} == aout
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
-SYSTEM_LD= @${LD} -aout -Bstatic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
-SYSTEM_LD_TAIL= @echo rearranging symbols; \
-	symorder -m ${SYMORDER_EXCLUDE} symbols.sort ${.TARGET}; \
-	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
-.endif
-.if ${KERNFORMAT} == aoutkld
+.if ${KERNFORMAT} == aout || ${KERNFORMAT} == aoutkld
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o
 SYSTEM_LD= @${LD} -aout -Bforcedynamic -Z -T ${LOAD_ADDRESS} -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
@@ -101,7 +94,6 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 .if ${KERNFORMAT} == elf
-# kld compatable export of symbols.
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.so
 SYSTEM_LD= @${LD} -elf -Bdynamic -T $S/i386/conf/kernel.script \