Module Name: src
Committed By: matt
Date: Sat Sep 5 03:52:33 UTC 2009
Modified Files:
src/gnu/lib/libgcc4/libgcc [matt-nb5-mips64]: Makefile
Log Message:
Change ${LD} -r -[Xx] to ${OBJCOPY}
Change ${LD} -r ... to ${CC} ${LDFLAGS} -nostdlib -Wl,-r so what ${CC} can
add addition ld options.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.8.1 src/gnu/lib/libgcc4/libgcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/lib/libgcc4/libgcc/Makefile
diff -u src/gnu/lib/libgcc4/libgcc/Makefile:1.7 src/gnu/lib/libgcc4/libgcc/Makefile:1.7.8.1
--- src/gnu/lib/libgcc4/libgcc/Makefile:1.7 Sun Oct 26 07:04:04 2008
+++ src/gnu/lib/libgcc4/libgcc/Makefile Sat Sep 5 03:52:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/26 07:04:04 mrg Exp $
+# $NetBSD: Makefile,v 1.7.8.1 2009/09/05 03:52:33 matt Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -30,7 +30,7 @@
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${OBJCOPY} -x ${.TARGET}.tmp2 ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
@@ -40,11 +40,11 @@
${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
${NM} -pg ${.TARGET}.tmp1 | \
${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
- ${CC} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
+ ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
.if defined(COPTS) && !empty(COPTS:M*-g*)
mv ${.TARGET}.tmp2 ${.TARGET}
.else
- ${LD} -x -r ${.TARGET}.tmp2 -o ${.TARGET}
+ ${OBJCOPY} -x ${.TARGET}.tmp2 ${.TARGET}
rm -f ${.TARGET}.tmp2
.endif
rm -f ${.TARGET}.tmp1
