Module Name:    src
Committed By:   christos
Date:           Sun Jun 30 16:15:04 UTC 2024

Modified Files:
        src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
        src/external/gpl3/gcc/usr.bin/cc1: Makefile
        src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
        src/external/gpl3/gcc/usr.bin/cc1objplus: Makefile
        src/external/gpl3/gcc/usr.bin/common: Makefile
        src/external/gpl3/gcc/usr.bin/common-target: Makefile
        src/external/gpl3/gcc/usr.bin/cpp: Makefile
        src/external/gpl3/gcc/usr.bin/g++: Makefile
        src/external/gpl3/gcc/usr.bin/gcc: Makefile
        src/external/gpl3/gcc/usr.bin/gcov: Makefile
        src/external/gpl3/gcc/usr.bin/libcpp: Makefile
        src/external/gpl3/gcc/usr.bin/lto-dump: Makefile
        src/external/gpl3/gcc/usr.bin/lto-wrapper: Makefile
        src/external/gpl3/gcc/usr.bin/lto1: Makefile

Log Message:
make SSP build work again


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/gcc/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/lto-dump/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/lto1/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/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.55 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.56
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.55	Wed Feb 21 04:06:56 2024
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile	Sun Jun 30 12:15:02 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.55 2024/02/21 09:06:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.56 2024/06/30 16:15:02 christos Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -214,6 +214,8 @@ COPTS.${f}.cc+= -fimplicit-templates ${G
 # XXXGCC12
 # hits on sparc, sparc64, armv7 at least
 COPTS.floating_to_chars.cc+=	-Wno-error=unused-function
+COPTS.cp-demangle.c+=	-Wno-error=stack-protector
+COPTS.floating_to_chars.cc+=	-Wno-error=stack-protector
 
 .include <bsd.lib.mk>
 .include <bsd.subdir.mk>

Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.21 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.22
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.21	Tue Aug  1 01:57:54 2023
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2023/08/01 05:57:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.22 2024/06/30 16:15:03 christos Exp $
 
 PROG=		cc1
 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=.cc}
@@ -26,20 +26,20 @@ CHECKSUM_OBJS=	${BACKENDOBJ}/libbackend.
 # XXX check this out, probably need it for plugins?
 # LDFLAGS+=	-rdynamic
 
-.if 0
-COPTS.c-ada-spec.cc=	-Wno-stack-protector
-COPTS.c-attribs.cc=	-Wno-stack-protector
-COPTS.c-aux-info.cc=	-Wno-stack-protector
-COPTS.c-common.cc=	-Wno-stack-protector
-COPTS.c-cppbuiltin.cc=	-Wno-stack-protector
-COPTS.c-decl.cc=	-Wno-stack-protector
-COPTS.c-format.cc=	-Wno-stack-protector
-COPTS.c-lex.cc=		-Wno-stack-protector
-COPTS.c-opts.cc=	-Wno-stack-protector
-COPTS.c-ppoutput.cc=	-Wno-stack-protector
-COPTS.c-pragma.cc=	-Wno-stack-protector
-COPTS.c-typeck.cc=	-Wno-stack-protector
-.endif
+COPTS.c-ada-spec.cc=	-Wno-error=stack-protector
+COPTS.c-attribs.cc=	-Wno-error=stack-protector
+COPTS.c-aux-info.cc=	-Wno-error=stack-protector
+COPTS.c-common.cc=	-Wno-error=stack-protector
+COPTS.c-cppbuiltin.cc=	-Wno-error=stack-protector
+COPTS.c-decl.cc=	-Wno-error=stack-protector
+COPTS.c-format.cc=	-Wno-error=stack-protector
+COPTS.c-lex.cc=		-Wno-error=stack-protector
+COPTS.c-omp.cc=	-Wno-error=stack-protector
+COPTS.c-opts.cc=	-Wno-error=stack-protector
+COPTS.c-ppoutput.cc=	-Wno-error=stack-protector
+COPTS.c-pragma.cc=	-Wno-error=stack-protector
+COPTS.c-pretty-print.cc=	-Wno-error=stack-protector
+COPTS.c-typeck.cc=	-Wno-error=stack-protector
 
 CPPFLAGS.default-c.cc+=	-I${BACKENDOBJ}
 

Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.19 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.20
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.19	Tue Aug  1 01:57:54 2023
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2023/08/01 05:57:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.20 2024/06/30 16:15:03 christos Exp $
 
 MYOBJS=		${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} 
 PROG=		cc1obj
