Sat Jan 11 02:45:52 2014 UTC ()
Don't pass -Wl,-x to ${CC} since that strips symbols needed by ARM BE.
Let the OBJCOPY strip them.


(matt)
diff -r1.17 -r1.18 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs diff -r1.17 -r1.18 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile 2014/01/11 00:30:23 1.17
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile 2014/01/11 02:45:52 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2014/01/11 00:30:23 matt Exp $ 1# $NetBSD: Makefile,v 1.18 2014/01/11 02:45:52 matt Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5NOPIC= # defined 5NOPIC= # defined
6NOPROFILE= # defined 6NOPROFILE= # defined
7 7
8LIB= gcc 8LIB= gcc
9 9
10.include <bsd.own.mk> 10.include <bsd.own.mk>
11 11
12.if ${MKGCC} != "no" 12.if ${MKGCC} != "no"
13 13
14.include <bsd.init.mk> 14.include <bsd.init.mk>
@@ -49,39 +49,39 @@ MKPIC:= no @@ -49,39 +49,39 @@ MKPIC:= no
49 49
50COPTS.unwind-dw2.c = -Wno-stack-protector 50COPTS.unwind-dw2.c = -Wno-stack-protector
51 51
52.include <bsd.lib.mk> 52.include <bsd.lib.mk>
53 53
54 54
55CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2} 55CLEANFILES+= ${SOBJS:=.tmp1} ${SOBJS:=.tmp2}
56 56
57.c.o: 57.c.o:
58 ${_MKTARGET_COMPILE} 58 ${_MKTARGET_COMPILE}
59 ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1 59 ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
60 ${NM} -pg ${.TARGET}.tmp1 | \ 60 ${NM} -pg ${.TARGET}.tmp1 | \
61 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \ 61 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
62 ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler - 62 ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
63.if defined(COPTS) && !empty(COPTS:M*-g*) 63.if defined(COPTS) && !empty(COPTS:M*-g*)
64 mv ${.TARGET}.tmp2 ${.TARGET} 64 mv ${.TARGET}.tmp2 ${.TARGET}
65.else 65.else
66 ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET} 66 ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET}
67 rm -f ${.TARGET}.tmp2 67 rm -f ${.TARGET}.tmp2
68.endif 68.endif
69 rm -f ${.TARGET}.tmp1 69 rm -f ${.TARGET}.tmp1
70 70
71.S.o .s.o: 71.S.o .s.o:
72 ${_MKTARGET_COMPILE} 72 ${_MKTARGET_COMPILE}
73 ${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1 73 ${COMPILE.S} ${PICFLAGS} ${CFLAGS:M-[ID]*} ${.IMPSRC} -o ${.TARGET}.tmp1
74 ${NM} -pg ${.TARGET}.tmp1 | \ 74 ${NM} -pg ${.TARGET}.tmp1 | \
75 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \ 75 ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
76 ${CC} ${COPTS} -Wl,-x -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler - 76 ${CC} ${COPTS} -r -nostdinc -nostdlib -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -
77.if defined(COPTS) && !empty(COPTS:M*-g*) 77.if defined(COPTS) && !empty(COPTS:M*-g*)
78 mv ${.TARGET}.tmp2 ${.TARGET} 78 mv ${.TARGET}.tmp2 ${.TARGET}
79.else 79.else
80 ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET} 80 ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.tmp2 ${.TARGET}
81 rm -f ${.TARGET}.tmp2 81 rm -f ${.TARGET}.tmp2
82.endif 82.endif
83 rm -f ${.TARGET}.tmp1 83 rm -f ${.TARGET}.tmp1
84 84
85.else 85.else
86.include <bsd.prog.mk> # do nothing 86.include <bsd.prog.mk> # do nothing
87.endif 87.endif