Module Name: src
Committed By: matt
Date: Sat Sep 5 03:38:23 UTC 2009
Modified Files:
src/share/mk [matt-nb5-mips64]: bsd.kmod.mk bsd.kmodule.mk bsd.prog.mk
Log Message:
Change ${LD} -r to ${CC} ${LDFLAGS} -nostdlib -Wl,-r
This is so ${CC} will invoke ld with appropriate options generated from
${LDFLAGS}
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.89.6.1 src/share/mk/bsd.kmod.mk
cvs rdiff -u -r1.13.2.1.2.1 -r1.13.2.1.2.1.2.1 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.239.2.1.2.1 -r1.239.2.1.2.1.2.1 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 src/share/mk/bsd.kmod.mk:1.89.6.1
--- src/share/mk/bsd.kmod.mk:1.89 Sun Oct 19 22:05:21 2008
+++ src/share/mk/bsd.kmod.mk Sat Sep 5 03:38:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmod.mk,v 1.89 2008/10/19 22:05:21 apb Exp $
+# $NetBSD: bsd.kmod.mk,v 1.89.6.1 2009/09/05 03:38:23 matt Exp $
.include <bsd.init.mk>
.include <bsd.klinks.mk>
@@ -46,7 +46,7 @@
${MACHINE_CPU} == "powerpc"
${KMOD}_tmp.o: ${OBJS} ${DPADD}
${_MKTARGET_COMPILE}
- ${LD} -r -o tmp.o ${OBJS}
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-r -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}
- ${LD} -r \
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-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}
- ${LD} -r -o tmp.o ${OBJS}
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-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 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 Sat Jun 6 22:10:49 2009
+++ src/share/mk/bsd.kmodule.mk Sat Sep 5 03:38:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.13.2.1.2.1 2009/06/06 22:10:49 bouyer Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.13.2.1.2.1.2.1 2009/09/05 03:38:23 matt Exp $
.include <bsd.init.mk>
.include <bsd.klinks.mk>
@@ -40,7 +40,8 @@
${PROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
- ${LD} -T ${KMODSCRIPT} -r -d -o ${.TARGET} ${OBJS}
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-T,${KMODSCRIPT},-r,-d \
+ -o ${.TARGET} ${OBJS}
##### Install rules
.if !target(kmodinstall)
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.239.2.1.2.1 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 Sat Jun 6 22:10:49 2009
+++ src/share/mk/bsd.prog.mk Sat Sep 5 03:38:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.239.2.1.2.1 2009/06/06 22:10:49 bouyer Exp $
+# $NetBSD: bsd.prog.mk,v 1.239.2.1.2.1.2.1 2009/09/05 03:38:23 matt Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -316,7 +316,7 @@
${_P}.ro: ${OBJS.${_P}} ${DPADD}
${_MKTARGET_LINK}
- ${LD} -r -dc -o ${.TARGET} ${OBJS.${_P}}
+ ${CC} ${LDFLAGS} -nostdlib -Wl,-r,-dc -o ${.TARGET} ${OBJS.${_P}}
.if defined(_PROGDEBUG.${_P})
${_PROGDEBUG.${_P}}: ${_P}