@@ -29,22 +29,22 @@ CHECKSUM_OBJS=	${BACKENDOBJ}/libbackend.
 # XXX check this out
 # LDFLAGS+=	-rdynamic
 
-.if 0
-COPTS.c-ada-spec.cc+=			-Wno-stack-protector
-COPTS.c-attribs.cc+=			-Wno-stack-protector
-COPTS.c-aux-info.cc+=			-Wno-stack-protector
-COPTS.c-common.cc+=			-Wno-stack-protector
-COPTS.c-cppbuiltin.cc+=			-Wno-stack-protector
-COPTS.c-decl.cc+=			-Wno-stack-protector
-COPTS.c-format.cc+=			-Wno-stack-protector
-COPTS.c-lex.cc+=			-Wno-stack-protector
-COPTS.c-ppoutput.cc+=			-Wno-stack-protector
-COPTS.c-pragma.cc+=			-Wno-stack-protector
-COPTS.c-typeck.cc+=			-Wno-stack-protector
-COPTS.objc-act.cc+=			-Wno-stack-protector
-COPTS.objc-gnu-runtime-abi-01.cc+=	-Wno-stack-protector
-COPTS.objc-next-runtime-abi-01.cc+=	-Wno-stack-protector
-.endif
+COPTS.c-ada-spec.cc+=			-Wno-error=stack-protector
+COPTS.c-attribs.cc+=			-Wno-error=stack-protector
+COPTS.c-aux-info.cc+=			-Wno-error=stack-protector
+COPTS.c-common.cc+=			-Wno-error=stack-protector
+COPTS.c-cppbuiltin.cc+=			-Wno-error=stack-protector
+COPTS.c-decl.cc+=			-Wno-error=stack-protector
+COPTS.c-format.cc+=			-Wno-error=stack-protector
+COPTS.c-lex.cc+=			-Wno-error=stack-protector
+COPTS.c-omp.cc+=			-Wno-error=stack-protector
+COPTS.c-ppoutput.cc+=			-Wno-error=stack-protector
+COPTS.c-pragma.cc+=			-Wno-error=stack-protector
+COPTS.c-pretty-print.cc+=		-Wno-error=stack-protector
+COPTS.c-typeck.cc+=			-Wno-error=stack-protector
+COPTS.objc-act.cc+=			-Wno-error=stack-protector
+COPTS.objc-gnu-runtime-abi-01.cc+=	-Wno-error=stack-protector
+COPTS.objc-next-runtime-abi-01.cc+=	-Wno-error=stack-protector
 
 .if ${MACHINE_ARCH} == "vax" && 0
 COPTS.c-decl.c+=-O0

Index: src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.4 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.4	Tue Aug  1 01:57:54 2023
+++ src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2023/08/01 05:57:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2024/06/30 16:15:03 christos Exp $
 
 # XXX: Pull this (G_OBJCXX_OBJS) out with mknative-gcc.  Needs some
 # minor re-org of cc1plus and perhaps cc1obj.  G_CXX_AND_OBJCXX_OBJS
@@ -57,22 +57,22 @@ CHECKSUM_OBJS=	${BACKENDOBJ}/libbackend.
 # XXX: like cc1plus
 CFLAGS+=-Wno-error=stack-protector
 
-.if 0
-COPTS.c-ada-spec.cc+=			-Wno-stack-protector
-COPTS.c-attribs.cc+=			-Wno-stack-protector
-COPTS.c-aux-info.cc+=			-Wno-stack-protector
-COPTS.c-common.cc+=			-Wno-stack-protector
-COPTS.c-cppbuiltin.cc+=			-Wno-stack-protector
-COPTS.c-decl.cc+=			-Wno-stack-protector
-COPTS.c-format.cc+=			-Wno-stack-protector
-COPTS.c-lex.cc+=			-Wno-stack-protector
-COPTS.c-ppoutput.cc+=			-Wno-stack-protector
-COPTS.c-pragma.cc+=			-Wno-stack-protector
-COPTS.c-typeck.cc+=			-Wno-stack-protector
-COPTS.objc-act.cc+=			-Wno-stack-protector
-COPTS.objc-gnu-runtime-abi-01.cc+=	-Wno-stack-protector
-COPTS.objc-next-runtime-abi-01.cc+=	-Wno-stack-protector
-.endif
+COPTS.c-ada-spec.cc+=			-Wno-error=stack-protector
+COPTS.c-attribs.cc+=			-Wno-error=stack-protector
+COPTS.c-aux-info.cc+=			-Wno-error=stack-protector
+COPTS.c-common.cc+=			-Wno-error=stack-protector
+COPTS.c-cppbuiltin.cc+=			-Wno-error=stack-protector
+COPTS.c-decl.cc+=			-Wno-error=stack-protector
+COPTS.c-format.cc+=			-Wno-error=stack-protector
+COPTS.c-lex.cc+=			-Wno-error=stack-protector
+COPTS.c-omp.cc+=			-Wno-error=stack-protector
+COPTS.c-ppoutput.cc+=			-Wno-error=stack-protector
+COPTS.c-pretty-print.cc+=		-Wno-error=stack-protector
+COPTS.c-pragma.cc+=			-Wno-error=stack-protector
+COPTS.c-typeck.cc+=			-Wno-error=stack-protector
+COPTS.objc-act.cc+=			-Wno-error=stack-protector
+COPTS.objc-gnu-runtime-abi-01.cc+=	-Wno-error=stack-protector
+COPTS.objc-next-runtime-abi-01.cc+=	-Wno-error=stack-protector
 
 .if ${MACHINE_ARCH} == "vax" && 0
 COPTS.c-decl.c+=-O0

Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.13 src/external/gpl3/gcc/usr.bin/common/Makefile:1.14
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.13	Tue Aug  1 01:57:54 2023
+++ src/external/gpl3/gcc/usr.bin/common/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2023/08/01 05:57:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.14 2024/06/30 16:15:03 christos Exp $
 
 HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
