Module Name: src
Committed By: tron
Date: Sat Mar 22 17:57:48 UTC 2014
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: 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
Log Message:
Fix build with "HAVE_GCC=48" and "USE_SSP=yes".
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/gcc/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.6 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.6 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Sat Mar 22 17:57:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
PROG= cc1
SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -31,7 +31,17 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# VER_CPPFLAGS from Makefile.inc
CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
-COPTS+= -Wno-stack-protector
+COPTS.c-ada-spec.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
+COPTS.c-format.c= -Wno-stack-protector
+COPTS.c-format.h= -Wno-stack-protector
+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
CPPFLAGS.default-c.c+= -I${BACKENDOBJ}
@@ -41,3 +51,5 @@ DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} $
.PATH: ${DIST}/gcc ${DIST}/gcc/c ${DIST}/gcc/c-family ${DIST}/gcc/config
.PATH: ${G_out_file:H}
+gugu:
+ @echo ${COPTS}
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.6 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Sat Mar 22 17:57:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -34,7 +34,18 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# VER_CPPFLAGS from Makefile.inc
CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
-COPTS+= -Wno-stack-protector
+COPTS.c-ada-spec.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
+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
+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
LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.6 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Sat Mar 22 17:57:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:48 tron Exp $
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
@@ -26,6 +26,8 @@ DPADD+= ${LIBINTL}
.include <bsd.info.mk>
+COPTS.gcc.c= -Wno-stack-protector
+
.PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
cpp.info: gcc-vers.texi
Index: src/external/gpl3/gcc/usr.bin/g++/Makefile
diff -u src/external/gpl3/gcc/usr.bin/g++/Makefile:1.3 src/external/gpl3/gcc/usr.bin/g++/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/g++/Makefile:1.3 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/g++/Makefile Sat Mar 22 17:57:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $
PROG= gplusplus
PROGNAME= g++
@@ -20,4 +20,6 @@ DPADD+= ${LIBINTL}
.include "../Makefile.frontend"
+COPTS.gcc.c= -Wno-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.3 src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.3 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/Makefile Sat Mar 22 17:57:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $
PROG= gcc
SRCS= gccspec.c ${G_GCC_OBJS:.o=.c}
@@ -26,6 +26,8 @@ DPADD+= ${LIBINTL}
.include <bsd.info.mk>
+COPTS.gcc.c= -Wno-stack-protector
+
.PATH: ${DIST}/gcc ${DIST}/gcc/doc ${DIST}/gcc/c
gcc.info: gcc-vers.texi
