diff options
author | peter <peter@FreeBSD.org> | 1998-11-04 15:27:41 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1998-11-04 15:27:41 +0000 |
commit | 61a53e2b63ae47157c2f0e3f738e6e942d7e6de2 (patch) | |
tree | 96f5b6ff4f1d5be5d4ea8a399f818e1588c63c38 /sys/conf | |
parent | abe415781a54116bcd2e4c69d9ae679300c2d482 (diff) | |
download | FreeBSD-src-61a53e2b63ae47157c2f0e3f738e6e942d7e6de2.zip FreeBSD-src-61a53e2b63ae47157c2f0e3f738e6e942d7e6de2.tar.gz |
Make a.out kernels kld compatable by default...
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/Makefile.i386 | 12 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 096b541..8d089fe 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 096b541..8d089fe 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 \ |