@@ -29,6 +29,8 @@ version.cc: ${GCCARCH}/defs.mk ${TOP}/to
 
 ${SRCS}: ${GCCARCH}/defs.mk
 
+COPTS.intl.cc +=	-Wno-error=stack-protector
+
 .include <bsd.lib.mk>
 
 # Force using C++ for this

Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.15 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.16
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.15	Fri Aug 11 02:52:45 2023
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2023/08/11 06:52:45 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2024/06/30 16:15:03 christos Exp $
 
 HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
@@ -19,10 +19,10 @@ CPPFLAGS+=	-I${GCCARCH} -I${BACKENDOBJ} 
 		-DCONFIGURE_SPECS="\"\"" \
 		-I${BACKENDOBJ}
 
-#COPTS.prefix.cc+=	-Wno-stack-protector
-#COPTS.opts-common.cc+=	-Wno-stack-protector
-#COPTS.rs6000-common.cc+=	-Wno-stack-protector
-#COPTS.arm-common.cc+=	-Wno-stack-protector
+COPTS.prefix.cc+=	-Wno-error=stack-protector
+COPTS.opts-common.cc+=	-Wno-error=stack-protector
+COPTS.rs6000-common.cc+=	-Wno-error=stack-protector
+COPTS.arm-common.cc+=	-Wno-error=stack-protector
 .if ${MACHINE_CPU} == "sh3"
 COPTS.opts.cc+=		${CC_WNO_FORMAT_TRUNCATION}
 .endif

Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.12 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.13
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.12	Tue Aug  1 01:57:54 2023
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2023/08/01 05:57:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2024/06/30 16:15:03 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -28,7 +28,7 @@ ${SRCS}: ${GCCARCH}/defs.mk
 
 .include <bsd.info.mk>
 
-#COPTS.gcc.cc=	-Wno-stack-protector
+COPTS.gcc.cc=	-Wno-error=stack-protector
 
 .PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
 

Index: src/external/gpl3/gcc/usr.bin/g++/Makefile
diff -u src/external/gpl3/gcc/usr.bin/g++/Makefile:1.8 src/external/gpl3/gcc/usr.bin/g++/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/g++/Makefile:1.8	Tue Aug  1 01:57:55 2023
+++ src/external/gpl3/gcc/usr.bin/g++/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2023/08/01 05:57:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2024/06/30 16:15:03 christos Exp $
 
 PROG=		gplusplus
 PROGNAME=	g++
@@ -18,6 +18,6 @@ DPADD+=		${LIBINTL}
 
 ${SRCS}: ${GCCARCH}/defs.mk
 
-#COPTS.gcc.cc=	-Wno-stack-protector
+COPTS.gcc.cc=	-Wno-error=stack-protector
 
 .PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/cp

Index: src/external/gpl3/gcc/usr.bin/gcc/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.8 src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.8	Tue Aug  1 01:57:55 2023
+++ src/external/gpl3/gcc/usr.bin/gcc/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2023/08/01 05:57:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2024/06/30 16:15:03 christos Exp $
 
 PROG=		gcc
 SRCS=		gccspec.cc ${G_GCC_OBJS:.o=.cc}
@@ -24,7 +24,7 @@ ${SRCS}: ${GCCARCH}/defs.mk
 
 .include <bsd.info.mk>
 
