From 5beaf704bea0b80cd2a0a9f816292661e90451a8 Mon Sep 17 00:00:00 2001 From: mrg Date: Sun, 1 Jun 2014 19:51:01 +0000 Subject: [PATCH] port over 3 changes made here in the GCC 4.5 tree that we'll need when GCC 4.8 becomes "gcc.old" eventually. this tree still needs to be tested for more, but this should be the bulk of the work. ---- Log Message: prepare for moving GCC 4.5 into gcc.old: - convert to using ${EXTERNAL_GCC_SUBDIR} - define base-external-gpl3-gcc* subdir as GCC_SUBDIR - use over for a bunch of places; mostly because it arranges for ../Makefile.inc to be included earlier, and don't bother including the latter if the former is already included. - move all .PATH: settings after so that all valid variables are set before it is evaluated - rename mknative-gcc* to match their subdir name. XXX the relationship between the Makefile.inc/Makefile.gcc_path files is kind of sketchy, it would be great if this was fixed. ---- Log Message: oops, avoid re-setting DIST to something that might be wrong now. ---- Log Message: fix another dated DIST. --- external/gpl3/gcc/lib/Makefile.inc | 11 ++++++++++- external/gpl3/gcc/lib/crtstuff/Makefile | 8 ++++---- external/gpl3/gcc/lib/libgcc/Makefile.inc | 10 +++++----- external/gpl3/gcc/lib/libgcc/libgcc/Makefile | 3 ++- .../gpl3/gcc/lib/libgcc/libgcc_eh/Makefile | 3 ++- external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile | 3 ++- external/gpl3/gcc/lib/libgcc/libgcov/Makefile | 3 ++- external/gpl3/gcc/lib/libgomp/Makefile | 10 +++++----- external/gpl3/gcc/lib/libiberty/Makefile | 6 +++--- external/gpl3/gcc/lib/libmudflap/Makefile | 10 +++++----- external/gpl3/gcc/lib/libmudflapth/Makefile | 10 +++++----- external/gpl3/gcc/lib/libobjc/Makefile | 18 +++++++++--------- external/gpl3/gcc/lib/libstdc++-v3/Makefile | 4 ++-- .../gpl3/gcc/lib/libstdc++-v3/Makefile.inc | 11 ++++++++++- .../gpl3/gcc/lib/libstdc++-v3/include/Makefile | 4 ++-- .../gcc/lib/libstdc++-v3/include/Makefile.inc | 10 +++++++++- .../lib/libstdc++-v3/include/backward/Makefile | 9 +++------ .../gcc/lib/libstdc++-v3/include/bits/Makefile | 9 ++++----- .../lib/libstdc++-v3/include/debug/Makefile | 8 +++----- .../lib/libstdc++-v3/include/decimal/Makefile | 8 +++----- .../gcc/lib/libstdc++-v3/include/ext/Makefile | 11 +++++------ .../lib/libstdc++-v3/include/parallel/Makefile | 8 +++----- .../gcc/lib/libstdc++-v3/include/tr1/Makefile | 8 +++----- .../lib/libstdc++-v3/include/tr1_impl/Makefile | 8 +++----- external/gpl3/gcc/lib/libsupc++/Makefile | 4 ++-- .../gpl3/gcc/lib/libsupc++/Makefile.common | 4 ++-- external/gpl3/gcc/usr.bin/Makefile.inc | 6 ++++-- .../gpl3/gcc/usr.bin/libdecnumber/Makefile | 4 ++-- 28 files changed, 114 insertions(+), 97 deletions(-) diff --git a/external/gpl3/gcc/lib/Makefile.inc b/external/gpl3/gcc/lib/Makefile.inc index 82d26741abe7..9212530d775d 100644 --- a/external/gpl3/gcc/lib/Makefile.inc +++ b/external/gpl3/gcc/lib/Makefile.inc @@ -1,3 +1,12 @@ -# $NetBSD: Makefile.inc,v 1.2 2014/03/01 10:00:31 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.3 2014/06/01 19:51:01 mrg Exp $ GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} + +.ifndef _EXTERNAL_GPL3_GCC_LIB_MAKEFILE_INC_ +_EXTERNAL_GPL3_GCC_LIB_MAKEFILE_INC_=1 + +.sinclude "../../Makefile.gcc_path" +.sinclude "../../../Makefile.gcc_path" +.sinclude "../../../../Makefile.gcc_path" + +.endif diff --git a/external/gpl3/gcc/lib/crtstuff/Makefile b/external/gpl3/gcc/lib/crtstuff/Makefile index 73dd9e2e97c8..254f741e28b3 100644 --- a/external/gpl3/gcc/lib/crtstuff/Makefile +++ b/external/gpl3/gcc/lib/crtstuff/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.12 2014/03/09 20:59:14 mrg Exp $ +# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined UNSUPPORTED_COMPILER.clang= # defined -.include +.include # If using an external toolchain, we expect crtbegin/crtend to be # supplied by that toolchain's run-time support. .if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no" -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} -GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH} +GCCARCH= ${EXTERNAL_GCC_SUBDIR}/usr.bin/gcc/arch/${MACHINE_ARCH} GALLCFLAGS= ${G_CRTSTUFF_CFLAGS} ${G_CRTSTUFF_T_CFLAGS} diff --git a/external/gpl3/gcc/lib/libgcc/Makefile.inc b/external/gpl3/gcc/lib/libgcc/Makefile.inc index 018765107b64..48199142bba0 100644 --- a/external/gpl3/gcc/lib/libgcc/Makefile.inc +++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.28 2014/06/01 19:51:01 mrg Exp $ LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} @@ -10,11 +10,11 @@ LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} UNSUPPORTED_COMPILER.clang= # defined -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} -GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH} -GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH} -GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH} +GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH} +GCCARCHLIBGCC= ${GCC_SUBDIR}/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH} +GCCARCHXX= ${GCC_SUBDIR}/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH} GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES} CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC} diff --git a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile index 3b01c6e89d63..27980ea988f6 100644 --- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile +++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/03/01 10:00:36 mrg Exp $ +# $NetBSD: Makefile,v 1.22 2014/06/01 19:51:01 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -7,6 +7,7 @@ NOPROFILE= # defined LIB= gcc +.include "../../../Makefile.gcc_path" .include .if ${MKGCC} != "no" diff --git a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile index 4c45e61deaa4..351858135916 100644 --- a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile +++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/03/21 20:54:13 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -7,6 +7,7 @@ NOPROFILE= # defined LIB= gcc_eh +.include "../../../Makefile.gcc_path" .include .if ${MKGCC} != "no" diff --git a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile index 79475d664a7d..e7d227a43c9e 100644 --- a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile +++ b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/03/05 21:38:59 tron Exp $ +# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 mrg Exp $ USE_SHLIBDIR= yes REQUIRETOOLS= yes @@ -9,6 +9,7 @@ NOSTATICLIB= # defined NOPROFILE= # defined NOPICINSTALL= # defined +.include "../../../Makefile.gcc_path" .include .if ${MKGCC} != "no" diff --git a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile index 659acaef2352..a0d346cb72ca 100644 --- a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile +++ b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:36 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2014/06/01 19:51:01 mrg Exp $ REQUIRETOOLS= yes NOPIC= # defined @@ -7,6 +7,7 @@ NOLINT= # defined LIB= gcov +.include "../../../Makefile.gcc_path" .include .include diff --git a/external/gpl3/gcc/lib/libgomp/Makefile b/external/gpl3/gcc/lib/libgomp/Makefile index c4d03fbd2259..6a86d54b614d 100644 --- a/external/gpl3/gcc/lib/libgomp/Makefile +++ b/external/gpl3/gcc/lib/libgomp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/03/01 10:00:38 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2014/06/01 19:51:01 mrg Exp $ # build GCC's libgomp, so that -fopenmp works. @@ -9,7 +9,7 @@ NOLINT= # defined .if !defined(NO_LIBGOMP) # { -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} LIB= gomp SRCS= \ @@ -50,6 +50,8 @@ CPPFLAGS+= \ -I${ARCHDIR} CFLAGS+=-pthread +COPTS+= -Wno-stack-protector + CWARNFLAGS.clang+= -Wno-conversion # libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols @@ -58,8 +60,6 @@ SHLIB_MINOR= 1 LDFLAGS+= -Wl,--version-script,${DIST}/libgomp/libgomp.map -.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix - .if ${GOMP_MACHINE_ARCH} == ${MACHINE_ARCH:S/earmv5/earm/} # This is where GCC looks for it. FILES= libgomp.spec @@ -75,4 +75,4 @@ libinstall:: .include -COPTS+= -Wno-stack-protector +.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix diff --git a/external/gpl3/gcc/lib/libiberty/Makefile b/external/gpl3/gcc/lib/libiberty/Makefile index 951e3b0283f8..680e1e7d40b4 100644 --- a/external/gpl3/gcc/lib/libiberty/Makefile +++ b/external/gpl3/gcc/lib/libiberty/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:40 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2014/06/01 19:51:01 mrg Exp $ LIBISPRIVATE= yes -.include +.include GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} @@ -10,7 +10,7 @@ LIB= iberty .include "${.CURDIR}/defs.mk" -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \ diff --git a/external/gpl3/gcc/lib/libmudflap/Makefile b/external/gpl3/gcc/lib/libmudflap/Makefile index 8e1996341969..779d7775b4a8 100644 --- a/external/gpl3/gcc/lib/libmudflap/Makefile +++ b/external/gpl3/gcc/lib/libmudflap/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:42 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 mrg Exp $ NOLINT=yes # core dumps UNSUPPORTED_COMPILER.clang= # defined -.include +.include -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist/libmudflap +DIST= ${GCCDIST}/libmudflap CPPFLAGS+= -I${.CURDIR} LINTFLAGS+=-g -.PATH: ${DIST} - SHLIB_MAJOR= 0 SHLIB_MINOR= 0 @@ -20,3 +18,5 @@ INCS=mf-runtime.h INCSDIR=/usr/include/gcc-4.8 .include + +.PATH: ${DIST} diff --git a/external/gpl3/gcc/lib/libmudflapth/Makefile b/external/gpl3/gcc/lib/libmudflapth/Makefile index eb783b2d1226..2effc2226150 100644 --- a/external/gpl3/gcc/lib/libmudflapth/Makefile +++ b/external/gpl3/gcc/lib/libmudflapth/Makefile @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:42 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 mrg Exp $ NOLINT=yes # core dumps UNSUPPORTED_COMPILER.clang= # defined -.include +.include -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist/libmudflap +DIST= ${GCCDIST}/libmudflap CPPFLAGS+= -I${.CURDIR}/../libmudflap -DLIBMUDFLAPTH -.PATH: ${DIST} - SHLIB_MAJOR= 0 SHLIB_MINOR= 0 @@ -18,3 +16,5 @@ LIB=mudflapth SRCS=mf-runtime.c mf-heuristics.c mf-hooks1.c mf-hooks2.c mf-hooks3.c .include + +.PATH: ${DIST} diff --git a/external/gpl3/gcc/lib/libobjc/Makefile b/external/gpl3/gcc/lib/libobjc/Makefile index 8b528ec27ab2..aac18d4a330b 100644 --- a/external/gpl3/gcc/lib/libobjc/Makefile +++ b/external/gpl3/gcc/lib/libobjc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined UNSUPPORTED_COMPILER.clang= # defined -.include +.include LIB= objc GCC_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/} @@ -28,11 +28,11 @@ EXTRA_FAKEHEADERS= LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR} -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist -GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist -GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${GCC_MACHINE_ARCH} -LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${GCC_MACHINE_ARCH} -GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH} +DIST= ${GCCDIST} +GNUHOSTDIST= ${DIST} +GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${GCC_MACHINE_ARCH} +LIBOBJCARCH= ${GCC_SUBDIR}/lib/libobjc/arch/${GCC_MACHINE_ARCH} +GCCLIBXX= ${GCC_SUBDIR}/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH} SRCS= ${G_OBJC_SOURCE_FILES} ${G_C_SOURCE_FILES} @@ -70,8 +70,6 @@ runtime-info.h: touch rtscratch `${OBJC} --print-prog-name=cc1obj` -print-objc-runtime-info rtscratch >$@ -.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc ${DIST}/libobjc/objc-private - ${OBJS} ${POBJS} ${SOBJS}: runtime-info.h ${SRCS}: tconfig.h options.h @@ -115,6 +113,8 @@ CLEANFILES+= options.h optionlist .include +.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc ${DIST}/libobjc/objc-private + .else .include # do nothing .endif diff --git a/external/gpl3/gcc/lib/libstdc++-v3/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/Makefile index a72401b93a2d..f4ee4abb39e0 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2014/05/31 20:09:15 christos Exp $ +# $NetBSD: Makefile,v 1.15 2014/06/01 19:51:01 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined -.include +.include .include "Makefile.inc" diff --git a/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc b/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc index 2d679c5ec355..95a34a974cb2 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc +++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc @@ -1,3 +1,12 @@ -# $NetBSD: Makefile.inc,v 1.3 2014/03/01 10:00:45 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.4 2014/06/01 19:51:01 mrg Exp $ + +.ifndef _EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_MAKEFILE_INC_ +_EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_MAKEFILE_INC_=1 GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} + +.include "../../Makefile.inc" +.sinclude "../../../Makefile.gcc_path" +.sinclude "../../../../Makefile.gcc_path" + +.endif diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile index 2c8b19968542..bc22eab49aca 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/03/01 10:00:47 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2014/06/01 19:51:01 mrg Exp $ SUBDIR= backward ext bits debug decimal parallel pb profile SUBDIR+= tr1 tr2 @@ -10,7 +10,7 @@ SUBDIR+= tr1 tr2 .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} # libsupc++ diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc index b7a5139809a4..ed09192f0a75 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc @@ -1,3 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.3 2014/03/01 10:00:47 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.4 2014/06/01 19:51:01 mrg Exp $ + +.ifndef _EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_INCLUDE_MAKEFILE_INC_ +_EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_INCLUDE_MAKEFILE_INC_=1 .include "../Makefile.inc" +.include "../../../Makefile.gcc_path" + +DIST=${GCCDIST} + +.endif diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile index 83f8b7774978..c83c6202142a 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile @@ -1,20 +1,17 @@ -# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:47 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $ -.include .include .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk" .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_backward_headers} INCSDIR= /usr/include/g++/backward .include "${.CURDIR}/../Makefile.includes" -.PATH: ${DIST}/libstdc++-v3/include - # Get default targets including . .include + +.PATH: ${DIST}/libstdc++-v3/include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile index 99bbe99df92a..141e1ff37647 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.14 2014/03/13 16:14:27 gdt Exp $ +# $NetBSD: Makefile,v 1.15 2014/06/01 19:51:02 mrg Exp $ -.include .include .include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk" .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist GNUHOSTDIST= ${DIST} BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h @@ -55,12 +53,13 @@ ${_h}: ${_s} cp -pf ${.ALLSRC} ${.TARGET} .endfor +# Get default targets including . +.include + .PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \ ${DIST}/libstdc++-v3/include \ ${DIST}/libstdc++-v3/config \ ${DIST}/libstdc++-v3/ \ ${DIST}/libstdc++-v3/libsupc++ -# Get default targets including . -.include .include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile index fa50423e1348..aeafd7e34efb 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:48 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $ .include .include @@ -7,14 +7,12 @@ .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_debug_headers} INCSDIR= /usr/include/g++/debug .include "${.CURDIR}/../Makefile.includes" -.PATH: ${DIST}/libstdc++-v3/include - # Get default targets including . .include + +.PATH: ${DIST}/libstdc++-v3/include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile index a5544a96c12f..863940c6c4a9 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:48 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $ .include .include @@ -7,14 +7,12 @@ .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_decimal_headers} INCSDIR= /usr/include/g++/decimal .include "${.CURDIR}/../Makefile.includes" -.PATH: ${DIST}/libstdc++-v3/include - # Get default targets including . .include + +.PATH: ${DIST}/libstdc++-v3/include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile index c75d98da6f79..0ad06cb8418b 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:48 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2014/06/01 19:51:02 mrg Exp $ .include .include @@ -7,19 +7,18 @@ .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_ext_headers} INCSDIR= /usr/include/g++/ext .include "${.CURDIR}/../Makefile.includes" +.include +# Get default targets including . + +.PATH: ${DIST}/libstdc++-v3/include/ext .PATH: ${DIST}/libstdc++-v3/include .PATH: ${DIST}/libstdc++-v3/config .PATH: ${DIST}/libstdc++-v3/libsupc++ # for ext/hash_set #.PATH: ${DIST}/libstdc++-v3/include/backward - -# Get default targets including . -.include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile index 01d452236804..acd77550c9e5 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:48 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $ .include .include @@ -7,14 +7,12 @@ .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_parallel_headers} INCSDIR= /usr/include/g++/parallel .include "${.CURDIR}/../Makefile.includes" -.PATH: ${DIST}/libstdc++-v3/include - # Get default targets including . .include + +.PATH: ${DIST}/libstdc++-v3/include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile index f2381fcebd1d..b0e9282f0874 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:48 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $ .include .include @@ -7,14 +7,12 @@ .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_tr1_headers} INCSDIR= /usr/include/g++/tr1 .include "${.CURDIR}/../Makefile.includes" -.PATH: ${DIST}/libstdc++-v3/include - # Get default targets including . .include + +.PATH: ${DIST}/libstdc++-v3/include diff --git a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile index 074015a4ef50..b84bf2176165 100644 --- a/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile +++ b/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:48 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $ .include .include @@ -7,12 +7,10 @@ .cc: # disable .cc->NULL transform -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist - INCS= ${G_tr1_impl_headers} INCSDIR= /usr/include/g++/tr1_impl -.PATH: ${DIST}/libstdc++-v3/include/tr1_impl - # Get default targets including . .include + +.PATH: ${DIST}/libstdc++-v3/include/tr1_impl diff --git a/external/gpl3/gcc/lib/libsupc++/Makefile b/external/gpl3/gcc/lib/libsupc++/Makefile index 54e8ce714541..312cc5c30c6a 100644 --- a/external/gpl3/gcc/lib/libsupc++/Makefile +++ b/external/gpl3/gcc/lib/libsupc++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/05/28 17:09:18 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:02 mrg Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -8,7 +8,7 @@ NOPROFILE= # defined CWARNFLAGS.clang+= -Wno-parentheses UNSUPPORTED_COMPILER.clang= # defined -.include +.include GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/} diff --git a/external/gpl3/gcc/lib/libsupc++/Makefile.common b/external/gpl3/gcc/lib/libsupc++/Makefile.common index 9705731a92bc..6c6898126a7e 100644 --- a/external/gpl3/gcc/lib/libsupc++/Makefile.common +++ b/external/gpl3/gcc/lib/libsupc++/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.7 2014/05/28 17:09:18 mrg Exp $ +# $NetBSD: Makefile.common,v 1.8 2014/06/01 19:51:02 mrg Exp $ -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} diff --git a/external/gpl3/gcc/usr.bin/Makefile.inc b/external/gpl3/gcc/usr.bin/Makefile.inc index 3cf35379228b..6d38dbab6258 100644 --- a/external/gpl3/gcc/usr.bin/Makefile.inc +++ b/external/gpl3/gcc/usr.bin/Makefile.inc @@ -1,15 +1,17 @@ -# $NetBSD: Makefile.inc,v 1.23 2014/05/31 22:55:16 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.24 2014/06/01 19:51:02 mrg Exp $ .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_ _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1 .include +.sinclude "../../Makefile.gcc_path" + GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/} GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/} TOP= ${NETBSDSRCDIR} -DIST= ${TOP}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH} diff --git a/external/gpl3/gcc/usr.bin/libdecnumber/Makefile b/external/gpl3/gcc/usr.bin/libdecnumber/Makefile index 580efa84e381..650e2c35404c 100644 --- a/external/gpl3/gcc/usr.bin/libdecnumber/Makefile +++ b/external/gpl3/gcc/usr.bin/libdecnumber/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:54 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $ -DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist +DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} LIBISPRIVATE= yes