From 41feef035661986bddc1ccadcebff4958a700396 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Mon, 29 Jun 2020 08:34:17 +0000
Subject: [PATCH] Fix addition of C++ .cc source to SRCS

Fix assumption that all of the source files are .c, as some are .cc.
---
 external/gpl3/gcc/usr.bin/cc1/Makefile     | 5 +++--
 external/gpl3/gcc/usr.bin/cc1obj/Makefile  | 5 +++--
 external/gpl3/gcc/usr.bin/cc1plus/Makefile | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/external/gpl3/gcc/usr.bin/cc1/Makefile b/external/gpl3/gcc/usr.bin/cc1/Makefile
index 15044002eb24..913d9ad13c8d 100644
--- a/external/gpl3/gcc/usr.bin/cc1/Makefile
+++ b/external/gpl3/gcc/usr.bin/cc1/Makefile
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.17 2020/04/28 05:45:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.18 2020/06/29 08:34:17 lukem Exp $
 
 PROG=		cc1
-SRCS=		${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
+SRCS=		${G_C_OBJS:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS+=		main.c ${PROG}-checksum.c
 CPPFLAGS+=	-DPREFIX=\"/usr\"
 
 .include "../Makefile.backend"
diff --git a/external/gpl3/gcc/usr.bin/cc1obj/Makefile b/external/gpl3/gcc/usr.bin/cc1obj/Makefile
index 85ae27a310f3..9567787f6c8c 100644
--- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile
+++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.15 2020/04/28 07:47:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2020/06/29 08:34:17 lukem Exp $
 
 MYOBJS=		${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} 
 PROG=		cc1obj
-SRCS=		${MYOBJS:S,objc/,,:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
+SRCS=		${MYOBJS:S,objc/,,:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS+=		main.c ${PROG}-checksum.c
 
 CPPFLAGS+=	-I${DIST}/gcc/objc
 CPPFLAGS.prefix.c+=	-DPREFIX=\"/usr\"
diff --git a/external/gpl3/gcc/usr.bin/cc1plus/Makefile b/external/gpl3/gcc/usr.bin/cc1plus/Makefile
index 5f2251809e96..84912ddcfae1 100644
--- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile
+++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.12 2020/04/28 07:47:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2020/06/29 08:34:17 lukem Exp $
 
 PROG=		cc1plus
-SRCS=		${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
+SRCS=		${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS+=		main.c ${PROG}-checksum.c
 
 # XXX
 NOMAN=	1