Fri Dec 2 22:28:47 2011 UTC ()
actually pass $COPTS to the compiler
ok mrg@


(macallan)
diff -r1.5 -r1.6 src/external/gpl3/gcc/lib/crtstuff/Makefile
cvs diff -r1.5 -r1.6 src/external/gpl3/gcc/lib/crtstuff/Makefile (expand / switch to unified diff)

--- src/external/gpl3/gcc/lib/crtstuff/Makefile 2011/07/01 05:07:46 1.5
+++ src/external/gpl3/gcc/lib/crtstuff/Makefile 2011/12/02 22:28:47 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2011/07/01 05:07:46 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2011/12/02 22:28:47 macallan Exp $
2 2
3REQUIRETOOLS= yes 3REQUIRETOOLS= yes
4NOLINT= # defined 4NOLINT= # defined
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8# If using an external toolchain, we expect crtbegin/crtend to be 8# If using an external toolchain, we expect crtbegin/crtend to be
9# supplied by that toolchain's run-time support. 9# supplied by that toolchain's run-time support.
10.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no" 10.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no"
11 11
12DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist 12DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
13GNUHOSTDIST= ${DIST} 13GNUHOSTDIST= ${DIST}
14GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH} 14GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
@@ -51,27 +51,27 @@ FILESDIR=${LIBDIR} @@ -51,27 +51,27 @@ FILESDIR=${LIBDIR}
51.PATH: ${DIST}/gcc ${DIST}/gcc/config ${G_CONFIGDIR} 51.PATH: ${DIST}/gcc ${DIST}/gcc/config ${G_CONFIGDIR}
52 52
53.include "../Makefile.tconfigh" 53.include "../Makefile.tconfigh"
54EXTRA_FAKEHEADERS= options.h 54EXTRA_FAKEHEADERS= options.h
55.include "../Makefile.hacks" 55.include "../Makefile.hacks"
56 56
57${OBJS}: ${DPSRCS} 57${OBJS}: ${DPSRCS}
58 58
59.include <bsd.prog.mk> 59.include <bsd.prog.mk>
60 60
61# Override the default .c -> .o rule. 61# Override the default .c -> .o rule.
62.c.o: 62.c.o:
63 ${_MKTARGET_COMPILE} 63 ${_MKTARGET_COMPILE}
64 ${CC} ${CPPFLAGS} ${CPPFLAGS.${.TARGET}} ${GCFLAGS} ${CPUFLAGS} -c ${.IMPSRC} -o ${.TARGET}.o 64 ${CC} ${CPPFLAGS} ${CPPFLAGS.${.TARGET}} ${GCFLAGS} ${COPTS} ${COPTS.${.TARGET}} ${CPUFLAGS} -c ${.IMPSRC} -o ${.TARGET}.o
65 mv ${.TARGET}.o ${.TARGET} 65 mv ${.TARGET}.o ${.TARGET}
66 66
67.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el") 67.if (${MACHINE_ARCH} == "mips64eb") || (${MACHINE_ARCH} == "mips64el")
68# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS>0 68# Turn off as(1) warnings on MIPS, since warnings are fatal with WARNS>0
69# and GCC configury passes -finhibit-size-directive which causes mips-gas 69# and GCC configury passes -finhibit-size-directive which causes mips-gas
70# to barf. Don't know what the real fix for this is... 70# to barf. Don't know what the real fix for this is...
71# 71#
72# XXX should be COPTS, but that's too early 72# XXX should be COPTS, but that's too early
73CPUFLAGS+=-Wa,--no-warn 73CPUFLAGS+=-Wa,--no-warn
74.endif 74.endif
75 75
76.else 76.else
77 77