Module Name: src
Committed By: mrg
Date: Wed Sep 9 07:23:47 UTC 2020
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile Makefile.inc
Makefile.includes
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/pb: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/profile: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2: Makefile
Added Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl: Makefile
Log Message:
install new libstdc++ pstl headers. remove some dead makefile
code and consolidate some of the header installation.
To generate a diff of this commit:
cvs rdiff -u -r1.2347 -r1.2348 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
cvs rdiff -u -r1.23 -r1.24 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2347 src/distrib/sets/lists/comp/mi:1.2348
--- src/distrib/sets/lists/comp/mi:1.2347 Sun Sep 6 10:54:26 2020
+++ src/distrib/sets/lists/comp/mi Wed Sep 9 07:23:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2347 2020/09/06 10:54:26 mrg Exp $
+# $NetBSD: mi,v 1.2348 2020/09/09 07:23:45 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -1822,6 +1822,27 @@
./usr/include/g++/profile/unordered_set comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/profile/vector comp-cxx-include gcc,cxx,libstdcxx
./usr/include/g++/projectn.h comp-obsolete obsolete
+./usr/include/g++/pstl/algorithm_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/algorithm_fwd.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_algorithm_defs.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/execution_defs.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/execution_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/numeric_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_algorithm_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_memory_defs.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_execution_defs.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_memory_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_numeric_defs.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/glue_numeric_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/memory_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/numeric_fwd.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend_utils.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_impl.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/parallel_backend_tbb.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/unseq_backend_simd.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/utils.h comp-cxx-include gcc=9,cxx,libstdcxx
+./usr/include/g++/pstl/pstl_config.h comp-cxx-include gcc=9,cxx,libstdcxx
./usr/include/g++/pthread_alloc comp-obsolete obsolete
./usr/include/g++/pthread_alloc.h comp-obsolete obsolete
./usr/include/g++/queue comp-cxx-include gcc,cxx,libstdcxx
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.10 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.11
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.10 Sat Sep 5 09:50:15 2020
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile Wed Sep 9 07:23:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/05 09:50:15 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2020/09/09 07:23:45 mrg Exp $
SUBDIR= backward ext bits debug decimal parallel pb profile pstl
SUBDIR+= tr1 tr2
@@ -24,10 +24,9 @@ INCSDIR= /usr/include/g++
.PATH: ${DIST}/libstdc++-v3
.PATH: ${DIST}/libstdc++-v3/libsupc++
-#.PATH: ${DIST}/libstdc++-v3/include/c_compatibility
.PATH: ${DIST}/libstdc++-v3/include/c_global
.PATH: ${DIST}/libstdc++-v3/include/std
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
+.include "Makefile.includes"
+
.include <bsd.subdir.mk>
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc:1.4 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc:1.5
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc:1.4 Sun Jun 1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc Wed Sep 9 07:23:45 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2020/09/09 07:23:45 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"
+.include "${.PARSEDIR}/../Makefile.inc"
DIST=${GCCDIST}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes:1.1 Sat Mar 1 10:00:47 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.includes Wed Sep 9 07:23:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.includes,v 1.1 2014/03/01 10:00:47 mrg Exp $
+# $NetBSD: Makefile.includes,v 1.2 2020/09/09 07:23:45 mrg Exp $
#
# Always install in INCSDIR regardless of any path in filename
@@ -7,3 +7,7 @@
INCSDIR_${f:C,/,_,g}= ${INCSDIR}
INCSNAME_${f:C,/,_,g}= ${f:T}
.endfor
+
+.PATH: ${DIST}/libstdc++-v3/include
+
+.include <bsd.prog.mk>
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.6 src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.7
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.6 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile Wed Sep 9 07:23:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2020/09/09 07:23:45 mrg Exp $
.include <bsd.init.mk>
@@ -10,8 +10,3 @@ INCS= ${G_backward_headers}
INCSDIR= /usr/include/g++/backward
.include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.23 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.24
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.23 Sat Feb 9 03:57:04 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Wed Sep 9 07:23:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/02/09 03:57:04 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2020/09/09 07:23:45 mrg Exp $
.include <bsd.init.mk>
@@ -85,9 +85,6 @@ ${_h}: ${_s}
cp -pf ${.ALLSRC} ${.TARGET}
.endfor
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
.PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
${DIST}/libstdc++-v3/include \
${DIST}/libstdc++-v3/config \
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.6 src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.7
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.6 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2020/09/09 07:23:46 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -11,8 +11,3 @@ INCS= ${G_debug_headers}
INCSDIR= /usr/include/g++/debug
.include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile:1.5 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2020/09/09 07:23:46 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -11,8 +11,3 @@ INCS= ${G_decimal_headers}
INCSDIR= /usr/include/g++/decimal
.include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.7 src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.8
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.7 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/09 07:23:46 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -13,12 +13,6 @@ INCSDIR= /usr/include/g++/ext
.include "${.CURDIR}/../Makefile.includes"
-.include <bsd.prog.mk>
-# Get default targets including <bsd.inc.mk>.
-
.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
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile:1.5 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2020/09/09 07:23:46 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -11,8 +11,3 @@ INCS= ${G_parallel_headers}
INCSDIR= /usr/include/g++/parallel
.include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile:1.2 Sun Jun 1 20:24:45 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/pb/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2020/09/09 07:23:46 mrg Exp $
.include <bsd.init.mk>
@@ -13,7 +13,7 @@ INCS= ${G_pb_headers1} ${G_pb_headers2}
INCS+= ${G_pb_headers5} ${G_pb_headers6} ${G_pb_headers7}
INCSDIR= /usr/include/g++
-.PATH: ${DIST}/libstdc++-v3/include
+# XXX: Can't use Makefile.includes
+.PATH: ${DIST}/libstdc++-v3/include
-# Get default targets including <bsd.inc.mk>.
.include <bsd.prog.mk>
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile:1.2 Sun Jun 1 20:24:45 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2020/09/09 07:23:46 mrg Exp $
.include <bsd.init.mk>
@@ -9,10 +9,13 @@
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
-INCS= ${G_profile_headers} ${G_profile_impl_headers}
+INCS= ${G_profile_headers}
INCSDIR= /usr/include/g++/profile
.PATH: ${DIST}/libstdc++-v3/include/profile
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
+.include "${.CURDIR}/../Makefile.includes"
+
+SUBDIR= impl
+
+.include <bsd.subdir.mk>
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile:1.1 Sat Sep 5 09:50:15 2020
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/pstl/Makefile Wed Sep 9 07:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/09/05 09:50:15 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/09/09 07:23:46 mrg Exp $
.include <bsd.init.mk>
@@ -12,7 +12,4 @@ GNUHOSTDIST= ${DIST}
INCS= ${G_pstl_headers}
INCSDIR= /usr/include/g++/pstl
-.PATH: ${DIST}/libstdc++-v3/include/profile
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
+.include "${.CURDIR}/../Makefile.includes"
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.6 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.7
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.6 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile Wed Sep 9 07:23:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2020/09/09 07:23:47 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -11,8 +11,3 @@ INCS= ${G_tr1_headers}
INCSDIR= /usr/include/g++/tr1
.include "${.CURDIR}/../Makefile.includes"
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile:1.5 Sun Jun 1 19:51:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile Wed Sep 9 07:23:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2020/09/09 07:23:47 mrg Exp $
.include <bsd.own.mk>
.include <bsd.init.mk>
@@ -9,8 +9,3 @@
INCS= ${G_tr1_impl_headers}
INCSDIR= /usr/include/g++/tr1_impl
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/libstdc++-v3/include/tr1_impl
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.3
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile:1.2 Sun Jun 1 20:24:45 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr2/Makefile Wed Sep 9 07:23:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/06/01 20:24:45 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2020/09/09 07:23:47 mrg Exp $
.include <bsd.init.mk>
@@ -13,8 +13,3 @@ INCS= ${G_tr2_headers}
INCSDIR= /usr/include/g++/tr2
.include "${.CURDIR}/../Makefile.includes"
-
-.PATH: ${DIST}/libstdc++-v3/include
-
-# Get default targets including <bsd.inc.mk>.
-.include <bsd.prog.mk>
Added files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile
diff -u /dev/null src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile:1.1
--- /dev/null Wed Sep 9 07:23:47 2020
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/profile/impl/Makefile Wed Sep 9 07:23:46 2020
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2020/09/09 07:23:46 mrg Exp $
+
+.include <bsd.init.mk>
+.include "../../Makefile.inc"
+
+.include "${.CURDIR}/../../../arch/${GCC_MACHINE_ARCH}/defs.mk"
+
+.cc: # disable .cc->NULL transform
+
+DIST= ${GCCDIST}
+GNUHOSTDIST= ${DIST}
+
+INCS= ${G_profile_impl_headers}
+INCSDIR= /usr/include/g++/profile/impl
+
+.PATH: ${DIST}/libstdc++-v3/include/profile/impl
+
+.include "../../Makefile.includes"
