[src/trunk]: src/external/gpl3/gcc/usr.bin Use bsd.init.mk (instead of bsd.ow...

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

details:   https://anonhg.NetBSD.org/src/rev/7ca6ece2a9c4
branches:  trunk
changeset: 829755:7ca6ece2a9c4
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 11 02:12:28 2018 +0000

description:
Use bsd.init.mk (instead of bsd.own.mk) consistently so that
Makefile.inc gets called before bsd.own.mk so that we get a chance
to use NOFOO easily in Makefile.inc. Use that to turn CTF off for
everything.

diffstat:

 external/gpl3/gcc/usr.bin/Makefile              |  4 ++--
 external/gpl3/gcc/usr.bin/Makefile.backend      |  4 ++--
 external/gpl3/gcc/usr.bin/Makefile.frontend     |  6 +++---
 external/gpl3/gcc/usr.bin/Makefile.inc          |  5 +++--
 external/gpl3/gcc/usr.bin/backend/Makefile      |  4 ++--
 external/gpl3/gcc/usr.bin/g++/Makefile          |  4 ++--
 external/gpl3/gcc/usr.bin/gcov-dump/Makefile    |  4 ++--
 external/gpl3/gcc/usr.bin/gcov/Makefile         |  4 ++--
 external/gpl3/gcc/usr.bin/include/Makefile      |  4 ++--
 external/gpl3/gcc/usr.bin/libcpp/Makefile       |  4 +++-
 external/gpl3/gcc/usr.bin/libdecnumber/Makefile |  4 ++--
 11 files changed, 25 insertions(+), 22 deletions(-)

diffs (170 lines):

diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/Makefile
--- a/external/gpl3/gcc/usr.bin/Makefile        Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile        Sun Feb 11 02:12:28 2018 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.9 2018/02/06 23:12:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2018/02/11 02:12:28 christos Exp $
 
 NOOBJ=# defined
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
 
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/Makefile.backend
--- a/external/gpl3/gcc/usr.bin/Makefile.backend        Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.backend        Sun Feb 11 02:12:28 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.backend,v 1.6 2017/08/04 01:18:39 mrg Exp $
+#      $NetBSD: Makefile.backend,v 1.7 2018/02/11 02:12:28 christos Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -10,7 +10,7 @@
 CPPFLAGS+=     -I${GCCARCH} -I${BACKENDOBJ} \
                ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 DPADD+=                        ${BACKENDOBJ}/libbackend.a
 LDADD+=                        ${BACKENDOBJ}/libbackend.a
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/Makefile.frontend
--- a/external/gpl3/gcc/usr.bin/Makefile.frontend       Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.frontend       Sun Feb 11 02:12:28 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.frontend,v 1.4 2014/04/04 01:19:14 christos Exp $
+#      $NetBSD: Makefile.frontend,v 1.5 2018/02/11 02:12:28 christos Exp $
 
 BINDIR=                /usr/bin
 
@@ -6,8 +6,8 @@
                ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
                -DIN_GCC_FRONTEND
 
-NOCTF= # defined
-.include <bsd.own.mk>
+NOCTF=         # defined
+.include <bsd.init.mk>
 
 DPADD+=                        ${FRONTENDOBJ}/libfrontend.a
 LDADD+=                        -L${FRONTENDOBJ} -lfrontend
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Sun Feb 11 02:12:28 2018 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.30 2018/02/04 09:22:03 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.31 2018/02/11 02:12:28 christos Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
 
-.include <bsd.own.mk>
+NOCTF= # defined
+.include <bsd.init.mk>
 
 .sinclude "../../Makefile.gcc_path"
 
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/backend/Makefile
--- a/external/gpl3/gcc/usr.bin/backend/Makefile        Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/backend/Makefile        Sun Feb 11 02:12:28 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.42 2018/02/07 02:33:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.43 2018/02/11 02:12:28 christos Exp $
 
 LIBISPRIVATE=  yes
 
@@ -28,7 +28,7 @@
 
 HOSTPROG_CXX=  1
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 HOST_LIBIBERTYOBJ!=    cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
 
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/g++/Makefile
--- a/external/gpl3/gcc/usr.bin/g++/Makefile    Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/g++/Makefile    Sun Feb 11 02:12:28 2018 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.6 2016/03/15 19:12:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2018/02/11 02:12:29 christos Exp $
 
 PROG=          gplusplus
 PROGNAME=      g++
 SRCS=          ${G_GXX_OBJS:S/cp\///:.o=.c}
 
 NOMAN=         # Linked to gcc.1
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 .include "../Makefile.target-defines"
 
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/gcov-dump/Makefile
--- a/external/gpl3/gcc/usr.bin/gcov-dump/Makefile      Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/gcov-dump/Makefile      Sun Feb 11 02:12:28 2018 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.1 2018/02/06 23:12:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2018/02/11 02:12:29 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=           gcov-dump
 SRCS=          ${G_GCOV_DUMP_OBJS:.o=.c}
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/gcov/Makefile
--- a/external/gpl3/gcc/usr.bin/gcov/Makefile   Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/gcov/Makefile   Sun Feb 11 02:12:28 2018 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.6 2016/07/07 03:15:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2018/02/11 02:12:29 christos Exp $
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 PROG=           gcov
 SRCS=          ${G_GCOV_OBJS:.o=.c}
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/include/Makefile
--- a/external/gpl3/gcc/usr.bin/include/Makefile        Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/include/Makefile        Sun Feb 11 02:12:28 2018 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.11 2018/02/02 20:57:53 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2018/02/11 02:12:29 christos Exp $
 
-.include "../Makefile.inc"
+.include <bsd.init.mk>
 
 SUBDIR=        sanitizer
 
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/libcpp/Makefile
--- a/external/gpl3/gcc/usr.bin/libcpp/Makefile Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/libcpp/Makefile Sun Feb 11 02:12:28 2018 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.7 2014/03/05 21:37:02 tron Exp $
+#      $NetBSD: Makefile,v 1.8 2018/02/11 02:12:29 christos Exp $
 
 LIBISPRIVATE=  yes
 
+.include <bsd.init.mk>
+
 LIB=           cpp
 
 SRCS=          ${G_libcpp_a_OBJS:.o=.c}
diff -r 3964b8de55cc -r 7ca6ece2a9c4 external/gpl3/gcc/usr.bin/libdecnumber/Makefile
--- a/external/gpl3/gcc/usr.bin/libdecnumber/Makefile   Sun Feb 11 00:25:12 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/libdecnumber/Makefile   Sun Feb 11 02:12:28 2018 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2018/02/11 02:12:29 christos Exp $
 
 DIST=          ${GCCDIST}
 GNUHOSTDIST=   ${DIST}
 
 LIBISPRIVATE=   yes
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 
 LIB=           decnumber