[src/trunk]: src/external/gpl3/gcc Get GCC 4.8 closer to build with "USE_SSP"...

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

details:   https://anonhg.NetBSD.org/src/rev/2d6da0c26e6d
branches:  trunk
changeset: 794100:2d6da0c26e6d
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 05 21:37:02 2014 +0000

description:
Get GCC 4.8 closer to build with "USE_SSP" set to "yes".

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile  |  5 +++--
 external/gpl3/gcc/usr.bin/cc1plus/Makefile       |  3 ++-
 external/gpl3/gcc/usr.bin/common-target/Makefile |  5 ++++-
 external/gpl3/gcc/usr.bin/common/Makefile        |  5 ++++-
 external/gpl3/gcc/usr.bin/gcov/Makefile          |  6 ++----
 external/gpl3/gcc/usr.bin/libcpp/Makefile        |  6 +++---
 6 files changed, 18 insertions(+), 12 deletions(-)

diffs (123 lines):

diff -r 0b46a6a692ae -r 2d6da0c26e6d external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile   Wed Mar 05 20:37:11 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile   Wed Mar 05 21:37:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2014/03/01 10:00:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2014/03/05 21:37:02 tron Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -14,7 +14,8 @@
 .cc: # disable .cc->NULL transform
 
 SRCS+=         ${LIB2_EH} ${LIB2_EHASM}
-COPTS.unwind-dw2.c = -Wno-stack-protector
+COPTS.c-typeck.c=      -Wno-stack-protector
+COPTS.unwind-dw2.c=    -Wno-stack-protector
 
 MKPIC:=        no
 
diff -r 0b46a6a692ae -r 2d6da0c26e6d external/gpl3/gcc/usr.bin/cc1plus/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile        Wed Mar 05 20:37:11 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile        Wed Mar 05 21:37:02 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/05 21:37:02 tron Exp $
 
 PROG=          cc1plus
 SRCS=          ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -38,6 +38,7 @@
 
 # YUCK.  but see timevar.h:POP_TIMEVAR_AND_RETURN
 CFLAGS+=       -Wno-error # not good enough: -Wno-return-type
+COPTS+=                -Wno-stack-protector
 
 LDADD+=        ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
 DPADD+=        ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
diff -r 0b46a6a692ae -r 2d6da0c26e6d external/gpl3/gcc/usr.bin/common-target/Makefile
--- a/external/gpl3/gcc/usr.bin/common-target/Makefile  Wed Mar 05 20:37:11 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/common-target/Makefile  Wed Mar 05 21:37:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/01 10:00:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $
 
 LIBISPRIVATE=  yes
 
@@ -19,6 +19,9 @@
                -DCONFIGURE_SPECS="\"\"" \
                -I${BACKENDOBJ}
 
+COPTS.prefix.c=                -Wno-stack-protector
+COPTS.opts-common.c=   -Wno-stack-protector
+
 GENPROG_ERROR_DEPENDS=errors.lo
 
 .include "../Makefile.options"
diff -r 0b46a6a692ae -r 2d6da0c26e6d external/gpl3/gcc/usr.bin/common/Makefile
--- a/external/gpl3/gcc/usr.bin/common/Makefile Wed Mar 05 20:37:11 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/common/Makefile Wed Mar 05 21:37:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2014/03/01 10:00:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $
 
 LIBISPRIVATE=  yes
 
@@ -22,6 +22,9 @@
 
 HOSTPROG_CXX=  1
 
+COPTS.diagnostic.c=    -Wno-stack-protector
+COPTS.intl.c=          -Wno-stack-protector
+
 .include <bsd.lib.mk>
 
 # Force using C++ for this
diff -r 0b46a6a692ae -r 2d6da0c26e6d external/gpl3/gcc/usr.bin/gcov/Makefile
--- a/external/gpl3/gcc/usr.bin/gcov/Makefile   Wed Mar 05 20:37:11 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/gcov/Makefile   Wed Mar 05 21:37:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2014/03/01 10:00:52 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/05 21:37:02 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -18,7 +18,7 @@
 # Force using C++ for this
 HOST_CC:=      ${HOST_CXX}
 CC:=           ${CXX}
-CFLAGS:=       ${CXXFLAGS}
+CFLAGS:=       ${CXXFLAGS} -Wno-stack-protector
 
 .include "../Makefile.common"
 .include "../Makefile.libcpp"
@@ -29,6 +29,4 @@
 LDADD+=                -lintl
 DPADD+=                ${LIBINTL}
 
-COPTS+=                -Wno-stack-protector
-
 .PATH: ${DIST}/gcc
diff -r 0b46a6a692ae -r 2d6da0c26e6d external/gpl3/gcc/usr.bin/libcpp/Makefile
--- a/external/gpl3/gcc/usr.bin/libcpp/Makefile Wed Mar 05 20:37:11 2014 +0000
+++ b/external/gpl3/gcc/usr.bin/libcpp/Makefile Wed Mar 05 21:37:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/03/01 10:00:52 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2014/03/05 21:37:02 tron Exp $
 
 LIBISPRIVATE=  yes
 
@@ -11,12 +11,12 @@
                ${G_INCLUDES:M-I*:N-I.*} \
                -DPREFIX=\"/usr\"
 
-COPTS+=        -Wno-stack-protector
-
 HOSTPROG_CXX=  1
 
 .include <bsd.lib.mk>
 
+COPTS+=        -Wno-stack-protector
+
 # Force using C++ for this
 HOST_CC:=      ${HOST_CXX}
 CC:=           ${CXX}