diff options
| author | msmith <msmith@FreeBSD.org> | 1998-12-21 10:29:09 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1998-12-21 10:29:09 +0000 |
| commit | 61a91ed7ca40658c8f392f2e028d75350fa10537 (patch) | |
| tree | d479fa8d22a9c3bd0c8557cabba90e57bd9b5108 | |
| parent | 14f77a8caec264ab971a6457f34b259e354d4e8e (diff) | |
| download | FreeBSD-src-61a91ed7ca40658c8f392f2e028d75350fa10537.zip FreeBSD-src-61a91ed7ca40658c8f392f2e028d75350fa10537.tar.gz | |
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.
| -rw-r--r-- | sys/conf/Makefile.i386 | 6 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 6 | ||||
| -rw-r--r-- | 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 2da7db8..c48432f 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 2da7db8..c48432f 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 2da7db8..c48432f 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 |
