From 3d89c2cdb2877e06290155608554cf543f395e59 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Mon, 21 Dec 1998 10:29:09 +0000
Subject: [PATCH] Regrettably, you can't take setdef0.c out of order, or,
 surprise, linker sets don't work and thus neither does the kernel.

This should stop being a problem with an improved linker set mechanism in
the pipeline (see the bootloader) but for now this has to stay like this.
---
 sys/conf/Makefile.i386      | 6 +++---
 sys/conf/Makefile.powerpc   | 6 +++---
 sys/i386/conf/Makefile.i386 | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 2da7db89bf3..c48432f3d75 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.130 1998/12/07 22:36:53 imp Exp $
+#	$Id: Makefile.i386,v 1.131 1998/12/20 16:25:21 bde Exp $
 #
 # Makefile for FreeBSD
 #
@@ -94,8 +94,8 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 .if ${KERNFORMAT} == elf
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef0.o setdef1.o hack.so
+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 \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 2da7db89bf3..c48432f3d75 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.130 1998/12/07 22:36:53 imp Exp $
+#	$Id: Makefile.i386,v 1.131 1998/12/20 16:25:21 bde Exp $
 #
 # Makefile for FreeBSD
 #
@@ -94,8 +94,8 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 .if ${KERNFORMAT} == elf
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef0.o setdef1.o hack.so
+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 \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 2da7db89bf3..c48432f3d75 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.130 1998/12/07 22:36:53 imp Exp $
+#	$Id: Makefile.i386,v 1.131 1998/12/20 16:25:21 bde Exp $
 #
 # Makefile for FreeBSD
 #
@@ -94,8 +94,8 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	size -aout ${.TARGET} ; chmod 755 ${.TARGET}
 .endif
 .if ${KERNFORMAT} == elf
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef0.o setdef1.o hack.so
+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 \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o