From 3d2ffe2196f2ed63294af188a0e8558db20ac161 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sun, 20 Dec 1998 16:25:21 +0000 Subject: [PATCH] Fixed building elf kernels without a `make depend' step. The magic ordering in rev.1.38 was broken by putting setdef0.o before vnode_if.o in SYSTEM_OBJS. --- 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 ddf2f9bd7a7..2da7db89bf3 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.129 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.i386,v 1.130 1998/12/07 22:36:53 imp 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 setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so +SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ + setdef0.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 ddf2f9bd7a7..2da7db89bf3 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.129 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.i386,v 1.130 1998/12/07 22:36:53 imp 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 setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so +SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ + setdef0.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 ddf2f9bd7a7..2da7db89bf3 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.129 1998/11/15 18:07:35 dfr Exp $ +# $Id: Makefile.i386,v 1.130 1998/12/07 22:36:53 imp 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 setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so +SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ + setdef0.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