Module Name: src
Committed By: mrg
Date: Mon Dec 14 08:51:16 UTC 2009
Modified Files:
src/share/mk: bsd.kmodule.mk bsd.prog.mk
Log Message:
use "${CC} -r" not "${CC} -Wl,-r" as the latter fools GCC on some targets
and it ends up passing "-r -relax" to ld, which causes ld to barf.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.245 -r1.246 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.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.22 src/share/mk/bsd.kmodule.mk:1.23
--- src/share/mk/bsd.kmodule.mk:1.22 Mon Dec 14 01:00:46 2009
+++ src/share/mk/bsd.kmodule.mk Mon Dec 14 08:51:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.22 2009/12/14 01:00:46 matt Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.23 2009/12/14 08:51:16 mrg Exp $
# We are not building this with PIE
MKPIE=no
@@ -43,7 +43,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.245 src/share/mk/bsd.prog.mk:1.246
--- src/share/mk/bsd.prog.mk:1.245 Mon Dec 14 01:00:46 2009
+++ src/share/mk/bsd.prog.mk Mon Dec 14 08:51:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.245 2009/12/14 01:00:46 matt Exp $
+# $NetBSD: bsd.prog.mk,v 1.246 2009/12/14 08:51:16 mrg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -309,7 +309,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}
