[src/trunk]: src/external/gpl3/gcc/usr.bin/cc1plus Limit no-error to stack-pr...

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

details:   https://anonhg.NetBSD.org/src/rev/dab11ddc37c1
branches:  trunk
changeset: 961945:dab11ddc37c1
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 25 22:25:55 2021 +0000

description:
Limit no-error to stack-protector

diffstat:

 external/gpl3/gcc/usr.bin/cc1plus/Makefile |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 4a9a2db1cd70 -r dab11ddc37c1 external/gpl3/gcc/usr.bin/cc1plus/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile        Sun Apr 25 22:25:00 2021 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile        Sun Apr 25 22:25:55 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2021/04/12 00:05:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2021/04/25 22:25:55 christos Exp $
 
 PROG=          cc1plus
 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,:S,coroutines.o,coroutines.cc,:Nlibcpp.a:.o=.c}
@@ -29,9 +29,7 @@
 # XXX check this out
 # LDFLAGS+=   -rdynamic
 
-# YUCK.  but see timevar.h:POP_TIMEVAR_AND_RETURN
-CFLAGS+=       -Wno-error # not good enough: -Wno-return-type
-COPTS+=                -Wno-stack-protector
+CFLAGS+=       -Wno-error=stack-protector
 
 .if ${MACHINE_ARCH} == "vax"
 COPTS.call.c+=-O0
@@ -50,7 +48,7 @@
 COPTS.cc1plus-checksum.c+=-O0
 .endif
 
-.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
+.if ${MACHINE_MIPS64}
 COPTS.c-common.c+=-O3
 .endif