-#COPTS.gcc.cc=	-Wno-stack-protector
+COPTS.gcc.cc=	-Wno-error=stack-protector
 .if ${MACHINE_ARCH} == "vax" && 0
 COPTS.dse.c=	-O1
 .endif

Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.12 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.13
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.12	Tue Aug  1 01:57:55 2023
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile	Sun Jun 30 12:15:03 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2023/08/01 05:57:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2024/06/30 16:15:03 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -21,7 +21,7 @@ MAN=		gcov.1
 .include "../Makefile.libiberty"
 .include "../Makefile.libdecnumber"
 
-#COPTS.gcov.cc += -Wno-stack-protector
+COPTS.gcov.cc += -Wno-error=stack-protector
 
 LDADD+=		-lintl
 DPADD+=		${LIBINTL}

Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.11 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.12
--- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.11	Tue Aug  1 01:57:55 2023
+++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile	Sun Jun 30 12:15:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2023/08/01 05:57:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2024/06/30 16:15:04 christos Exp $
 
 HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
@@ -16,7 +16,12 @@ CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/arc
 
 .include <bsd.lib.mk>
 
-#COPTS+=	-Wno-stack-protector
+COPTS.charset.cc +=	-Wno-error=stack-protector
+COPTS.directives.cc +=	-Wno-error=stack-protector
+COPTS.files.cc +=	-Wno-error=stack-protector
+COPTS.macro.cc +=	-Wno-error=stack-protector
+COPTS.mkdeps.cc +=	-Wno-error=stack-protector
+COPTS.pch.cc +=	-Wno-error=stack-protector
 
 # Force using C++ for this
 HOST_CC:=	${HOST_CXX}

Index: src/external/gpl3/gcc/usr.bin/lto-dump/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto-dump/Makefile:1.2 src/external/gpl3/gcc/usr.bin/lto-dump/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/lto-dump/Makefile:1.2	Tue Aug  1 01:57:56 2023
+++ src/external/gpl3/gcc/usr.bin/lto-dump/Makefile	Sun Jun 30 12:15:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2023/08/01 05:57:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2024/06/30 16:15:04 christos Exp $
 
 PROG=		lto-dump
 # XXX pullout from LTO_DUMP_OBJS
@@ -15,8 +15,8 @@ BINDIR=		/usr/bin
 
 CPPFLAGS+=	-DPREFIX=\"/usr\"
 
-#COPTS.lto-lang.cc+=	-Wno-stack-protector
-#COPTS.lto-common.cc+=	-Wno-stack-protector
+COPTS.lto-lang.cc+=	-Wno-error=stack-protector
+COPTS.lto-common.cc+=	-Wno-error=stack-protector
 
 .include "../Makefile.backend"
 .include "../Makefile.target-defines"

Index: src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.6 src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.6	Tue Aug  1 01:57:56 2023
+++ src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile	Sun Jun 30 12:15:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2023/08/01 05:57:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2024/06/30 16:15:04 christos Exp $
 
 NOMAN=1
 PROG=		lto-wrapper
@@ -19,7 +19,7 @@ CPPFLAGS+=	-DPREFIX=\"/usr\" -I${GCCARCH
 .include "../Makefile.backtrace"
 .include "../Makefile.libiberty"
 
-#COPTS.lto-wrapper.cc=	-Wno-stack-protector
+COPTS.lto-wrapper.cc=	-Wno-error=stack-protector
 
 LDADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
 DPADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}

Index: src/external/gpl3/gcc/usr.bin/lto1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.8 src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.8	Tue Aug  1 01:57:56 2023
+++ src/external/gpl3/gcc/usr.bin/lto1/Makefile	Sun Jun 30 12:15:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2023/08/01 05:57:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2024/06/30 16:15:04 christos Exp $
 
 PROG=		lto1
 SRCS=		attribs.cc \
@@ -12,9 +12,9 @@ SRCS=		attribs.cc \
 
 CPPFLAGS+=	-DPREFIX=\"/usr\"
 
-#COPTS.lto.cc+=		-Wno-stack-protector
-#COPTS.lto-lang.cc+=	-Wno-stack-protector
-#COPTS.lto-common.cc+=	-Wno-stack-protector
+COPTS.lto.cc+=		-Wno-error=stack-protector
+COPTS.lto-lang.cc+=	-Wno-error=stack-protector
+COPTS.lto-common.cc+=	-Wno-error=stack-protector
 
 .include "../Makefile.backend"
 .include "../Makefile.backtrace"

Reply via email to