Module Name: src
Committed By: fox
Date: Wed Feb 12 00:36:38 UTC 2020
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/cc1obj/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/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.15 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.16
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.15 Sun Feb 9 08:04:40 2020
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Wed Feb 12 00:36:37 2020
@@ -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-ada-spec.c= -Wno-stack-protector
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-lex.c= -Wno-stack-protector
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}
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.13 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.14
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.13 Sun Feb 9 08:04:40 2020
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Wed Feb 12 00:36:37 2020
@@ -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-ada-spec.c+= -Wno-stack-protec
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
