Module Name: src
Committed By: tron
Date: Wed Mar 5 21:37:02 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
Log Message:
Get GCC 4.8 closer to build with "USE_SSP" set to "yes".
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/libcpp/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/libgcc/libgcc_eh/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.7 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.8
--- src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.7 Sat Mar 1 10:00:36 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Wed Mar 5 21:37:02 2014
@@ -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 @@ LIB= gcc_eh
.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
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.6 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.6 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Wed Mar 5 21:37:02 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/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 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
# 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}
Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.1 src/external/gpl3/gcc/usr.bin/common/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/common/Makefile Wed Mar 5 21:37:02 2014
@@ -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 @@ MKPICLIB:= no
HOSTPROG_CXX= 1
+COPTS.diagnostic.c= -Wno-stack-protector
+COPTS.intl.c= -Wno-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.1 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile Wed Mar 5 21:37:02 2014
@@ -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 @@ CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ}
-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"
Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.4 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.4 Sat Mar 1 10:00:52 2014
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile Wed Mar 5 21:37:02 2014
@@ -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 @@ HOSTPROG_CXX= 1
# 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 @@ CFLAGS:= ${CXXFLAGS}
LDADD+= -lintl
DPADD+= ${LIBINTL}
-COPTS+= -Wno-stack-protector
-
.PATH: ${DIST}/gcc
Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.6 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.6 Sat Mar 1 10:00:52 2014
+++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile Wed Mar 5 21:37:02 2014
@@ -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 @@ CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arc
${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}
