Module Name: src
Committed By: christos
Date: Sun Feb 11 02:12:29 UTC 2018
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile Makefile.backend
Makefile.frontend Makefile.inc
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/g++: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
src/external/gpl3/gcc/usr.bin/gcov-dump: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
src/external/gpl3/gcc/usr.bin/libdecnumber: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/Makefile.frontend
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.42 -r1.43 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/usr.bin/include/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/libdecnumber/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/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.9 src/external/gpl3/gcc/usr.bin/Makefile:1.10
--- src/external/gpl3/gcc/usr.bin/Makefile:1.9 Tue Feb 6 18:12:01 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile Sat Feb 10 21:12:28 2018
@@ -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/}
Index: src/external/gpl3/gcc/usr.bin/Makefile.backend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backend:1.6 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.7
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.6 Thu Aug 3 21:18:39 2017
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend Sat Feb 10 21:12:28 2018
@@ -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 @@ BINDIR= /usr/libexec
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
Index: src/external/gpl3/gcc/usr.bin/Makefile.frontend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.4 src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.5
--- src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.4 Thu Apr 3 21:19:14 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.frontend Sat Feb 10 21:12:28 2018
@@ -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 @@ CPPFLAGS+= -I${GCCARCH} -I${FRONTENDOBJ}
${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
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.30 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.31
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.30 Sun Feb 4 04:22:03 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Sat Feb 10 21:12:28 2018
@@ -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"
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.42 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.43
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.42 Tue Feb 6 21:33:05 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Sat Feb 10 21:12:28 2018
@@ -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 @@ HOST_CXXFLAGS+= -std=gnu++98
HOSTPROG_CXX= 1
-.include <bsd.own.mk>
+.include <bsd.init.mk>
HOST_LIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
Index: src/external/gpl3/gcc/usr.bin/g++/Makefile
diff -u src/external/gpl3/gcc/usr.bin/g++/Makefile:1.6 src/external/gpl3/gcc/usr.bin/g++/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/g++/Makefile:1.6 Tue Mar 15 15:12:06 2016
+++ src/external/gpl3/gcc/usr.bin/g++/Makefile Sat Feb 10 21:12:29 2018
@@ -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"
Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.6 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.6 Wed Jul 6 23:15:59 2016
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile Sat Feb 10 21:12:29 2018
@@ -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}
Index: src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.1 src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.1 Tue Feb 6 18:12:01 2018
+++ src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile Sat Feb 10 21:12:29 2018
@@ -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}
Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.11 src/external/gpl3/gcc/usr.bin/include/Makefile:1.12
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.11 Fri Feb 2 15:57:53 2018
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Sat Feb 10 21:12:29 2018
@@ -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
Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.7 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.7 Wed Mar 5 16:37:02 2014
+++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile Sat Feb 10 21:12:29 2018
@@ -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}
Index: src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.6 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.6 Sun Jun 1 15:51:02 2014
+++ src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile Sat Feb 10 21:12:29 2018
@@ -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
