[src/trunk]: src/external/gpl3/gcc/usr.bin external/gpl3/gcc: Fix build failu...

[fox <fox%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a02eabc636b5
branches:  trunk
changeset: 744737:a02eabc636b5
user:      fox <fox%NetBSD.org@localhost>
date:      Wed Feb 12 00:36:37 2020 +0000

description:
external/gpl3/gcc: Fix build failure under LLVM.

-Wno-error= flag now only applies to gcc 8 and not to LLVM based builds.

Reviewed by: kamil@

diffstat:

 external/gpl3/gcc/usr.bin/cc1/Makefile    |  9 ++++++---
 external/gpl3/gcc/usr.bin/cc1obj/Makefile |  9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r b737c03993ea -r a02eabc636b5 external/gpl3/gcc/usr.bin/cc1/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1/Makefile    Wed Feb 12 00:30:48 2020 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1/Makefile    Wed Feb 12 00:36:37 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2020/02/09 08:04:40 fox Exp $
+#      $NetBSD: Makefile,v 1.16 2020/02/12 00:36:37 fox Exp $
 
 PROG=          cc1
 SRCS=          ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -32,7 +32,7 @@
 COPTS.c-attribs.c=     -Wno-stack-protector
 COPTS.c-aux-info.c=    -Wno-stack-protector
 COPTS.c-common.c=      -Wno-stack-protector
-COPTS.c-cppbuiltin.c=  -Wno-stack-protector -Wno-error=format-overflow
+COPTS.c-cppbuiltin.c=  -Wno-stack-protector
 COPTS.c-decl.c=                -Wno-stack-protector
 COPTS.c-format.c=      -Wno-stack-protector
 COPTS.c-format.h=      -Wno-stack-protector
@@ -40,7 +40,10 @@
 COPTS.c-opts.c=                -Wno-stack-protector
 COPTS.c-ppoutput.c=    -Wno-stack-protector
 COPTS.c-pragma.c=      -Wno-stack-protector
-COPTS.c-typeck.c=      -Wno-stack-protector -Wno-error=format-overflow
+COPTS.c-typeck.c=      -Wno-stack-protector
+
+COPTS.c-cppbuiltin.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
+COPTS.c-typeck.c+=     ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
 
 CPPFLAGS.default-c.c+= -I${BACKENDOBJ}
 
diff -r b737c03993ea -r a02eabc636b5 external/gpl3/gcc/usr.bin/cc1obj/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile Wed Feb 12 00:30:48 2020 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile Wed Feb 12 00:36:37 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2020/02/09 08:04:40 fox Exp $
+#      $NetBSD: Makefile,v 1.14 2020/02/12 00:36:37 fox Exp $
 
 MYOBJS=                ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} 
 PROG=          cc1obj
@@ -35,17 +35,20 @@
 COPTS.c-attribs.c+=                    -Wno-stack-protector
 COPTS.c-aux-info.c+=                   -Wno-stack-protector
 COPTS.c-common.c+=                     -Wno-stack-protector
-COPTS.c-cppbuiltin.c+=                 -Wno-stack-protector -Wno-error=format-overflow
+COPTS.c-cppbuiltin.c+=                 -Wno-stack-protector
 COPTS.c-decl.c+=                       -Wno-stack-protector
 COPTS.c-format.c+=                     -Wno-stack-protector
 COPTS.c-lex.c+=                                -Wno-stack-protector
 COPTS.c-ppoutput.c+=                   -Wno-stack-protector
 COPTS.c-pragma.c+=                     -Wno-stack-protector
-COPTS.c-typeck.c+=                     -Wno-stack-protector -Wno-error=format-overflow
+COPTS.c-typeck.c+=                     -Wno-stack-protector
 COPTS.objc-act.c+=                     -Wno-stack-protector
 COPTS.objc-gnu-runtime-abi-01.c+=      -Wno-stack-protector
 COPTS.objc-next-runtime-abi-01.c+=     -Wno-stack-protector
 
+COPTS.c-cppbuiltin.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
+COPTS.c-typeck.c+=     ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=format-overflow :}
+
 .if ${MACHINE_ARCH} == "vax"
 COPTS.c-decl.c+=-O0
 COPTS.c-typeck.c+=-O0