Module Name: src Committed By: mrg Date: Tue Dec 22 04:47:26 UTC 2009
Modified Files: src/share/mk [matt-nb5-mips64]: bsd.kmod.mk bsd.kmodule.mk bsd.prog.mk Log Message: use ${CC} -r not -Wl,-r, from -current. To generate a diff of this commit: cvs rdiff -u -r1.89.6.1 -r1.89.6.2 src/share/mk/bsd.kmod.mk cvs rdiff -u -r1.13.2.1.2.1.2.1 -r1.13.2.1.2.1.2.2 \ src/share/mk/bsd.kmodule.mk cvs rdiff -u -r1.239.2.1.2.1.2.1 -r1.239.2.1.2.1.2.2 src/share/mk/bsd.prog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/mk/bsd.kmod.mk diff -u src/share/mk/bsd.kmod.mk:1.89.6.1 src/share/mk/bsd.kmod.mk:1.89.6.2 --- src/share/mk/bsd.kmod.mk:1.89.6.1 Sat Sep 5 03:38:23 2009 +++ src/share/mk/bsd.kmod.mk Tue Dec 22 04:47:25 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.kmod.mk,v 1.89.6.1 2009/09/05 03:38:23 matt Exp $ +# $NetBSD: bsd.kmod.mk,v 1.89.6.2 2009/12/22 04:47:25 mrg Exp $ .include <bsd.init.mk> .include <bsd.klinks.mk> @@ -46,7 +46,7 @@ ${MACHINE_CPU} == "powerpc" ${KMOD}_tmp.o: ${OBJS} ${DPADD} ${_MKTARGET_COMPILE} - ${CC} ${LDFLAGS} -nostdlib -Wl,-r -o tmp.o ${OBJS} + ${CC} ${LDFLAGS} -r -nostdlib -Wl -o tmp.o ${OBJS} mv tmp.o ${.TARGET} ${KMOD}_tramp.S: ${KMOD}_tmp.o $S/lkm/arch/${MACHINE_CPU}/lkmtramp.awk @@ -58,7 +58,7 @@ ${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o ${_MKTARGET_LINK} - ${CC} ${LDFLAGS} -nostdlib -Wl,-r \ + ${CC} ${LDFLAGS} -nostdlib -r \ `${OBJDUMP} --syms --reloc ${KMOD}_tmp.o | \ ${TOOL_AWK} -f $S/lkm/arch/${MACHINE_CPU}/lkmwrap.awk` \ -o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o @@ -73,7 +73,7 @@ .else ${PROG}: ${OBJS} ${DPADD} ${_MKTARGET_LINK} - ${CC} ${LDFLAGS} -nostdlib -Wl,-r -o tmp.o ${OBJS} + ${CC} ${LDFLAGS} -nostdlib -r -o tmp.o ${OBJS} mv tmp.o ${.TARGET} .endif Index: src/share/mk/bsd.kmodule.mk diff -u src/share/mk/bsd.kmodule.mk:1.13.2.1.2.1.2.1 src/share/mk/bsd.kmodule.mk:1.13.2.1.2.1.2.2 --- src/share/mk/bsd.kmodule.mk:1.13.2.1.2.1.2.1 Sat Sep 5 03:38:23 2009 +++ src/share/mk/bsd.kmodule.mk Tue Dec 22 04:47:25 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.kmodule.mk,v 1.13.2.1.2.1.2.1 2009/09/05 03:38:23 matt Exp $ +# $NetBSD: bsd.kmodule.mk,v 1.13.2.1.2.1.2.2 2009/12/22 04:47:25 mrg Exp $ .include <bsd.init.mk> .include <bsd.klinks.mk> @@ -40,7 +40,7 @@ ${PROG}: ${OBJS} ${DPADD} ${_MKTARGET_LINK} - ${CC} ${LDFLAGS} -nostdlib -Wl,-T,${KMODSCRIPT},-r,-d \ + ${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \ -o ${.TARGET} ${OBJS} ##### Install rules Index: src/share/mk/bsd.prog.mk diff -u src/share/mk/bsd.prog.mk:1.239.2.1.2.1.2.1 src/share/mk/bsd.prog.mk:1.239.2.1.2.1.2.2 --- src/share/mk/bsd.prog.mk:1.239.2.1.2.1.2.1 Sat Sep 5 03:38:23 2009 +++ src/share/mk/bsd.prog.mk Tue Dec 22 04:47:26 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.239.2.1.2.1.2.1 2009/09/05 03:38:23 matt Exp $ +# $NetBSD: bsd.prog.mk,v 1.239.2.1.2.1.2.2 2009/12/22 04:47:26 mrg Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -316,7 +316,7 @@ ${_P}.ro: ${OBJS.${_P}} ${DPADD} ${_MKTARGET_LINK} - ${CC} ${LDFLAGS} -nostdlib -Wl,-r,-dc -o ${.TARGET} ${OBJS.${_P}} + ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}} .if defined(_PROGDEBUG.${_P}) ${_PROGDEBUG.${_P}}: ${_P}