Module Name:    src
Committed By:   mrg
Date:           Thu Aug  3 22:01:30 UTC 2017

Modified Files:
        src/external/gpl3/gcc.old/lib/libgcc/libgcc: Makefile
        src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile

Log Message:
pass the target specific CPUFLAGS and CPPFLAGS for the .c.o rule.
should fix a problem rjs@ reported.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/lib/libgcc/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/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile:1.6 src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile:1.7
--- src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile:1.6	Sun Jul 23 01:11:54 2017
+++ src/external/gpl3/gcc.old/lib/libgcc/libgcc/Makefile	Thu Aug  3 22:01:29 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2017/07/23 01:11:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2017/08/03 22:01:29 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -55,7 +55,7 @@ CLEANFILES+=	${SOBJS:=.tmp1} ${SOBJS:=.t
 
 .c.o:
 	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
+	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
 	${NM} -pg ${.TARGET}.tmp1 | \
 	    ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
 	    ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -

Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.27 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.28
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.27	Wed Mar 22 23:11:07 2017
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile	Thu Aug  3 22:01:30 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2017/03/22 23:11:07 chs Exp $
+#	$NetBSD: Makefile,v 1.28 2017/08/03 22:01:30 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -55,7 +55,7 @@ CLEANFILES+=	${SOBJS:=.tmp1} ${SOBJS:=.t
 
 .c.o:
 	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
+	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp1
 	${NM} -pg ${.TARGET}.tmp1 | \
 	    ${TOOL_AWK} 'NF == 3 { print "\t.hidden", $$3 }' | \
 	    ${CC} ${COPTS} -r -nostdinc -nostdlib ${CPUFLAGS} -o ${.TARGET}.tmp2 ${.TARGET}.tmp1 -xassembler -

Reply via email to