Module Name: src
Committed By: christos
Date: Sun Apr 25 22:25:55 UTC 2021
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
Limit no-error to stack-protector
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/usr.bin/cc1plus/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/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.15 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.16
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.15 Sun Apr 11 20:05:56 2021
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Sun Apr 25 18:25:55 2021
@@ -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 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
# 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.c-ubsan.c+=-O0
COPTS.cc1plus-checksum.c+=-O0
.endif
-.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
+.if ${MACHINE_MIPS64}
COPTS.c-common.c+=-O3
.endif
