[src/trunk]: src/external/gpl3/gcc/usr.bin Fix build with "HAVE_GCC=48" and "...

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

details:   https://anonhg.NetBSD.org/src/rev/bf0fb7e6ba3e
branches:  trunk
changeset: 327965:bf0fb7e6ba3e
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Mar 22 17:57:47 2014 +0000

description:
Fix build with "HAVE_GCC=48" and "USE_SSP=yes".

diffstat:

 external/gpl3/gcc/usr.bin/cc1/Makefile    |  16 ++++++++++++++--
 external/gpl3/gcc/usr.bin/cc1obj/Makefile |  15 +++++++++++++--
 external/gpl3/gcc/usr.bin/cpp/Makefile    |   4 +++-
 external/gpl3/gcc/usr.bin/g++/Makefile    |   4 +++-
 external/gpl3/gcc/usr.bin/gcc/Makefile    |   4 +++-
 5 files changed, 36 insertions(+), 7 deletions(-)

diffs (115 lines):

diff -r 859685eb6f8f -r bf0fb7e6ba3e external/gpl3/gcc/usr.bin/cc1/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1/Makefile    Sat Mar 22 17:12:20 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1/Makefile    Sat Mar 22 17:57:47 2014 +0000
@@ -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 @@
 # 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 @@
 .PATH: ${DIST}/gcc ${DIST}/gcc/c ${DIST}/gcc/c-family ${DIST}/gcc/config
 .PATH: ${G_out_file:H}
 
+gugu:
+       @echo ${COPTS}
diff -r 859685eb6f8f -r bf0fb7e6ba3e external/gpl3/gcc/usr.bin/cc1obj/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1obj/Makefile Sat Mar 22 17:12:20 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1obj/Makefile Sat Mar 22 17:57:47 2014 +0000
@@ -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 @@
 # 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}
diff -r 859685eb6f8f -r bf0fb7e6ba3e external/gpl3/gcc/usr.bin/cpp/Makefile
--- a/external/gpl3/gcc/usr.bin/cpp/Makefile    Sat Mar 22 17:12:20 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/cpp/Makefile    Sat Mar 22 17:57:47 2014 +0000
@@ -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 @@
 
 .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
diff -r 859685eb6f8f -r bf0fb7e6ba3e external/gpl3/gcc/usr.bin/g++/Makefile
--- a/external/gpl3/gcc/usr.bin/g++/Makefile    Sat Mar 22 17:12:20 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/g++/Makefile    Sat Mar 22 17:57:47 2014 +0000
@@ -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 @@
 
 .include "../Makefile.frontend"
 
+COPTS.gcc.c=   -Wno-stack-protector
+
 .PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/cp
diff -r 859685eb6f8f -r bf0fb7e6ba3e external/gpl3/gcc/usr.bin/gcc/Makefile
--- a/external/gpl3/gcc/usr.bin/gcc/Makefile    Sat Mar 22 17:12:20 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/Makefile    Sat Mar 22 17:57:47 2014 +0000
@@ -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 @@
 
 .include <bsd.info.mk>
 
+COPTS.gcc.c=   -Wno-stack-protector
+
 .PATH: ${DIST}/gcc ${DIST}/gcc/doc ${DIST}/gcc/c
 
 gcc.info: gcc-vers.texi