From ffcc901f03be5fe906be6bc5e1cbe34adcd2f3d1 Mon Sep 17 00:00:00 2001 From: jdp Date: Sat, 9 Jan 1999 21:51:00 +0000 Subject: Switch to using ".So" as the extension for PIC object files rather than ".so". The old extension conflicted with well-established naming conventions for dynamically loadable modules. The "clean" targets continue to remove ".so" files too, to deal with old systems. --- sys/alpha/conf/Makefile.alpha | 8 ++++---- sys/conf/Makefile.alpha | 8 ++++---- sys/conf/Makefile.i386 | 13 +++++++------ sys/conf/Makefile.pc98 | 13 +++++++------ sys/conf/Makefile.powerpc | 13 +++++++------ sys/i386/conf/Makefile.i386 | 13 +++++++------ sys/pc98/conf/Makefile.pc98 | 13 +++++++------ 7 files changed, 43 insertions(+), 38 deletions(-) (limited to 'sys') diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha index b505986..99f6169 100644 --- a/sys/alpha/conf/Makefile.alpha +++ b/sys/alpha/conf/Makefile.alpha @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $Id: Makefile.alpha,v 1.14 1998/12/07 22:36:53 imp Exp $ +# $Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $ # # Makefile for FreeBSD # @@ -78,7 +78,7 @@ SYSTEM_LD_HEAD= @echo loading $@; rm -f $@ .if ${BINFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \ ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + setdef1.o hack.So SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \ -o $@ -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@ @@ -124,9 +124,9 @@ symbols.sort: ${ALPHA}/alpha/symbols.raw locore.o: ${ALPHA}/alpha/locore.s assym.s ${NORMAL_S} -hack.so: Makefile +hack.So: Makefile echo "void __elf_kld_hack() {}" > hack.c - ${CC} -shared -nostdlib hack.c -o hack.so + ${CC} -shared -nostdlib hack.c -o hack.So rm -f hack.c setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index b505986..99f6169 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $Id: Makefile.alpha,v 1.14 1998/12/07 22:36:53 imp Exp $ +# $Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $ # # Makefile for FreeBSD # @@ -78,7 +78,7 @@ SYSTEM_LD_HEAD= @echo loading $@; rm -f $@ .if ${BINFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o \ ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + setdef1.o hack.So SYSTEM_LD= @${LD} --export-dynamic -T$S/alpha/conf/kernel.script -e locorestart \ -o $@ -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@ @@ -124,9 +124,9 @@ symbols.sort: ${ALPHA}/alpha/symbols.raw locore.o: ${ALPHA}/alpha/locore.s assym.s ${NORMAL_S} -hack.so: Makefile +hack.So: Makefile echo "void __elf_kld_hack() {}" > hack.c - ${CC} -shared -nostdlib hack.c -o hack.so + ${CC} -shared -nostdlib hack.c -o hack.So rm -f hack.c setdef0.o: ${ALPHA}/alpha/setdef0.c setdefs.h diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 1905403..e4e8fd30 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.132 1998/12/21 10:29:09 msmith Exp $ +# $Id: Makefile.i386,v 1.133 1999/01/07 06:52:41 peter Exp $ # # Makefile for FreeBSD # @@ -95,7 +95,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ .endif .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + 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 @@ -122,8 +122,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} .endif clean: - rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ - makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ + rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \ + kernel linterrs makelinks param.c setdefs.h \ + symbols.exclude symbols.sort tags \ vers.c vnode_if.c vnode_if.h ${CLEAN} #lint: /tmp param.c @@ -147,9 +148,9 @@ locore.o: ${I386}/i386/locore.s assym.s # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. -hack.so: Makefile +hack.So: Makefile touch hack.c - ${CC} -elf -shared -nostdlib hack.c -o hack.so + ${CC} -elf -shared -nostdlib hack.c -o hack.So rm -f hack.c .endif diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index b62b6ff..527d6fa 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.48 1998/12/25 09:03:18 kato Exp $ +# $Id: Makefile.pc98,v 1.49 1999/01/08 15:59:41 kato Exp $ # # Makefile for FreeBSD # @@ -98,7 +98,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ .endif .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + 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 @@ -125,8 +125,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} .endif clean: - rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ - makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ + rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \ + kernel linterrs makelinks param.c setdefs.h \ + symbols.exclude symbols.sort tags \ vers.c vnode_if.c vnode_if.h ${CLEAN} #lint: /tmp param.c @@ -150,9 +151,9 @@ locore.o: ${I386}/i386/locore.s assym.s # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. -hack.so: Makefile +hack.So: Makefile touch hack.c - ${CC} -elf -shared -nostdlib hack.c -o hack.so + ${CC} -elf -shared -nostdlib hack.c -o hack.So rm -f hack.c .endif diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 1905403..e4e8fd30 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.132 1998/12/21 10:29:09 msmith Exp $ +# $Id: Makefile.i386,v 1.133 1999/01/07 06:52:41 peter Exp $ # # Makefile for FreeBSD # @@ -95,7 +95,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ .endif .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + 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 @@ -122,8 +122,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} .endif clean: - rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ - makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ + rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \ + kernel linterrs makelinks param.c setdefs.h \ + symbols.exclude symbols.sort tags \ vers.c vnode_if.c vnode_if.h ${CLEAN} #lint: /tmp param.c @@ -147,9 +148,9 @@ locore.o: ${I386}/i386/locore.s assym.s # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. -hack.so: Makefile +hack.So: Makefile touch hack.c - ${CC} -elf -shared -nostdlib hack.c -o hack.so + ${CC} -elf -shared -nostdlib hack.c -o hack.So rm -f hack.c .endif diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 1905403..e4e8fd30 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.132 1998/12/21 10:29:09 msmith Exp $ +# $Id: Makefile.i386,v 1.133 1999/01/07 06:52:41 peter Exp $ # # Makefile for FreeBSD # @@ -95,7 +95,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ .endif .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + 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 @@ -122,8 +122,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} .endif clean: - rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ - makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ + rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \ + kernel linterrs makelinks param.c setdefs.h \ + symbols.exclude symbols.sort tags \ vers.c vnode_if.c vnode_if.h ${CLEAN} #lint: /tmp param.c @@ -147,9 +148,9 @@ locore.o: ${I386}/i386/locore.s assym.s # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. -hack.so: Makefile +hack.So: Makefile touch hack.c - ${CC} -elf -shared -nostdlib hack.c -o hack.so + ${CC} -elf -shared -nostdlib hack.c -o hack.So rm -f hack.c .endif diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98 index b62b6ff..527d6fa 100644 --- a/sys/pc98/conf/Makefile.pc98 +++ b/sys/pc98/conf/Makefile.pc98 @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.pc98,v 1.48 1998/12/25 09:03:18 kato Exp $ +# $Id: Makefile.pc98,v 1.49 1999/01/08 15:59:41 kato Exp $ # # Makefile for FreeBSD # @@ -98,7 +98,7 @@ SYSTEM_LD_TAIL= @echo rearranging symbols; \ .endif .if ${KERNFORMAT} == elf SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \ - setdef1.o hack.so + 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 @@ -125,8 +125,9 @@ ${SYSTEM_OBJS}: ${BEFORE_DEPEND:M*.h} .endif clean: - rm -f *.o *.so *.ko *.s eddep errs genassym gensetdefs kernel linterrs \ - makelinks param.c setdefs.h symbols.exclude symbols.sort tags \ + rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \ + kernel linterrs makelinks param.c setdefs.h \ + symbols.exclude symbols.sort tags \ vers.c vnode_if.c vnode_if.h ${CLEAN} #lint: /tmp param.c @@ -150,9 +151,9 @@ locore.o: ${I386}/i386/locore.s assym.s # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. -hack.so: Makefile +hack.So: Makefile touch hack.c - ${CC} -elf -shared -nostdlib hack.c -o hack.so + ${CC} -elf -shared -nostdlib hack.c -o hack.So rm -f hack.c .endif -- cgit v1.1