various updates for GCC 4.5. finally obsolete some very old gcc stuff. trunk
authormrg <mrg@NetBSD.org>
Fri, 01 Jul 2011 02:10:07 +0000
branchtrunk
changeset 202443 601741454e12
parent 202442 94e726030a75
child 202444 44f7330e820f
various updates for GCC 4.5. finally obsolete some very old gcc stuff.
distrib/sets/lists/base/ad.mips64eb
distrib/sets/lists/base/ad.mips64el
distrib/sets/lists/base/md.amd64
distrib/sets/lists/base/md.sparc64
distrib/sets/lists/base/mi
distrib/sets/lists/base/shl.mi
distrib/sets/lists/comp/ad.mips64eb
distrib/sets/lists/comp/ad.mips64el
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.i386
distrib/sets/lists/comp/md.sparc64
distrib/sets/lists/comp/mi
distrib/sets/lists/comp/shl.mi
etc/mtree/NetBSD.dist.base
--- a/distrib/sets/lists/base/ad.mips64eb	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.55 2011/06/26 16:42:39 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.56 2011/07/01 02:10:08 mrg Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib
@@ -234,7 +234,8 @@
 ./usr/lib/64/libssl.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libssl.so.8.2			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
-./usr/lib/64/libstdc++.so.7.0			base-compat-shlib	compat,pic,cxx
+./usr/lib/64/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
+./usr/lib/64/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx
 ./usr/lib/64/libsupc++.so.0			base-compat-shlib	obsolete
 ./usr/lib/64/libsupc++.so.0.0			base-compat-shlib	obsolete
 ./usr/lib/64/libtermcap.so.0			base-compat-shlib	compat,pic
@@ -511,7 +512,8 @@
 ./usr/lib/o32/libssl.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libssl.so.8.2			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
-./usr/lib/o32/libstdc++.so.7.0			base-compat-shlib	compat,pic,cxx
+./usr/lib/o32/libstdc++.so.7.0			base-compat-shlib	gcc=45,compat,pic,cxx
+./usr/lib/o32/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx
 ./usr/lib/o32/libsupc++.so.0			base-compat-shlib	obsolete
 ./usr/lib/o32/libsupc++.so.0.0			base-compat-shlib	obsolete
 ./usr/lib/o32/libtermcap.so.0			base-compat-shlib	compat,pic
--- a/distrib/sets/lists/base/ad.mips64el	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/base/ad.mips64el	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.52 2011/06/26 16:42:39 christos Exp $
+# $NetBSD: ad.mips64el,v 1.53 2011/07/01 02:10:08 mrg Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib
@@ -234,7 +234,8 @@
 ./usr/lib/64/libssl.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libssl.so.8.2			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
-./usr/lib/64/libstdc++.so.7.0			base-compat-shlib	compat,pic,cxx
+./usr/lib/64/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
+./usr/lib/64/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx
 ./usr/lib/64/libsupc++.so.0			base-compat-shlib	obsolete
 ./usr/lib/64/libsupc++.so.0.0			base-compat-shlib	obsolete
 ./usr/lib/64/libtermcap.so.0			base-compat-shlib	compat,pic
@@ -511,7 +512,8 @@
 ./usr/lib/o32/libssl.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libssl.so.8.2			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
-./usr/lib/o32/libstdc++.so.7.0			base-compat-shlib	compat,pic,cxx
+./usr/lib/o32/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
+./usr/lib/o32/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx
 ./usr/lib/o32/libsupc++.so.0			base-compat-shlib	obsolete
 ./usr/lib/o32/libsupc++.so.0.0			base-compat-shlib	obsolete
 ./usr/lib/o32/libtermcap.so.0			base-compat-shlib	compat,pic
--- a/distrib/sets/lists/base/md.amd64	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/base/md.amd64	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.126 2011/06/26 16:42:39 christos Exp $
+# $NetBSD: md.amd64,v 1.127 2011/07/01 02:10:08 mrg Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -78,6 +78,12 @@
 ./usr/lib/i386/libcrypto.so.6.2			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcurses.so.7.0			base-compat-shlib	compat,pic
+./usr/lib/i386/libgmp.so.10			base-compat-shlib	gcc=45,compat,pic
+./usr/lib/i386/libgmp.so.10.2			base-compat-shlib	gcc=45,compat,pic
+./usr/lib/i386/libmpc.so.2			base-compat-shlib	gcc=45,compat,pic
+./usr/lib/i386/libmpc.so.2.0			base-compat-shlib	gcc=45,compat,pic
+./usr/lib/i386/libmpfr.so.4			base-compat-shlib	gcc=45,compat,pic
+./usr/lib/i386/libmpfr.so.4.1			base-compat-shlib	gcc=45,compat,pic
 ./usr/lib/i386/libdes.so.8			base-compat-shlib	compat,pic
 ./usr/lib/i386/libdes.so.8.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libdevmapper.so.1		base-compat-shlib	compat,pic,lvm
@@ -237,7 +243,8 @@
 ./usr/lib/i386/libssl.so.8			base-compat-shlib	compat,pic
 ./usr/lib/i386/libssl.so.8.2			base-compat-shlib	compat,pic
 ./usr/lib/i386/libstdc++.so.7			base-compat-shlib	compat,pic
-./usr/lib/i386/libstdc++.so.7.0			base-compat-shlib	compat,pic
+./usr/lib/i386/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic
+./usr/lib/i386/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic
 ./usr/lib/i386/libsupc++.so.1			base-obsolete		obsolete
 ./usr/lib/i386/libsupc++.so.1.0			base-obsolete		obsolete
 ./usr/lib/i386/libtermcap.so.0			base-compat-shlib	compat,pic
--- a/distrib/sets/lists/base/md.sparc64	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/base/md.sparc64	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.119 2011/06/26 16:42:39 christos Exp $
+# $NetBSD: md.sparc64,v 1.120 2011/07/01 02:10:08 mrg Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./sbin/edlabel					base-sysutil-root	obsolete
 ./usr/bin/fdformat				base-util-bin
@@ -235,7 +235,8 @@
 ./usr/lib/sparc/libssl.so.8			base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libssl.so.8.2			base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libstdc++.so.7			base-compat-shlib	compat,pic
-./usr/lib/sparc/libstdc++.so.7.0		base-compat-shlib	compat,pic
+./usr/lib/sparc/libstdc++.so.7.0		base-compat-shlib	gcc=4,compat,pic
+./usr/lib/sparc/libstdc++.so.7.1		base-compat-shlib	gcc=45,compat,pic
 ./usr/lib/sparc/libsupc++.so.1			base-obsolete		obsolete
 ./usr/lib/sparc/libsupc++.so.1.0		base-obsolete		obsolete
 ./usr/lib/sparc/libtermcap.so.0			base-compat-shlib	compat,pic
--- a/distrib/sets/lists/base/mi	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/base/mi	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.941 2011/06/30 04:36:34 agc Exp $
+# $NetBSD: mi,v 1.942 2011/07/01 02:10:08 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -805,12 +805,16 @@
 ./usr/include/g++				base-cxx-usr
 ./usr/include/g++/backward			base-cxx-usr
 ./usr/include/g++/bits				base-cxx-usr
-./usr/include/g++/debug				base-cxx-usr
+./usr/include/g++/debug				base-cxx-usr		gcc=45
+./usr/include/g++/decimal			base-cxx-usr
 ./usr/include/g++/ext				base-cxx-usr
 ./usr/include/g++/gen				base-obsolete		obsolete
-./usr/include/g++/std				base-cxx-usr
+./usr/include/g++/parallel			base-cxx-usr		gcc=45
+./usr/include/g++/std				base-obsolete		obsolete
 ./usr/include/g++/tr1				base-cxx-usr
+./usr/include/g++/tr1_impl			base-cxx-usr		gcc=45
 ./usr/include/gcc-4.1				base-c-usr
+./usr/include/gcc-4.5				base-c-usr
 ./usr/include/gssapi				base-c-usr
 ./usr/include/gssapi/rpc			base-obsolete		obsolete
 ./usr/include/dev/pci/hdaudio			base-c-usr
--- a/distrib/sets/lists/base/shl.mi	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/base/shl.mi	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.589 2011/06/26 16:42:39 christos Exp $
+# $NetBSD: shl.mi,v 1.590 2011/07/01 02:10:09 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -333,9 +333,10 @@
 ./usr/lib/libnvpair.so.0			base-zfs-shlib		dynamicroot,zfs
 ./usr/lib/libnvpair.so.0.0			base-zfs-shlib		zfs,dynamicroot
 ./usr/lib/libobjc.so				base-sys-shlib		gcc
-./usr/lib/libobjc.so.2.0			base-sys-shlib		gcc=3
-./usr/lib/libobjc.so.3				base-sys-shlib		gcc
+./usr/lib/libobjc.so.3				base-sys-shlib		gcc=4
 ./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=4
+./usr/lib/libobjc.so.3				base-sys-shlib		gcc=45
+./usr/lib/libobjc.so.3.0			base-sys-shlib		gcc=45
 ./usr/lib/libopenpgpsdk.so			base-obsolete		obsolete
 ./usr/lib/libopenpgpsdk.so.0			base-obsolete		obsolete
 ./usr/lib/libopenpgpsdk.so.0.9			base-obsolete		obsolete
@@ -642,7 +643,9 @@
 ./usr/lib/libstdc++.so.5			base-sys-shlib		gcc=3
 ./usr/lib/libstdc++.so.5.0			base-sys-shlib		gcc=3,cxx
 ./usr/lib/libstdc++.so.7			base-sys-shlib		gcc=4,cxx
+./usr/lib/libstdc++.so.7			base-sys-shlib		gcc=45,cxx
 ./usr/lib/libstdc++.so.7.0			base-sys-shlib		gcc=4,cxx
+./usr/lib/libstdc++.so.7.1			base-sys-shlib		gcc=45,cxx
 ./usr/lib/libtermcap.so				base-sys-shlib
 ./usr/lib/libtermcap.so.0			base-sys-shlib
 ./usr/lib/libtermcap.so.0.6			base-sys-shlib
--- a/distrib/sets/lists/comp/ad.mips64eb	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/ad.mips64eb	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.38 2011/06/30 04:28:53 agc Exp $
+# $NetBSD: ad.mips64eb,v 1.39 2011/07/01 02:10:09 mrg Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/mips				comp-c-include
@@ -1301,6 +1301,7 @@
 ./usr/libdata/debug/usr/lib/64/libssl.so.8.2.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
+./usr/libdata/debug/usr/lib/64/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libterminfo.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libumem.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat
@@ -1444,6 +1445,7 @@
 ./usr/libdata/debug/usr/lib/o32/libssl.so.8.2.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
+./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libterminfo.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat
--- a/distrib/sets/lists/comp/ad.mips64el	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/ad.mips64el	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.38 2011/06/30 04:28:53 agc Exp $
+# $NetBSD: ad.mips64el,v 1.39 2011/07/01 02:10:09 mrg Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/mips				comp-c-include
@@ -1301,6 +1301,7 @@
 ./usr/libdata/debug/usr/lib/64/libssl.so.8.2.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
+./usr/libdata/debug/usr/lib/64/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libterminfo.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libumem.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat
@@ -1444,6 +1445,7 @@
 ./usr/libdata/debug/usr/lib/o32/libssl.so.8.2.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
+./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libterminfo.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libukfs.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libumem.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug,compat
--- a/distrib/sets/lists/comp/md.amd64	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.119 2011/06/26 16:42:40 christos Exp $
+# $NetBSD: md.amd64,v 1.120 2011/07/01 02:10:09 mrg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -71,8 +71,8 @@
 ./usr/include/clang-3.0/emmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/immintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
 ./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
 ./usr/include/clang-3.0/pmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/smmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/tmmintrin.h		comp-c-include		llvm
@@ -83,6 +83,27 @@
 ./usr/include/gcc-4.1/mmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/pmmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/xmmintrin.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.5/abmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/ammintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/avxintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/bmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/emmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/fma4intrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/ia32intrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/immintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/lwpintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/mm3dnow.h			comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/mm_malloc.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/mmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/nmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/pmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/popcntintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/smmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/tmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/wmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/x86intrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/xmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/xopintrin.h		comp-c-include		gcccmds,gcc=45
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/ansi.h			comp-c-include
 ./usr/include/i386/aout_machdep.h		comp-c-include
@@ -269,12 +290,12 @@
 ./usr/lib/i386/i18n/libDECHanyu_pic.a		comp-obsolete		obsolete
 ./usr/lib/i386/i18n/libEUC.a			comp-c-lib		compat
 ./usr/lib/i386/i18n/libEUC.so			comp-sys-shlib		compat,pic
-./usr/lib/i386/i18n/libEUC_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/i18n/libEUCTW.a			comp-c-lib		compat
 ./usr/lib/i386/i18n/libEUCTW.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/i18n/libEUCTW_g.a		comp-c-proflib		compat,debuglib
 ./usr/lib/i386/i18n/libEUCTW_p.a		comp-obsolete		obsolete
 ./usr/lib/i386/i18n/libEUCTW_pic.a		comp-obsolete		obsolete
+./usr/lib/i386/i18n/libEUC_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/i18n/libEUC_p.a			comp-obsolete		obsolete
 ./usr/lib/i386/i18n/libEUC_pic.a		comp-obsolete		obsolete
 ./usr/lib/i386/i18n/libGBK2K.a			comp-c-lib		compat
@@ -528,6 +549,11 @@
 ./usr/lib/i386/libgcov_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libgcov_p.a			comp-obsolete		obsolete
 ./usr/lib/i386/libgcov_pic.a			comp-obsolete		obsolete
+./usr/lib/i386/libgmp.a				comp-c-lib		gcc=45,compat
+./usr/lib/i386/libgmp.so			comp-sys-shlib		gcc=45,compat,pic
+./usr/lib/i386/libgmp_g.a			-unknown-		gcc=45,compat,debuglib
+./usr/lib/i386/libgmp_p.a			comp-c-proflib		gcc=45,compat,profile
+./usr/lib/i386/libgmp_pic.a			comp-c-piclib		gcc=45,compat,pic
 ./usr/lib/i386/libgnumalloc.a			comp-c-lib		compat
 ./usr/lib/i386/libgnumalloc.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libgnumalloc_g.a			comp-c-proflib		compat,debuglib
@@ -690,6 +716,16 @@
 ./usr/lib/i386/libmj_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libmj_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libmj_pic.a			comp-c-piclib		compat,pic
+./usr/lib/i386/libmpc.a				comp-c-lib		gcc=45,compat
+./usr/lib/i386/libmpc.so			comp-sys-shlib		gcc=45,compat,pic
+./usr/lib/i386/libmpc_g.a			-unknown-		gcc=45,compat,debuglib
+./usr/lib/i386/libmpc_p.a			comp-c-proflib		gcc=45,compat,profile
+./usr/lib/i386/libmpc_pic.a			comp-c-piclib		gcc=45,compat,pic
+./usr/lib/i386/libmpfr.a			comp-c-lib		gcc=45,compat
+./usr/lib/i386/libmpfr.so			comp-sys-shlib		gcc=45,compat,pic
+./usr/lib/i386/libmpfr_g.a			-unknown-		gcc=45,compat,debuglib
+./usr/lib/i386/libmpfr_p.a			comp-c-proflib		gcc=45,compat,profile
+./usr/lib/i386/libmpfr_pic.a			comp-c-piclib		gcc=45,compat,pic
 ./usr/lib/i386/libnetpgp.a			comp-c-lib		compat
 ./usr/lib/i386/libnetpgp.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libnetpgp_g.a			comp-c-proflib		compat,debuglib
@@ -752,12 +788,12 @@
 ./usr/lib/i386/libprop_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libpthread.a			comp-c-lib		compat
 ./usr/lib/i386/libpthread.so			comp-sys-shlib		compat,pic
-./usr/lib/i386/libpthread_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libpthread_dbg.a			comp-c-lib		compat
 ./usr/lib/i386/libpthread_dbg.so		comp-sys-shlib		compat,pic
 ./usr/lib/i386/libpthread_dbg_g.a		comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libpthread_dbg_p.a		comp-c-proflib		compat,profile
 ./usr/lib/i386/libpthread_dbg_pic.a		comp-c-piclib		compat,pic
+./usr/lib/i386/libpthread_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libpthread_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libpthread_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libpuffs.a			comp-c-lib		compat
@@ -824,6 +860,8 @@
 ./usr/lib/i386/librumpdev_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/librumpdev_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/librumpdev_pic.a			comp-c-piclib		compat,pic
+./usr/lib/i386/librumphijack.so			comp-sys-shlib		compat,pic
+./usr/lib/i386/librumphijack_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/i386/librumpnet.a			comp-c-lib		compat
 ./usr/lib/i386/librumpnet.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/librumpnet_g.a			comp-c-proflib		compat,debuglib
@@ -831,11 +869,9 @@
 ./usr/lib/i386/librumpnet_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/librumpuser.a			comp-c-lib		compat
 ./usr/lib/i386/librumpuser.so			comp-sys-shlib		compat,pic
-./usr/lib/i386/librumphijack.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/librumpuser_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/librumpuser_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/librumpuser_pic.a		comp-c-piclib		compat,pic
-./usr/lib/i386/librumphijack_pic.a		comp-c-piclib		compat,pic
 ./usr/lib/i386/librumpvfs.a			comp-c-lib		compat
 ./usr/lib/i386/librumpvfs.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/librumpvfs_g.a			comp-c-proflib		compat,debuglib
@@ -991,9 +1027,10 @@
 ./usr/libdata/debug/usr/lib/i386/libfetch.so.3.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libform.so.6.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libgcc_s.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libgmp.so.10.2.debug	comp-compat-shlib	gcc=45,compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libgnumalloc.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libgssapi.so.10.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libgssapi.so.9.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
-./usr/libdata/debug/usr/lib/i386/libgssapi.so.10.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libhdb.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/i386/libhdb.so.14.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libheimbase.so.1.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
@@ -1029,6 +1066,8 @@
 ./usr/libdata/debug/usr/lib/i386/libmagic.so.3.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libmenu.so.6.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libmj.so.1.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmpc.so.2.0.debug	comp-compat-shlib	gcc=45,compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libmpfr.so.4.1.debug	comp-compat-shlib	gcc=45,compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libnetpgp.so.3.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libnpf.so.0.0.debug	comp-compat-shlib	compat,pic,npf,debug
 ./usr/libdata/debug/usr/lib/i386/libobjc.so.3.0.debug	comp-compat-shlib	compat,pic,debug
@@ -1056,9 +1095,9 @@
 ./usr/libdata/debug/usr/lib/i386/librumpclient.so.0.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug	comp-obsolete obsolete
 ./usr/libdata/debug/usr/lib/i386/librumpdev.so.0.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/librumphijack.so.0.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/librumpnet.so.0.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/librumpuser.so.0.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/librumphijack.so.0.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/librumpvfs.so.0.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libsaslc.so.0.0.debug	comp-compat-shlib	compat,pic,crypto,debug
 ./usr/libdata/debug/usr/lib/i386/libskey.so.2.0.debug	comp-compat-shlib	compat,pic,skey,debug
@@ -1067,7 +1106,8 @@
 ./usr/libdata/debug/usr/lib/i386/libss.so.6.0.debug	comp-compat-shlib	obsolete
 ./usr/libdata/debug/usr/lib/i386/libssh.so.16.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libssl.so.8.2.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.0.debug	comp-compat-shlib	gcc=4,compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.1.debug	comp-compat-shlib	gcc=45,compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libterminfo.so.1.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libukfs.so.1.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libusbhid.so.1.0.debug	comp-compat-shlib	compat,pic,debug
--- a/distrib/sets/lists/comp/md.i386	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/md.i386	Fri Jul 01 02:10:07 2011 +0000
@@ -1,20 +1,41 @@
-# $NetBSD: md.i386,v 1.118 2011/05/12 14:56:22 joerg Exp $
+# $NetBSD: md.i386,v 1.119 2011/07/01 02:10:09 mrg Exp $
 ./usr/include/clang-3.0/avxintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/emmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/immintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
 ./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
-./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
 ./usr/include/clang-3.0/pmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/smmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/tmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/xmmintrin.h		comp-c-include		llvm
 ./usr/include/emmintrin.h			comp-obsolete		obsolete
 ./usr/include/gcc-4.1/emmintrin.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.1/mm_malloc.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/mmintrin.h		comp-c-include		gcccmds,gcc=4
-./usr/include/gcc-4.1/mm_malloc.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/pmmintrin.h		comp-c-include		gcccmds,gcc=4
 ./usr/include/gcc-4.1/xmmintrin.h		comp-c-include		gcccmds,gcc=4
+./usr/include/gcc-4.5/abmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/ammintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/avxintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/bmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/emmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/fma4intrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/ia32intrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/immintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/lwpintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/mm3dnow.h			comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/mm_malloc.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/mmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/nmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/pmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/popcntintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/smmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/tmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/wmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/x86intrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/xmmintrin.h		comp-c-include		gcccmds,gcc=45
+./usr/include/gcc-4.5/xopintrin.h		comp-c-include		gcccmds,gcc=45
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/_G_config.h			comp-obsolete		obsolete
 ./usr/include/i386/ansi.h			comp-c-include
@@ -94,8 +115,8 @@
 ./usr/include/i386/vmparam.h			comp-c-include
 ./usr/include/i386/wchar_limits.h		comp-c-include
 ./usr/include/ieeefp.h				comp-c-include
+./usr/include/mm_malloc.h			comp-obsolete		obsolete
 ./usr/include/mmintrin.h			comp-obsolete		obsolete
-./usr/include/mm_malloc.h			comp-obsolete		obsolete
 ./usr/include/pmc.h				comp-c-include
 ./usr/include/pmmintrin.h			comp-obsolete		obsolete
 ./usr/include/x86				comp-c-include
--- a/distrib/sets/lists/comp/md.sparc64	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/md.sparc64	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.104 2011/06/26 16:42:40 christos Exp $
+# $NetBSD: md.sparc64,v 1.105 2011/07/01 02:10:09 mrg Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -953,7 +953,8 @@
 ./usr/libdata/debug/usr/lib/sparc/libss.so.6.0.debug			comp-compat-shlib	obsolete
 ./usr/libdata/debug/usr/lib/sparc/libssh.so.16.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libssl.so.8.2.debug			comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libstdc++.so.7.0.debug		comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libstdc++.so.7.0.debug		comp-compat-shlib	gcc=4,compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libstdc++.so.7.1.debug		comp-compat-shlib	gcc=45,compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libterminfo.so.1.0.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libukfs.so.1.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libusbhid.so.1.0.debug		comp-compat-shlib	compat,pic,debug
--- a/distrib/sets/lists/comp/mi	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/mi	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1635 2011/06/28 04:53:51 uch Exp $
+#	$NetBSD: mi,v 1.1636 2011/07/01 02:10:10 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -46,9 +46,9 @@
 ./usr/bin/gprof					comp-debug-bin		binutils
 ./usr/bin/lex					comp-c-bin
 ./usr/bin/lint					comp-c-bin
+./usr/bin/llvm-tblgen				comp-c-bin		llvm
 ./usr/bin/lorder				comp-util-bin
 ./usr/bin/luac					comp-util-bin
-./usr/bin/llvm-tblgen				comp-c-bin		llvm
 ./usr/bin/menuc					comp-c-bin
 ./usr/bin/mkstr					comp-c-bin
 ./usr/bin/mkubootimage				comp-util-bin
@@ -70,7 +70,7 @@
 ./usr/bin/objcopy				comp-util-bin		binutils
 ./usr/bin/objdump				comp-util-bin		binutils
 ./usr/bin/pcc					comp-c-bin		pcc
-./usr/bin/protoize				comp-c-bin		gcccmds
+./usr/bin/protoize				comp-c-bin		gcc=4,gcccmds
 ./usr/bin/ranlib				comp-util-bin		binutils
 ./usr/bin/rcs2log				comp-cvs-bin		cvs
 ./usr/bin/readelf				comp-util-bin		binutils
@@ -81,7 +81,7 @@
 ./usr/bin/tsort					comp-util-bin
 ./usr/bin/unifdef				comp-util-bin
 ./usr/bin/unifdefall				comp-util-bin
-./usr/bin/unprotoize				comp-c-bin		gcccmds
+./usr/bin/unprotoize				comp-c-bin		gcc=4,gcccmds
 ./usr/bin/xgettext				comp-c-bin
 ./usr/bin/xstr					comp-c-bin
 ./usr/bin/yacc					comp-c-bin
@@ -714,55 +714,107 @@
 ./usr/include/g++/algobase.h			comp-obsolete		obsolete
 ./usr/include/g++/algorithm			comp-cxx-include	cxx
 ./usr/include/g++/alloc.h			comp-obsolete		obsolete
-./usr/include/g++/backward/algo.h		comp-cxx-include	cxx
-./usr/include/g++/backward/algobase.h		comp-cxx-include	cxx
-./usr/include/g++/backward/alloc.h		comp-cxx-include	cxx
+./usr/include/g++/array				comp-cxx-include	gcc=45,cxx
+./usr/include/g++/atomic			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/backward/algo.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/algo.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/algobase.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/algobase.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/alloc.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/alloc.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/auto_ptr.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/backward/backward_warning.h	comp-cxx-include	cxx
-./usr/include/g++/backward/bvector.h		comp-cxx-include	cxx
-./usr/include/g++/backward/complex.h		comp-cxx-include	cxx
-./usr/include/g++/backward/defalloc.h		comp-cxx-include	cxx
-./usr/include/g++/backward/deque.h		comp-cxx-include	cxx
-./usr/include/g++/backward/fstream.h		comp-cxx-include	cxx
-./usr/include/g++/backward/function.h		comp-cxx-include	cxx
-./usr/include/g++/backward/hash_map.h		comp-cxx-include	cxx
-./usr/include/g++/backward/hash_set.h		comp-cxx-include	cxx
-./usr/include/g++/backward/hashtable.h		comp-cxx-include	cxx
-./usr/include/g++/backward/heap.h		comp-cxx-include	cxx
-./usr/include/g++/backward/iomanip.h		comp-cxx-include	cxx
-./usr/include/g++/backward/iostream.h		comp-cxx-include	cxx
-./usr/include/g++/backward/istream.h		comp-cxx-include	cxx
-./usr/include/g++/backward/iterator.h		comp-cxx-include	cxx
-./usr/include/g++/backward/list.h		comp-cxx-include	cxx
-./usr/include/g++/backward/map.h		comp-cxx-include	cxx
-./usr/include/g++/backward/multimap.h		comp-cxx-include	cxx
-./usr/include/g++/backward/multiset.h		comp-cxx-include	cxx
-./usr/include/g++/backward/new.h		comp-cxx-include	cxx
-./usr/include/g++/backward/ostream.h		comp-cxx-include	cxx
-./usr/include/g++/backward/pair.h		comp-cxx-include	cxx
-./usr/include/g++/backward/queue.h		comp-cxx-include	cxx
-./usr/include/g++/backward/rope.h		comp-cxx-include	cxx
-./usr/include/g++/backward/set.h		comp-cxx-include	cxx
-./usr/include/g++/backward/slist.h		comp-cxx-include	cxx
-./usr/include/g++/backward/stack.h		comp-cxx-include	cxx
-./usr/include/g++/backward/stream.h		comp-cxx-include	cxx
-./usr/include/g++/backward/streambuf.h		comp-cxx-include	cxx
+./usr/include/g++/backward/binders.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/backward/bvector.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/bvector.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/complex.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/complex.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/defalloc.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/defalloc.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/deque.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/deque.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/fstream.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/fstream.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/function.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/function.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/hash_fun.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/backward/hash_map		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/backward/hash_map.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/hash_map.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/hash_set		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/backward/hash_set.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/hash_set.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/hashtable.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/hashtable.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/heap.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/heap.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/iomanip.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/iomanip.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/iostream.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/iostream.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/istream.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/istream.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/iterator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/iterator.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/list.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/list.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/map.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/map.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/multimap.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/multimap.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/multiset.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/multiset.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/new.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/new.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/ostream.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/ostream.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/pair.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/pair.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/queue.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/queue.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/rope.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/rope.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/set.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/set.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/slist.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/slist.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/stack.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/stack.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/stream.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/stream.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/streambuf.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/streambuf.h		comp-obsolete		gcc=45,obsolete
 ./usr/include/g++/backward/strstream		comp-cxx-include	cxx
-./usr/include/g++/backward/tempbuf.h		comp-cxx-include	cxx
-./usr/include/g++/backward/tree.h		comp-cxx-include	cxx
-./usr/include/g++/backward/vector.h		comp-cxx-include	cxx
+./usr/include/g++/backward/tempbuf.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/tempbuf.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/tree.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/tree.h		comp-obsolete		gcc=45,obsolete
+./usr/include/g++/backward/vector.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/backward/vector.h		comp-obsolete		gcc=45,obsolete
 ./usr/include/g++/bitdo1.h			comp-obsolete		obsolete
 ./usr/include/g++/bitdo2.h			comp-obsolete		obsolete
 ./usr/include/g++/bitprims.h			comp-obsolete		obsolete
+./usr/include/g++/bits/algorithmfwd.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/allocator.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/atomic_0.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/atomic_2.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/atomic_base.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/atomic_word.h		comp-cxx-include	gcc=4,cxx
-./usr/include/g++/bits/atomicity.h		comp-cxx-include	cxx
+./usr/include/g++/bits/atomic_word.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/atomicfwd_c.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/atomicfwd_cxx.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/atomicity.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/atomicity.h		comp-obsolete		gcc=45,obsolete
 ./usr/include/g++/bits/basic_file.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/basic_ios.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/basic_ios.tcc		comp-cxx-include	cxx
 ./usr/include/g++/bits/basic_string.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/basic_string.tcc		comp-cxx-include	cxx
 ./usr/include/g++/bits/boost_concept_check.h	comp-cxx-include	cxx
+./usr/include/g++/bits/c++0x_warning.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/c++allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/c++allocator.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/c++config.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/c++io.h			comp-cxx-include	cxx
 ./usr/include/g++/bits/c++locale.h		comp-cxx-include	cxx
@@ -775,39 +827,61 @@
 ./usr/include/g++/bits/concurrence.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/bits/cpp_type_traits.h	comp-cxx-include	cxx
 ./usr/include/g++/bits/cpu_defines.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/cpu_defines.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/ctype_base.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/ctype_inline.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/ctype_noninline.h	comp-cxx-include	cxx
 ./usr/include/g++/bits/cxxabi_tweaks.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/cxxabi_tweaks.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/deque.tcc		comp-cxx-include	cxx
+./usr/include/g++/bits/error_constants.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/extc++.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/forward_list.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/forward_list.tcc		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/fpos.h			comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/bits/fpos.h			comp-obsolete		gcc=4,obsolete
 ./usr/include/g++/bits/fstream.tcc		comp-cxx-include	cxx
 ./usr/include/g++/bits/functexcept.h		comp-cxx-include	cxx
+./usr/include/g++/bits/functional_hash.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/gslice.h			comp-cxx-include	cxx
 ./usr/include/g++/bits/gslice_array.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/gthr-default.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/gthr-posix.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/gthr-single.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/gthr-tpf.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/gthr-tpf.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/gthr.h			comp-cxx-include	cxx
+./usr/include/g++/bits/hashtable.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/hashtable_policy.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/indirect_array.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/ios_base.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/istream.tcc		comp-cxx-include	cxx
 ./usr/include/g++/bits/list.tcc			comp-cxx-include	cxx
 ./usr/include/g++/bits/locale_classes.h		comp-cxx-include	cxx
+./usr/include/g++/bits/locale_classes.tcc	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/locale_facets.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/locale_facets.tcc	comp-cxx-include	cxx
+./usr/include/g++/bits/locale_facets_nonio.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/locale_facets_nonio.tcc	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/localefwd.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/mask_array.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/messages_members.h	comp-cxx-include	cxx
+./usr/include/g++/bits/move.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/os_defines.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/ostream.tcc		comp-cxx-include	cxx
+./usr/include/g++/bits/ostream_insert.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/postypes.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/postypes.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/pthread_allocimpl.h	comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/bits/pthread_allocimpl.h	comp-obsolete		gcc=4,obsolete
+./usr/include/g++/bits/random.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/random.tcc		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/shared_ptr.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/shared_ptr_base.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/slice_array.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/sstream.tcc		comp-cxx-include	cxx
+./usr/include/g++/bits/stdc++.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/stdtr1c++.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/stl_algo.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/stl_algobase.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/stl_alloc.h		comp-cxx-include	gcc=3,cxx
@@ -846,10 +920,15 @@
 ./usr/include/g++/bits/time_members.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/type_traits.h		comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/bits/type_traits.h		comp-obsolete		gcc=4,obsolete
+./usr/include/g++/bits/unique_ptr.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/unordered_map.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/bits/unordered_set.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/valarray_after.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/valarray_after.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/valarray_array.h		comp-cxx-include	cxx
 ./usr/include/g++/bits/valarray_array.tcc	comp-cxx-include	cxx
 ./usr/include/g++/bits/valarray_before.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/bits/valarray_before.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/bits/valarray_meta.h		comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/bits/valarray_meta.h		comp-obsolete		gcc=4,obsolete
 ./usr/include/g++/bits/vector.tcc		comp-cxx-include	cxx
@@ -858,11 +937,16 @@
 ./usr/include/g++/builtin.h			comp-obsolete		obsolete
 ./usr/include/g++/builtinbuf.h			comp-obsolete		obsolete
 ./usr/include/g++/bvector.h			comp-obsolete		obsolete
-./usr/include/g++/c++config.h			comp-cxx-include	cxx
+./usr/include/g++/c++config.h			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/c++config.h			comp-obsolete		gcc=45,obsolete
 ./usr/include/g++/cassert			comp-cxx-include	cxx
+./usr/include/g++/ccomplex			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/cctype			comp-cxx-include	cxx
 ./usr/include/g++/cerrno			comp-cxx-include	cxx
+./usr/include/g++/cfenv				comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/cfloat			comp-cxx-include	cxx
+./usr/include/g++/chrono			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/cinttypes			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ciso646			comp-cxx-include	cxx
 ./usr/include/g++/climits			comp-cxx-include	cxx
 ./usr/include/g++/clocale			comp-cxx-include	cxx
@@ -870,22 +954,32 @@
 ./usr/include/g++/compare.h			comp-obsolete		obsolete
 ./usr/include/g++/complex			comp-cxx-include	cxx
 ./usr/include/g++/complex.h			comp-obsolete		obsolete
+./usr/include/g++/condition_variable		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/csetjmp			comp-cxx-include	cxx
 ./usr/include/g++/csignal			comp-cxx-include	cxx
 ./usr/include/g++/cstdarg			comp-cxx-include	cxx
+./usr/include/g++/cstdbool			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/cstddef			comp-cxx-include	cxx
+./usr/include/g++/cstdint			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/cstdio			comp-cxx-include	cxx
 ./usr/include/g++/cstdlib			comp-cxx-include	cxx
 ./usr/include/g++/cstring			comp-cxx-include	cxx
+./usr/include/g++/ctgmath			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ctime				comp-cxx-include	cxx
 ./usr/include/g++/cwchar			comp-cxx-include	cxx
 ./usr/include/g++/cwctype			comp-cxx-include	cxx
+./usr/include/g++/cxxabi-forced.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/cxxabi.h			comp-cxx-include	cxx
 ./usr/include/g++/debug/bitset			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/bitset			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/debug.h			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/debug.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/deque			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/deque			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/formatter.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/formatter.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/functions.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/functions.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/hash_map		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/debug/hash_map.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/debug/hash_multimap.h		comp-cxx-include	gcc=4,cxx
@@ -893,32 +987,60 @@
 ./usr/include/g++/debug/hash_set		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/debug/hash_set.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/debug/list			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/list			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/macros.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/macros.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/map			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/map			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/map.h			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/map.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/multimap.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/multimap.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/multiset.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/multiset.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/safe_base.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/safe_base.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/safe_iterator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/safe_iterator.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/safe_iterator.tcc	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/safe_iterator.tcc	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/safe_sequence.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/safe_sequence.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/set			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/set			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/set.h			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/set.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/string			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/string			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/debug/unordered_map		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/debug/unordered_set		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/debug/vector			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/debug/vector			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/decimal/decimal		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/decimal/decimal.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/defalloc.h			comp-obsolete		obsolete
 ./usr/include/g++/deque				comp-cxx-include	cxx
 ./usr/include/g++/deque.h			comp-obsolete		obsolete
 ./usr/include/g++/editbuf.h			comp-obsolete		obsolete
 ./usr/include/g++/exception			comp-cxx-include	cxx
 ./usr/include/g++/exception_defines.h		comp-cxx-include	cxx
+./usr/include/g++/exception_ptr.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/algorithm			comp-cxx-include	cxx
 ./usr/include/g++/ext/array_allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/array_allocator.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/ext/atomicity.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/bitmap_allocator.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/bitmap_allocator.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/ext/cast.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/codecvt_specializations.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/codecvt_specializations.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/ext/concurrence.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/debug_allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/debug_allocator.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/enc_filebuf.h		comp-cxx-include	gcc=3,cxx
+./usr/include/g++/ext/enc_filebuf.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/enc_filebuf.h		comp-obsolete		gcc=4,obsolete
+./usr/include/g++/ext/extptr_allocator.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/functional		comp-cxx-include	cxx
 ./usr/include/g++/ext/hash_fun.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/ext/hash_map			comp-cxx-include	cxx
@@ -926,43 +1048,64 @@
 ./usr/include/g++/ext/hashtable.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/ext/iterator			comp-cxx-include	cxx
 ./usr/include/g++/ext/malloc_allocator.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/malloc_allocator.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/memory			comp-cxx-include	cxx
 ./usr/include/g++/ext/mt_allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/mt_allocator.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/new_allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/new_allocator.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/numeric			comp-cxx-include	cxx
+./usr/include/g++/ext/numeric_traits.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/pod_char_traits.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/pod_char_traits.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/ext/pointer.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/pool_allocator.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/pool_allocator.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/rb_tree			comp-cxx-include	cxx
 ./usr/include/g++/ext/rc_string_base.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/rc_string_base.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/rope			comp-cxx-include	cxx
 ./usr/include/g++/ext/ropeimpl.h		comp-cxx-include	cxx
 ./usr/include/g++/ext/slist			comp-cxx-include	cxx
 ./usr/include/g++/ext/sso_string_base.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/sso_string_base.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/stdio_filebuf.h		comp-cxx-include	cxx
 ./usr/include/g++/ext/stdio_sync_filebuf.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/stdio_sync_filebuf.h	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/stl_hash_fun.h		comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/ext/stl_hash_fun.h		comp-obsolete		gcc=4,obsolete
 ./usr/include/g++/ext/stl_hashtable.h		comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/ext/stl_hashtable.h		comp-obsolete		gcc=4,obsolete
 ./usr/include/g++/ext/stl_rope.h		comp-cxx-include	gcc=3,cxx
 ./usr/include/g++/ext/stl_rope.h		comp-obsolete		gcc=4,obsolete
+./usr/include/g++/ext/string_conversions.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/ext/throw_allocator.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/ext/type_traits.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/typelist.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/typelist.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/vstring.h			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/vstring.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/vstring.tcc		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/vstring.tcc		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/vstring_fwd.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/vstring_fwd.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/ext/vstring_util.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/ext/vstring_util.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/faralloc.h			comp-obsolete		obsolete
 ./usr/include/g++/fdeque.h			comp-obsolete		obsolete
+./usr/include/g++/fenv.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/flist.h			comp-obsolete		obsolete
 ./usr/include/g++/floatio.h			comp-obsolete		obsolete
 ./usr/include/g++/fmap.h			comp-obsolete		obsolete
 ./usr/include/g++/fmultmap.h			comp-obsolete		obsolete
 ./usr/include/g++/fmultset.h			comp-obsolete		obsolete
+./usr/include/g++/forward_list			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/fset.h			comp-obsolete		obsolete
 ./usr/include/g++/fstream			comp-cxx-include	gcc,cxx
 ./usr/include/g++/fstream.h			comp-obsolete		obsolete
 ./usr/include/g++/function.h			comp-obsolete		obsolete
 ./usr/include/g++/functional			comp-cxx-include	cxx
+./usr/include/g++/future			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/gen				comp-obsolete		obsolete
 ./usr/include/g++/gen/AVLMap.ccP		comp-obsolete		obsolete
 ./usr/include/g++/gen/AVLMap.hP			comp-obsolete		obsolete
@@ -1100,6 +1243,7 @@
 ./usr/include/g++/hugalloc.h			comp-obsolete		obsolete
 ./usr/include/g++/hvector.h			comp-obsolete		obsolete
 ./usr/include/g++/indstream.h			comp-obsolete		obsolete
+./usr/include/g++/initializer_list		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/iolibio.h			comp-obsolete		obsolete
 ./usr/include/g++/iomanip			comp-cxx-include	cxx
 ./usr/include/g++/iomanip.h			comp-obsolete		obsolete
@@ -1135,7 +1279,9 @@
 ./usr/include/g++/minmax.h			comp-obsolete		obsolete
 ./usr/include/g++/multimap.h			comp-obsolete		obsolete
 ./usr/include/g++/multiset.h			comp-obsolete		obsolete
+./usr/include/g++/mutex				comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/neralloc.h			comp-obsolete		obsolete
+./usr/include/g++/nested_exception.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/new				comp-cxx-include	gcc,cxx
 ./usr/include/g++/new.h				comp-obsolete		obsolete
 ./usr/include/g++/nmap.h			comp-obsolete		obsolete
@@ -1154,7 +1300,10 @@
 ./usr/include/g++/pthread_alloc			comp-obsolete		obsolete
 ./usr/include/g++/pthread_alloc.h		comp-obsolete		obsolete
 ./usr/include/g++/queue				comp-cxx-include	cxx
+./usr/include/g++/random			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/random.cc			comp-obsolete		obsolete
+./usr/include/g++/ratio				comp-cxx-include	gcc=45,cxx
+./usr/include/g++/regex				comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/regex.h			comp-obsolete		obsolete
 ./usr/include/g++/rope				comp-obsolete		obsolete
 ./usr/include/g++/rope.h			comp-obsolete		obsolete
@@ -1167,6 +1316,7 @@
 ./usr/include/g++/sstream			comp-cxx-include	cxx
 ./usr/include/g++/stack				comp-cxx-include	cxx
 ./usr/include/g++/stack.h			comp-obsolete		obsolete
+./usr/include/g++/std				comp-obsolete		obsolete
 ./usr/include/g++/std.h				comp-obsolete		obsolete
 ./usr/include/g++/std/bastring.cc		comp-obsolete		obsolete
 ./usr/include/g++/std/bastring.h		comp-obsolete		obsolete
@@ -1215,6 +1365,7 @@
 ./usr/include/g++/std/valarray_array.h		comp-obsolete		obsolete
 ./usr/include/g++/std/valarray_array.tcc	comp-obsolete		obsolete
 ./usr/include/g++/std/valarray_meta.h		comp-obsolete		obsolete
+./usr/include/g++/stdatomic.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/stddef			comp-obsolete		obsolete
 ./usr/include/g++/stdexcept			comp-cxx-include	cxx
 ./usr/include/g++/stdiostream.h			comp-obsolete		obsolete
@@ -1260,32 +1411,159 @@
 ./usr/include/g++/strstream.h			comp-obsolete		obsolete
 ./usr/include/g++/swap.h			comp-obsolete		obsolete
 ./usr/include/g++/sysent.h			comp-obsolete		obsolete
+./usr/include/g++/system_error			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tempbuf.cc			comp-obsolete		obsolete
 ./usr/include/g++/tempbuf.h			comp-obsolete		obsolete
+./usr/include/g++/tgmath.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/thread			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/array			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/array			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/bessel_function.tcc	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/beta_function.tcc		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/bind_iterate.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/tr1/bind_repeat.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/tr1/boost_shared_ptr.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/ccomplex			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cctype			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cfenv			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cfloat			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cinttypes			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/climits			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cmath			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/complex			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/complex.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cstdarg			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cstdbool			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cstdint			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cstdio			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cstdlib			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/ctgmath			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/ctime			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/ctype.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cwchar			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/cwctype			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/ell_integral.tcc		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/exp_integral.tcc		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/fenv.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/float.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/functional		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/functional		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/functional_hash.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/functional_iterate.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/gamma.tcc			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/hashtable			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/hashtable.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/hashtable_policy.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/hypergeometric.tcc	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/inttypes.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/legendre_function.tcc	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/limits.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/math.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/memory			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/memory			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/modified_bessel_func.tcc	comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/mu_iterate.h		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/poly_hermite.tcc		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/poly_laguerre.tcc		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/random			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/random.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/random.tcc		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/ref_fwd.h			comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/tr1/ref_wrap_iterate.h	comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/regex			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/repeat.h			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/riemann_zeta.tcc		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/shared_ptr.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/special_function_util.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/stdarg.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/stdbool.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/stdint.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/stdio.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/stdlib.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/tgmath.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/tuple			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/tuple			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/tuple_iterate.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/tr1/type_traits		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/type_traits		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/type_traits_fwd.h		comp-cxx-include	gcc=4,cxx
 ./usr/include/g++/tr1/unordered_map		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/unordered_map		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/unordered_map.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/unordered_set		comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/unordered_set		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/unordered_set.h		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tr1/utility			comp-cxx-include	gcc=4,cxx
+./usr/include/g++/tr1/utility			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/wchar.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1/wctype.h			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/algo.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/algobase.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/algorithm		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/algorithmfwd.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/balanced_quicksort.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/base.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/basic_iterator.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/checkers.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/compatibility.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/compiletime_settings.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/equally_split.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/features.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/find.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/find_selectors.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/for_each.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/for_each_selectors.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/iterator.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/list_partition.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/losertree.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/merge.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/multiseq_selection.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/multiway_merge.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/multiway_mergesort.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/numeric		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/numericfwd.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/omp_loop.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/omp_loop_static.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/par_loop.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/parallel.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/partial_sum.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/partition.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/queue.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/quicksort.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/random_number.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/random_shuffle.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/search.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/set_operations.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/settings.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/sort.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/tags.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/types.h		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/unique_copy.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/parallel/workstealing.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/array		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/boost_sp_counted_base.h	comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cctype		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cfenv		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cinttypes		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cmath		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/complex		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cstdint		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cstdio		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cstdlib		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cwchar		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/cwctype		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/regex		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/type_traits		comp-cxx-include	gcc=45,cxx
+./usr/include/g++/tr1_impl/utility		comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/tree.cc			comp-obsolete		obsolete
 ./usr/include/g++/tree.h			comp-obsolete		obsolete
+./usr/include/g++/tuple				comp-cxx-include	gcc=45,cxx
+./usr/include/g++/type_traits			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/type_traits.h			comp-obsolete		obsolete
 ./usr/include/g++/typeinfo			comp-cxx-include	cxx
 ./usr/include/g++/typemacros.h			comp-obsolete		obsolete
+./usr/include/g++/unordered_map			comp-cxx-include	gcc=45,cxx
+./usr/include/g++/unordered_set			comp-cxx-include	gcc=45,cxx
 ./usr/include/g++/utility			comp-cxx-include	cxx
 ./usr/include/g++/valarray			comp-cxx-include	cxx
 ./usr/include/g++/values.h			comp-obsolete		obsolete
@@ -1294,6 +1572,7 @@
 ./usr/include/gelf.h				comp-c-include
 ./usr/include/getopt.h				comp-c-include
 ./usr/include/glob.h				comp-c-include
+./usr/include/gmp.h				comp-cxx-include	gcc=45,cxx
 ./usr/include/grp.h				comp-c-include
 ./usr/include/gssapi.h				comp-krb5-include	kerberos
 ./usr/include/gssapi/gssapi.h			comp-krb5-include	kerberos
@@ -1471,6 +1750,10 @@
 ./usr/include/mj.h				comp-c-include		crypto
 ./usr/include/mntopts.h				comp-c-include
 ./usr/include/monetary.h			comp-c-include
+./usr/include/mpc-log.h				comp-c-include		gcc=45
+./usr/include/mpc.h				comp-c-include		gcc=45
+./usr/include/mpf2mpfr.h			comp-c-include		gcc=45
+./usr/include/mpfr.h				comp-c-include		gcc=45
 ./usr/include/mpool.h				comp-c-include
 ./usr/include/mqueue.h				comp-c-include
 ./usr/include/msdosfs/bootsect.h		comp-c-include
@@ -1744,6 +2027,7 @@
 ./usr/include/objc/list.h			comp-obsolete		obsolete
 ./usr/include/objc/objc-api.h			comp-c-include
 ./usr/include/objc/objc-decls.h			comp-cxx-include	gcc=4
+./usr/include/objc/objc-decls.h			comp-cxx-include	gcc=45,cxx
 ./usr/include/objc/objc-list.h			comp-c-include
 ./usr/include/objc/objc.h			comp-c-include
 ./usr/include/objc/sarray.h			comp-c-include
@@ -1866,8 +2150,8 @@
 ./usr/include/pcap/namedb.h			comp-c-include
 ./usr/include/pcap/pcap.h			comp-c-include
 ./usr/include/pci.h				comp-c-include
+./usr/include/perfuse.h				comp-c-include
 ./usr/include/poll.h				comp-c-include
-./usr/include/perfuse.h				comp-c-include
 ./usr/include/prop/plistref.h			comp-c-include
 ./usr/include/prop/prop_array.h			comp-c-include
 ./usr/include/prop/prop_bool.h			comp-c-include
@@ -2484,7 +2768,7 @@
 ./usr/lib/libform_p.a				comp-c-proflib		profile
 ./usr/lib/libfrtbegin.a				comp-c-lib		gcc=3
 ./usr/lib/libfrtbegin.a				comp-obsolete		gcc=4,obsolete
-./usr/lib/libg++.a				comp-obsolete		obsolete
+./usr/lib/libg++a				comp-obsolete		obsolete
 ./usr/lib/libg++_p.a				comp-obsolete		obsolete
 ./usr/lib/libg++_pic.a				comp-obsolete		obsolete
 ./usr/lib/libg2c.a				comp-fortran-lib	gcc=3
@@ -2499,6 +2783,9 @@
 ./usr/lib/libgcc_s_g.a				-unknown-		debuglib
 ./usr/lib/libgcov.a				comp-c-lib
 ./usr/lib/libgcov_g.a				-unknown-		debuglib
+./usr/lib/libgmp.a				-unknown-		gcc=45,debuglib
+./usr/lib/libgmp.a				comp-c-lib		gcc=45
+./usr/lib/libgmp_p.a				comp-c-proflib		gcc=45,profile
 ./usr/lib/libgnumalloc.a			comp-c-lib
 ./usr/lib/libgnumalloc_g.a			-unknown-		debuglib
 ./usr/lib/libgnumalloc_p.a			comp-c-proflib		profile
@@ -2602,6 +2889,12 @@
 ./usr/lib/libmj.a				comp-c-lib		crypto
 ./usr/lib/libmj_g.a				-unknown-		debuglib
 ./usr/lib/libmj_p.a				comp-c-proflib		profile,crypto
+./usr/lib/libmpc.a				-unknown-		gcc=45,debuglib
+./usr/lib/libmpc.a				comp-c-lib		gcc=45
+./usr/lib/libmpc_p.a				comp-c-proflib		gcc=45,profile
+./usr/lib/libmpfr.a				-unknown-		gcc=45,debuglib
+./usr/lib/libmpfr.a				comp-c-lib		gcc=45
+./usr/lib/libmpfr_p.a				comp-c-proflib		gcc=45,profile
 ./usr/lib/libnetpgp.a				comp-c-lib		crypto
 ./usr/lib/libnetpgp_g.a				-unknown-		debuglib
 ./usr/lib/libnetpgp_p.a				comp-c-proflib		profile,crypto
@@ -2861,13 +3154,13 @@
 ./usr/lib/librumpkern_z_g.a			-unknown-		debuglib
 ./usr/lib/librumpkern_z_p.a			comp-c-proflib		profile
 ./usr/lib/librumpnet.a				comp-c-lib
-./usr/lib/librumpnet_g.a			-unknown-		debuglib
 ./usr/lib/librumpnet_agr.a			comp-c-lib
 ./usr/lib/librumpnet_agr_g.a			-unknown-		debuglib
 ./usr/lib/librumpnet_agr_p.a			comp-c-proflib		profile
 ./usr/lib/librumpnet_bridge.a			comp-c-lib
 ./usr/lib/librumpnet_bridge_g.a			-unknown-		debuglib
 ./usr/lib/librumpnet_bridge_p.a			comp-c-proflib		profile
+./usr/lib/librumpnet_g.a			-unknown-		debuglib
 ./usr/lib/librumpnet_local.a			comp-c-lib
 ./usr/lib/librumpnet_local_g.a			-unknown-		debuglib
 ./usr/lib/librumpnet_local_p.a			comp-c-proflib		profile
@@ -2995,7 +3288,6 @@
 ./usr/libdata/debug/bin/csh.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/date.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/dd.debug		comp-util-debug		debug
-./usr/libdata/debug/bin/rump.dd.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/df.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/domainname.debug	comp-nis-debug		debug
 ./usr/libdata/debug/bin/echo.debug		comp-util-debug		debug
@@ -3016,6 +3308,7 @@
 ./usr/libdata/debug/bin/rcp.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/bin/rm.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/rmdir.debug		comp-util-debug		debug
+./usr/libdata/debug/bin/rump.dd.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/sh.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/sleep.debug		comp-util-debug		debug
 ./usr/libdata/debug/bin/stty.debug		comp-util-debug		debug
@@ -3032,15 +3325,14 @@
 ./usr/libdata/debug/sbin/ccdconfig.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/cgdconfig.debug	comp-sysutil-debug	crypto,debug
 ./usr/libdata/debug/sbin/chown.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/rump.cgdconfig.debug	comp-sysutil-debug	crypto,debug
 ./usr/libdata/debug/sbin/clri.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/dhclient.debug		comp-dhclient-debug	debug
 ./usr/libdata/debug/sbin/dhcpcd.debug		comp-dhcpcd-debug	debug
 ./usr/libdata/debug/sbin/disklabel.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/dkctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/dkscan_bsdlabel.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/dmctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/dmesg.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/dmctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/dmsetup.debug		comp-sysutil-debug	lvm,debug
 ./usr/libdata/debug/sbin/drvctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/dump.debug		comp-sysutil-debug	debug
@@ -3056,7 +3348,6 @@
 ./usr/libdata/debug/sbin/fsirand.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/gpt.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/ifconfig.debug		comp-netutil-debug	debug
-./usr/libdata/debug/sbin/rump.ifconfig.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/sbin/init.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/ipf.debug		comp-ipf-debug		ipfilter,debug
 ./usr/libdata/debug/sbin/lvm.debug		comp-sysutil-debug	lvm,debug
@@ -3065,9 +3356,6 @@
 ./usr/libdata/debug/sbin/modload.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/modstat.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/modunload.debug	comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/rump.modload.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/rump.modstat.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/rump.modunload.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/mount.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/mount_ados.debug	comp-adosfs-debug	debug
 ./usr/libdata/debug/sbin/mount_cd9660.debug	comp-sysutil-debug	debug
@@ -3107,11 +3395,9 @@
 ./usr/libdata/debug/sbin/pflogd.debug		comp-pf-debug		pf,debug
 ./usr/libdata/debug/sbin/pfs.debug		comp-pf-debug		pf,debug
 ./usr/libdata/debug/sbin/ping.debug		comp-netutil-debug	debug
-./usr/libdata/debug/sbin/rump.ping.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/sbin/ping6.debug		comp-netutil-debug	use_inet6,debug
 ./usr/libdata/debug/sbin/pppoectl.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/sbin/raidctl.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/rump.raidctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/rcorder.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/reboot.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/resize_ffs.debug	comp-sysutil-debug	debug
@@ -3119,9 +3405,17 @@
 ./usr/libdata/debug/sbin/restore.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/rndctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/route.debug		comp-netutil-debug	debug
-./usr/libdata/debug/sbin/rump.route.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/sbin/routed.debug		comp-router-debug	debug
 ./usr/libdata/debug/sbin/rtsol.debug		comp-netutil-debug	use_inet6,debug
+./usr/libdata/debug/sbin/rump.cgdconfig.debug	comp-sysutil-debug	crypto,debug
+./usr/libdata/debug/sbin/rump.ifconfig.debug		comp-netutil-debug	debug
+./usr/libdata/debug/sbin/rump.modload.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/rump.modstat.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/rump.modunload.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/rump.ping.debug		comp-netutil-debug	debug
+./usr/libdata/debug/sbin/rump.raidctl.debug		comp-sysutil-debug	debug
+./usr/libdata/debug/sbin/rump.route.debug		comp-netutil-debug	debug
+./usr/libdata/debug/sbin/rump.sysctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/savecore.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/scan_ffs.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/scsictl.debug		comp-sysutil-debug	debug
@@ -3131,7 +3425,6 @@
 ./usr/libdata/debug/sbin/svhlabel.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/swapctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/sysctl.debug		comp-sysutil-debug	debug
-./usr/libdata/debug/sbin/rump.sysctl.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/tbrconfig.debug	comp-router-debug	debug
 ./usr/libdata/debug/sbin/ttyflags.debug		comp-sysutil-debug	debug
 ./usr/libdata/debug/sbin/tunefs.debug		comp-sysutil-debug	debug
@@ -3228,7 +3521,7 @@
 ./usr/libdata/debug/usr/bin/fsplit.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/fstat.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/ftp.debug		comp-netutil-debug	debug
-./usr/libdata/debug/usr/bin/g++.debug		comp-cxx-debug		gcccmds,debug
+./usr/libdata/debug/usr/bin/g++debug		comp-cxx-debug		gcccmds,debug
 ./usr/libdata/debug/usr/bin/g77.debug		comp-fortran-debug	gcc=3,gcccmds,debug
 ./usr/libdata/debug/usr/bin/gcc.debug		comp-c-debug		gcccmds,debug
 ./usr/libdata/debug/usr/bin/gcore.debug		comp-debug-debug	debug
@@ -3361,7 +3654,6 @@
 ./usr/libdata/debug/usr/bin/netpgpkeys.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/netpgpverify.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/bin/netstat.debug	comp-netutil-debug	debug
-./usr/libdata/debug/usr/bin/rump.netstat.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/bin/newgrp.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/newsyslog.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/nfsstat.debug	comp-nfsclient-debug	debug
@@ -3419,10 +3711,12 @@
 ./usr/libdata/debug/usr/bin/rpcinfo.debug	comp-rpcutil-debug	debug
 ./usr/libdata/debug/usr/bin/rs.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/rsh.debug		comp-netutil-debug	debug
+./usr/libdata/debug/usr/bin/rump.dhcpclient.debug		comp-util-debug		debug
+./usr/libdata/debug/usr/bin/rump.halt.debug		comp-util-debug		debug
+./usr/libdata/debug/usr/bin/rump.netstat.debug	comp-netutil-debug	debug
+./usr/libdata/debug/usr/bin/rump.sockstat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/rump_allserver.debug		comp-util-debug		debug
-./usr/libdata/debug/usr/bin/rump.dhcpclient.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/rump_server.debug		comp-util-debug		debug
-./usr/libdata/debug/usr/bin/rump.halt.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/rup.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/usr/bin/ruptime.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/bin/rusers.debug	comp-netutil-debug	debug
@@ -3444,7 +3738,6 @@
 ./usr/libdata/debug/usr/bin/skeyinfo.debug	comp-util-debug		skey,debug
 ./usr/libdata/debug/usr/bin/skeyinit.debug	comp-util-debug		skey,debug
 ./usr/libdata/debug/usr/bin/sockstat.debug	comp-util-debug		debug
-./usr/libdata/debug/usr/bin/rump.sockstat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/soelim.debug	comp-groff-debug	debug
 ./usr/libdata/debug/usr/bin/sort.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/bin/split.debug		comp-util-debug		debug
@@ -3593,8 +3886,8 @@
 ./usr/libdata/debug/usr/libexec/ching/printching.debug	comp-games-debug	debug
 ./usr/libdata/debug/usr/libexec/comsat.debug	comp-mail-debug		debug
 ./usr/libdata/debug/usr/libexec/cpp.debug	comp-obsolete		pcc,obsolete
+./usr/libdata/debug/usr/libexec/digest-service.debug	comp-krb5-debug		kerberos,debug
 ./usr/libdata/debug/usr/libexec/f771.debug	comp-fortran-debug	gcc=3,gcccmds,debug
-./usr/libdata/debug/usr/libexec/digest-service.debug	comp-krb5-debug		kerberos,debug
 ./usr/libdata/debug/usr/libexec/f771.debug	comp-obsolete		gcc=4,obsolete
 ./usr/libdata/debug/usr/libexec/fingerd.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/libexec/ftp-proxy.debug	comp-obsolete		obsolete
@@ -3714,7 +4007,6 @@
 ./usr/libdata/debug/usr/sbin/dumplfs.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/edquota.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/envstat.debug	comp-sysutil-debug	debug
-./usr/libdata/debug/usr/sbin/rump.envstat.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/eshconfig.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/extattrctl.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/faithd.debug	comp-router-debug	inet6,debug
@@ -3841,7 +4133,6 @@
 ./usr/libdata/debug/usr/sbin/postqueue.debug	comp-postfix-debug	postfix,debug
 ./usr/libdata/debug/usr/sbin/postsuper.debug	comp-postfix-debug	postfix,debug
 ./usr/libdata/debug/usr/sbin/powerd.debug	comp-sysutil-debug	debug
-./usr/libdata/debug/usr/sbin/rump.powerd.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/pppd.debug		comp-ppp-debug		debug
 ./usr/libdata/debug/usr/sbin/pppdump.debug	comp-ppp-debug		debug
 ./usr/libdata/debug/usr/sbin/pppstats.debug	comp-ppp-debug		debug
@@ -3875,6 +4166,9 @@
 ./usr/libdata/debug/usr/sbin/rtadvd.debug	comp-router-debug	use_inet6,debug
 ./usr/libdata/debug/usr/sbin/rtquery.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/sbin/rtsold.debug	comp-netutil-debug	inet6,debug
+./usr/libdata/debug/usr/sbin/rump.envstat.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/usr/sbin/rump.powerd.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/usr/sbin/rump.traceroute.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/sbin/rump_cd9660.debug	comp-puffs-debug	debug
 ./usr/libdata/debug/usr/sbin/rump_efs.debug	comp-puffs-debug	debug
 ./usr/libdata/debug/usr/sbin/rump_ext2fs.debug	comp-puffs-debug	debug
@@ -3918,7 +4212,6 @@
 ./usr/libdata/debug/usr/sbin/timed.debug	comp-timed-debug	debug
 ./usr/libdata/debug/usr/sbin/timedc.debug	comp-timed-debug	debug
 ./usr/libdata/debug/usr/sbin/traceroute.debug	comp-netutil-debug	debug
-./usr/libdata/debug/usr/sbin/rump.traceroute.debug	comp-netutil-debug	debug
 ./usr/libdata/debug/usr/sbin/traceroute6.debug	comp-netutil-debug	use_inet6,debug
 ./usr/libdata/debug/usr/sbin/trpt.debug		comp-netutil-debug	debug
 ./usr/libdata/debug/usr/sbin/trsp.debug		comp-obsolete		obsolete
@@ -3976,6 +4269,7 @@
 ./usr/libdata/lint/llib-levent.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lfetch.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lform.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lgmp.ln			comp-c-lintlib		gcc=45,lint
 ./usr/libdata/lint/llib-lgnumalloc.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lgssapi.ln		comp-krb5-lintlib	lint,kerberos
 ./usr/libdata/lint/llib-lheimbase.ln		comp-krb5-lintlib	lint,kerberos
@@ -4001,6 +4295,8 @@
 ./usr/libdata/lint/llib-lmenu.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lmilter.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lmj.ln			comp-c-lintlib		lint,crypto
+./usr/libdata/lint/llib-lmpc.ln			comp-c-lintlib		gcc=45,lint
+./usr/libdata/lint/llib-lmpfr.ln		comp-c-lintlib		gcc=45,lint,missing
 ./usr/libdata/lint/llib-lnetpgp.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lnpf.ln			comp-npf-lintlib	lint,npf
 ./usr/libdata/lint/llib-lntp.ln			comp-obsolete		obsolete
@@ -4009,25 +4305,25 @@
 ./usr/libdata/lint/llib-lp2k.ln			comp-puffs-lintlib	lint
 ./usr/libdata/lint/llib-lpam.ln			comp-c-lintlib		lint,pam
 ./usr/libdata/lint/llib-lpcap.ln		comp-c-lintlib		lint
-./usr/libdata/lint/llib-lperfuse.ln		comp-perfuse-lintlib	lint
 ./usr/libdata/lint/llib-lpcc.ln			comp-c-lintlib		lint,pcc
 ./usr/libdata/lint/llib-lpci.ln			comp-c-lintlib		lint
+./usr/libdata/lint/llib-lperfuse.ln		comp-perfuse-lintlib	lint
 ./usr/libdata/lint/llib-lposix.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lprop.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lpthread.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lpthread_dbg.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lpuffs.ln		comp-puffs-lintlib	lint
+./usr/libdata/lint/llib-lquota.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lradius.ln		comp-c-lintlib		lint
-./usr/libdata/lint/llib-lquota.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lrefuse.ln		comp-refuse-lintlib	lint
 ./usr/libdata/lint/llib-lresolv.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lrmt.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lroken.ln		comp-krb5-lintlib	lint,kerberos
-./usr/libdata/lint/llib-lrmt.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lrpcsvc.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lrt.ln			comp-c-lintlib		lint
-./usr/libdata/lint/llib-lrumpuser.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lrumpclient.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lrumphijack.ln		comp-c-lintlib		lint
-./usr/libdata/lint/llib-lrumpclient.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lrumpuser.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lsaslc.ln		comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-lsdp.ln			comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lskey.ln		comp-c-lintlib		lint,skey
@@ -4501,9 +4797,9 @@
 ./usr/share/man/cat2/siginfo.0			comp-c-catman		.cat
 ./usr/share/man/cat2/sigpending.0		comp-c-catman		.cat
 ./usr/share/man/cat2/sigprocmask.0		comp-c-catman		.cat
-./usr/share/man/cat2/sigreturn.0		comp-obsolete		obsolete
 ./usr/share/man/cat2/sigqueue.0			comp-c-catman		.cat
 ./usr/share/man/cat2/sigqueueinfo.0		comp-c-catman		.cat
+./usr/share/man/cat2/sigreturn.0		comp-obsolete		obsolete
 ./usr/share/man/cat2/sigstack.0			comp-c-catman		.cat
 ./usr/share/man/cat2/sigsuspend.0		comp-c-catman		.cat
 ./usr/share/man/cat2/sigtimedwait.0		comp-c-catman		.cat
@@ -5042,8 +5338,8 @@
 ./usr/share/man/cat3/__insn_barrier.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__noinline.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__packed.0			comp-c-catman		.cat
+./usr/share/man/cat3/__predict_false.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__predict_true.0		comp-c-catman		.cat
-./usr/share/man/cat3/__predict_false.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__pure.0			comp-c-catman		.cat
 ./usr/share/man/cat3/__read_mostly.0		comp-c-catman		.cat
 ./usr/share/man/cat3/__section.0		comp-c-catman		.cat
@@ -7328,6 +7624,7 @@
 ./usr/share/man/cat3/libmagic.0			comp-c-catman		.cat
 ./usr/share/man/cat3/libmj.0			comp-c-catman		crypto,.cat
 ./usr/share/man/cat3/libnetpgp.0		comp-c-catman		crypto,.cat
+./usr/share/man/cat3/libperfuse.0		comp-perfuse-catman	.cat
 ./usr/share/man/cat3/libradius.0		comp-c-catman		.cat
 ./usr/share/man/cat3/libsaslc.0			comp-c-catman		crypto,.cat
 ./usr/share/man/cat3/libusb.0			comp-obsolete		obsolete
@@ -7718,7 +8015,6 @@
 ./usr/share/man/cat3/pcidev_conf_write.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pclose.0			comp-c-catman		.cat
 ./usr/share/man/cat3/pechochar.0		comp-c-catman		.cat
-./usr/share/man/cat3/libperfuse.0		comp-perfuse-catman	.cat
 ./usr/share/man/cat3/perror.0			comp-c-catman		.cat
 ./usr/share/man/cat3/pidfile.0			comp-c-catman		.cat
 ./usr/share/man/cat3/pidlock.0			comp-c-catman		.cat
@@ -8075,13 +8371,13 @@
 ./usr/share/man/cat3/randomid_new.0		comp-c-catman		.cat
 ./usr/share/man/cat3/raw.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rb.0			comp-obsolete		obsolete
-./usr/share/man/cat3/rbtree.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rb_tree_find_node.0	comp-c-catman		.cat
 ./usr/share/man/cat3/rb_tree_find_node_geq.0	comp-c-catman		.cat
 ./usr/share/man/cat3/rb_tree_find_node_leq.0	comp-c-catman		.cat
 ./usr/share/man/cat3/rb_tree_init.0		comp-c-catman		.cat
 ./usr/share/man/cat3/rb_tree_insert_node.0	comp-c-catman		.cat
 ./usr/share/man/cat3/rb_tree_iterate.0		comp-c-catman		.cat
+./usr/share/man/cat3/rbtree.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rc4.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/rcmd.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rcmd_af.0			comp-c-catman		.cat
@@ -8179,10 +8475,10 @@
 ./usr/share/man/cat3/rresvport_af.0		comp-c-catman		.cat
 ./usr/share/man/cat3/rsa.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/rump.0			comp-c-catman		.cat
+./usr/share/man/cat3/rump_etfs.0			comp-c-catman		.cat
+./usr/share/man/cat3/rump_lwproc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rumpclient.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rumphijack.0			comp-c-catman		.cat
-./usr/share/man/cat3/rump_etfs.0			comp-c-catman		.cat
-./usr/share/man/cat3/rump_lwproc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/rumpuser.0			comp-c-catman		.cat
 ./usr/share/man/cat3/ruserok.0			comp-c-catman		.cat
 ./usr/share/man/cat3/savetty.0			comp-c-catman		.cat
@@ -10372,10 +10668,10 @@
 ./usr/share/man/cat9/x86/nmi_disestablish.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/nmi_establish.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/tsc.0			comp-sys-catman		.cat
-./usr/share/man/cat9/x86/tsc_tc_init.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/tsc_sync_ap.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/tsc_sync_bp.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/tsc_sync_drift.0	comp-sys-catman		.cat
+./usr/share/man/cat9/x86/tsc_tc_init.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/x86/x86_msr_xcall.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/xc_broadcast.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/xc_unicast.0		comp-sys-catman		.cat
@@ -11194,8 +11490,8 @@
 ./usr/share/man/html3/__insn_barrier.html	comp-c-htmlman		html
 ./usr/share/man/html3/__noinline.html		comp-c-htmlman		html
 ./usr/share/man/html3/__packed.html		comp-c-htmlman		html
+./usr/share/man/html3/__predict_false.html	comp-c-htmlman		html
 ./usr/share/man/html3/__predict_true.html	comp-c-htmlman		html
-./usr/share/man/html3/__predict_false.html	comp-c-htmlman		html
 ./usr/share/man/html3/__pure.html		comp-c-htmlman		html
 ./usr/share/man/html3/__read_mostly.html	comp-c-htmlman		html
 ./usr/share/man/html3/__section.html		comp-c-htmlman		html
@@ -12656,6 +12952,7 @@
 ./usr/share/man/html3/isnan.html		comp-c-htmlman		html
 ./usr/share/man/html3/isnanf.html		comp-c-htmlman		html
 ./usr/share/man/html3/isnormal.html		comp-c-htmlman		html
+./usr/share/man/html3/isns.html			comp-c-htmlman		html
 ./usr/share/man/html3/isns.html		comp-isns-htmlman		.html
 ./usr/share/man/html3/iso646.html		comp-c-htmlman		html
 ./usr/share/man/html3/iso_addr.html		comp-c-htmlman		html
@@ -13397,10 +13694,10 @@
 ./usr/share/man/html3/libarchive.html		comp-c-htmlman		html
 ./usr/share/man/html3/libarchive_internals.html	comp-c-htmlman		html
 ./usr/share/man/html3/libiscsi.html		comp-c-htmlman		iscsi,html
-./usr/share/man/html3/isns.html			comp-c-htmlman		html
 ./usr/share/man/html3/libmagic.html		comp-c-htmlman		html
 ./usr/share/man/html3/libmj.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/libnetpgp.html		comp-c-htmlman		crypto,html
+./usr/share/man/html3/libperfuse.html		comp-perfuse-htmlman	html
 ./usr/share/man/html3/libradius.html		comp-c-htmlman		html
 ./usr/share/man/html3/libsaslc.html		comp-c-htmlman		crypto,html
 ./usr/share/man/html3/libusbhid.html		comp-c-htmlman		html
@@ -13775,7 +14072,6 @@
 ./usr/share/man/html3/pcidev_conf_write.html	comp-c-htmlman		html
 ./usr/share/man/html3/pclose.html		comp-c-htmlman		html
 ./usr/share/man/html3/pechochar.html		comp-c-htmlman		html
-./usr/share/man/html3/libperfuse.html		comp-perfuse-htmlman	html
 ./usr/share/man/html3/perror.html		comp-c-htmlman		html
 ./usr/share/man/html3/pidfile.html		comp-c-htmlman		html
 ./usr/share/man/html3/pidlock.html		comp-c-htmlman		html
@@ -14129,13 +14425,13 @@
 ./usr/share/man/html3/randomid_new.html		comp-c-htmlman		html
 ./usr/share/man/html3/raw.html			comp-c-htmlman		html
 ./usr/share/man/html3/rb.html			comp-obsolete		obsolete
-./usr/share/man/html3/rbtree.html		comp-c-htmlman		html
 ./usr/share/man/html3/rb_tree_find_node.html	comp-c-htmlman		html
 ./usr/share/man/html3/rb_tree_find_node_geq.html	comp-c-htmlman		html
 ./usr/share/man/html3/rb_tree_find_node_leq.html	comp-c-htmlman		html
 ./usr/share/man/html3/rb_tree_init.html		comp-c-htmlman		html
 ./usr/share/man/html3/rb_tree_insert_node.html	comp-c-htmlman		html
 ./usr/share/man/html3/rb_tree_iterate.html	comp-c-htmlman		html
+./usr/share/man/html3/rbtree.html		comp-c-htmlman		html
 ./usr/share/man/html3/rcmd.html			comp-c-htmlman		html
 ./usr/share/man/html3/rcmd_af.html		comp-c-htmlman		html
 ./usr/share/man/html3/re_comp.html		comp-c-htmlman		html
@@ -14229,10 +14525,10 @@
 ./usr/share/man/html3/rresvport.html		comp-c-htmlman		html
 ./usr/share/man/html3/rresvport_af.html		comp-c-htmlman		html
 ./usr/share/man/html3/rump.html			comp-c-htmlman		html
+./usr/share/man/html3/rump_etfs.html			comp-c-htmlman		html
+./usr/share/man/html3/rump_lwproc.html			comp-c-htmlman		html
 ./usr/share/man/html3/rumpclient.html			comp-c-htmlman		html
 ./usr/share/man/html3/rumphijack.html			comp-c-htmlman		html
-./usr/share/man/html3/rump_etfs.html			comp-c-htmlman		html
-./usr/share/man/html3/rump_lwproc.html			comp-c-htmlman		html
 ./usr/share/man/html3/rumpuser.html		comp-c-htmlman		html
 ./usr/share/man/html3/ruserok.html		comp-c-htmlman		html
 ./usr/share/man/html3/savetty.html		comp-c-htmlman		html
@@ -16293,10 +16589,10 @@
 ./usr/share/man/html9/x86/nmi_disestablish.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/nmi_establish.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/tsc.html		comp-sys-htmlman	html
-./usr/share/man/html9/x86/tsc_tc_init.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/tsc_sync_ap.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/tsc_sync_bp.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/tsc_sync_drift.html	comp-sys-htmlman	html
+./usr/share/man/html9/x86/tsc_tc_init.html	comp-sys-htmlman	html
 ./usr/share/man/html9/x86/x86_msr_xcall.html	comp-sys-htmlman	html
 ./usr/share/man/html9/xc_broadcast.html		comp-sys-htmlman	html
 ./usr/share/man/html9/xc_unicast.html		comp-sys-htmlman	html
@@ -16607,9 +16903,9 @@
 ./usr/share/man/man2/siginfo.2			comp-c-man		.man
 ./usr/share/man/man2/sigpending.2		comp-c-man		.man
 ./usr/share/man/man2/sigprocmask.2		comp-c-man		.man
-./usr/share/man/man2/sigreturn.2		comp-obsolete		obsolete
 ./usr/share/man/man2/sigqueue.2			comp-c-man		.man
 ./usr/share/man/man2/sigqueueinfo.2		comp-c-man		.man
+./usr/share/man/man2/sigreturn.2		comp-obsolete		obsolete
 ./usr/share/man/man2/sigstack.2			comp-c-man		.man
 ./usr/share/man/man2/sigsuspend.2		comp-c-man		.man
 ./usr/share/man/man2/sigtimedwait.2		comp-c-man		.man
@@ -17147,8 +17443,8 @@
 ./usr/share/man/man3/__insn_barrier.3		comp-c-man		.man
 ./usr/share/man/man3/__noinline.3		comp-c-man		.man
 ./usr/share/man/man3/__packed.3			comp-c-man		.man
+./usr/share/man/man3/__predict_false.3		comp-c-man		.man
 ./usr/share/man/man3/__predict_true.3		comp-c-man		.man
-./usr/share/man/man3/__predict_false.3		comp-c-man		.man
 ./usr/share/man/man3/__pure.3			comp-c-man		.man
 ./usr/share/man/man3/__read_mostly.3		comp-c-man		.man
 ./usr/share/man/man3/__section.3		comp-c-man		.man
@@ -19433,6 +19729,7 @@
 ./usr/share/man/man3/libmagic.3			comp-c-man		.man
 ./usr/share/man/man3/libmj.3			comp-c-man		crypto,.man
 ./usr/share/man/man3/libnetpgp.3		comp-c-man		crypto,.man
+./usr/share/man/man3/libperfuse.3		comp-perfuse-man	.man
 ./usr/share/man/man3/libradius.3		comp-c-man		.man
 ./usr/share/man/man3/libsaslc.3			comp-c-man		crypto,.man
 ./usr/share/man/man3/libusb.3			comp-obsolete		obsolete
@@ -19823,7 +20120,6 @@
 ./usr/share/man/man3/pcidev_conf_write.3	comp-c-man		.man
 ./usr/share/man/man3/pclose.3			comp-c-man		.man
 ./usr/share/man/man3/pechochar.3		comp-c-man		.man
-./usr/share/man/man3/libperfuse.3		comp-perfuse-man	.man
 ./usr/share/man/man3/perror.3			comp-c-man		.man
 ./usr/share/man/man3/pidfile.3			comp-c-man		.man
 ./usr/share/man/man3/pidlock.3			comp-c-man		.man
@@ -20180,13 +20476,13 @@
 ./usr/share/man/man3/randomid_new.3		comp-c-man		.man
 ./usr/share/man/man3/raw.3			comp-c-man		.man
 ./usr/share/man/man3/rb.3			comp-obsolete		obsolete
-./usr/share/man/man3/rbtree.3			comp-c-man		.man
 ./usr/share/man/man3/rb_tree_find_node.3	comp-c-man		.man
 ./usr/share/man/man3/rb_tree_find_node_geq.3	comp-c-man		.man
 ./usr/share/man/man3/rb_tree_find_node_leq.3	comp-c-man		.man
 ./usr/share/man/man3/rb_tree_init.3		comp-c-man		.man
 ./usr/share/man/man3/rb_tree_insert_node.3	comp-c-man		.man
 ./usr/share/man/man3/rb_tree_iterate.3		comp-c-man		.man
+./usr/share/man/man3/rbtree.3			comp-c-man		.man
 ./usr/share/man/man3/rc4.3			comp-obsolete		obsolete
 ./usr/share/man/man3/rcmd.3			comp-c-man		.man
 ./usr/share/man/man3/rcmd_af.3			comp-c-man		.man
@@ -20284,10 +20580,10 @@
 ./usr/share/man/man3/rresvport_af.3		comp-c-man		.man
 ./usr/share/man/man3/rsa.3			comp-obsolete		obsolete
 ./usr/share/man/man3/rump.3			comp-c-man		.man
+./usr/share/man/man3/rump_etfs.3			comp-c-man		.man
+./usr/share/man/man3/rump_lwproc.3			comp-c-man		.man
 ./usr/share/man/man3/rumpclient.3			comp-c-man		.man
 ./usr/share/man/man3/rumphijack.3			comp-c-man		.man
-./usr/share/man/man3/rump_etfs.3			comp-c-man		.man
-./usr/share/man/man3/rump_lwproc.3			comp-c-man		.man
 ./usr/share/man/man3/rumpuser.3			comp-c-man		.man
 ./usr/share/man/man3/ruserok.3			comp-c-man		.man
 ./usr/share/man/man3/savetty.3			comp-c-man		.man
@@ -22471,10 +22767,10 @@
 ./usr/share/man/man9/x86/nmi_disestablish.9	comp-sys-man		.man
 ./usr/share/man/man9/x86/nmi_establish.9	comp-sys-man		.man
 ./usr/share/man/man9/x86/tsc.9			comp-sys-man		.man
-./usr/share/man/man9/x86/tsc_tc_init.9		comp-sys-man		.man
 ./usr/share/man/man9/x86/tsc_sync_ap.9		comp-sys-man		.man
 ./usr/share/man/man9/x86/tsc_sync_bp.9		comp-sys-man		.man
 ./usr/share/man/man9/x86/tsc_sync_drift.9	comp-sys-man		.man
+./usr/share/man/man9/x86/tsc_tc_init.9		comp-sys-man		.man
 ./usr/share/man/man9/x86/x86_msr_xcall.9	comp-sys-man		.man
 ./usr/share/man/man9/xc_broadcast.9		comp-sys-man		.man
 ./usr/share/man/man9/xc_unicast.9		comp-sys-man		.man
@@ -22488,4 +22784,4 @@
 ./usr/share/misc/msg_sys.def			comp-c-share		share
 ./usr/share/misc/operator			comp-c-share		share
 ./usr/share/misc/style				comp-c-share		share
-./var/db/libc.tags                             comp-c-root
+./var/db/libc.tags				comp-c-root
--- a/distrib/sets/lists/comp/shl.mi	Fri Jul 01 02:01:21 2011 +0000
+++ b/distrib/sets/lists/comp/shl.mi	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.177 2011/06/26 16:42:40 christos Exp $
+# $NetBSD: shl.mi,v 1.178 2011/07/01 02:10:11 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -41,6 +41,10 @@
 ./usr/lib/libgcc_eh_p.a				comp-c-proflib		profile
 ./usr/lib/libgcc_eh_pic.a			comp-c-piclib
 ./usr/lib/libgcc_pic.a				comp-c-lib
+./usr/lib/libgmp.so				comp-c-shlib	gcc=45
+./usr/lib/libgmp.so.10				comp-c-shlib	gcc=45
+./usr/lib/libgmp.so.10.2			comp-c-shlib	gcc=45
+./usr/lib/libgmp_pic.a				comp-c-piclib	gcc=45
 ./usr/lib/libgnumalloc_pic.a			comp-c-piclib
 ./usr/lib/libgssapi_pic.a			comp-c-piclib		kerberos
 ./usr/lib/libhdb_pic.a				comp-c-piclib		kerberos
@@ -53,7 +57,7 @@
 ./usr/lib/libisccc_pic.a			comp-bind-piclib
 ./usr/lib/libisccfg_pic.a			comp-bind-piclib
 ./usr/lib/libiscsi_pic.a			comp-c-piclib		iscsi
-./usr/lib/libisns_pic.a		comp-isns-piclib	
+./usr/lib/libisns_pic.a				comp-isns-piclib	
 ./usr/lib/libkadm5clnt_pic.a			comp-c-piclib		kerberos
 ./usr/lib/libkadm5srv_pic.a			comp-c-piclib		kerberos
 ./usr/lib/libkadm_pic.a				comp-obsolete		obsolete
@@ -69,12 +73,20 @@
 ./usr/lib/libldap_r_pic.a			comp-ldap-piclib	ldap
 ./usr/lib/liblua_pic.a				comp-c-piclib
 ./usr/lib/liblwres_pic.a			comp-bind-piclib
+./usr/lib/liblzf_pic.a				comp-c-piclib
 ./usr/lib/liblzma_pic.a				comp-c-piclib
-./usr/lib/liblzf_pic.a				comp-c-piclib
 ./usr/lib/libm_pic.a				comp-c-piclib
 ./usr/lib/libmagic_pic.a			comp-c-piclib
 ./usr/lib/libmenu_pic.a				comp-c-piclib
 ./usr/lib/libmj_pic.a				comp-c-piclib
+./usr/lib/libmpc.so				comp-c-shlib	gcc=45
+./usr/lib/libmpc.so.2				comp-c-shlib	gcc=45
+./usr/lib/libmpc.so.2.0				comp-c-shlib	gcc=45
+./usr/lib/libmpc_pic.a				comp-c-piclib	gcc=45
+./usr/lib/libmpfr.so				comp-c-shlib	gcc=45
+./usr/lib/libmpfr.so.4				comp-c-shlib	gcc=45
+./usr/lib/libmpfr.so.4.1			comp-c-shlib	gcc=45
+./usr/lib/libmpfr_pic.a				comp-c-piclib	gcc=45
 ./usr/lib/libnetpgp_pic.a			comp-c-piclib		crypto
 ./usr/lib/libnpf_pic.a				comp-npf-piclib		npf
 ./usr/lib/libnvpair_pic.a			comp-zfs-piclib		zfs
@@ -102,24 +114,25 @@
 ./usr/lib/librpcsvc_pic.a			comp-c-piclib
 ./usr/lib/librt_pic.a				comp-c-piclib
 ./usr/lib/librump_pic.a				comp-c-piclib
+./usr/lib/librumpclient_pic.a			comp-c-piclib
 ./usr/lib/librumpcrypto_pic.a			comp-obsolete		obsolete
 ./usr/lib/librumpdev_audio_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_bpf_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_cgd_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_disk_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_dm_pic.a			comp-c-piclib
-./usr/lib/librumpdev_drvctl_pic.a			comp-c-piclib
+./usr/lib/librumpdev_drvctl_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_fss_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_md_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_netsmb_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_pad_pic.a			comp-c-piclib
+./usr/lib/librumpdev_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_pud_pic.a			comp-c-piclib
-./usr/lib/librumpdev_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_putter_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_raidframe_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_rnd_pic.a			comp-c-piclib
-./usr/lib/librumpdev_scsipi_pic.a			comp-c-piclib
-./usr/lib/librumpdev_scsitest_pic.a			comp-c-piclib
+./usr/lib/librumpdev_scsipi_pic.a		comp-c-piclib
+./usr/lib/librumpdev_scsitest_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_sysmon_pic.a		comp-c-piclib
 ./usr/lib/librumpdev_ubt_pic.a			comp-c-piclib
 ./usr/lib/librumpdev_ucom_pic.a			comp-c-piclib
@@ -139,7 +152,7 @@
 ./usr/lib/librumpfs_mfs_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_msdos_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_nfs_pic.a			comp-c-piclib
-./usr/lib/librumpfs_nfsserver_pic.a			comp-c-piclib
+./usr/lib/librumpfs_nfsserver_pic.a		comp-c-piclib
 ./usr/lib/librumpfs_nilfs_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_ntfs_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_null_pic.a			comp-c-piclib
@@ -155,12 +168,13 @@
 ./usr/lib/librumpfs_umapfs_pic.a		comp-obsolete		obsolete
 ./usr/lib/librumpfs_union_pic.a			comp-c-piclib
 ./usr/lib/librumpfs_zfs_pic.a			comp-c-piclib		zfs
-./usr/lib/librumpkern_crypto_pic.a			comp-c-piclib
+./usr/lib/librumphijack_pic.a			comp-c-piclib
+./usr/lib/librumpkern_crypto_pic.a		comp-c-piclib
 ./usr/lib/librumpkern_ksem_pic.a		comp-c-piclib
 ./usr/lib/librumpkern_solaris_pic.a		comp-c-piclib		zfs
 ./usr/lib/librumpkern_tty_pic.a			comp-c-piclib
 ./usr/lib/librumpkern_z_pic.a			comp-c-piclib
-./usr/lib/librumpnet_agr_pic.a		comp-c-piclib
+./usr/lib/librumpnet_agr_pic.a			comp-c-piclib
 ./usr/lib/librumpnet_bridge_pic.a		comp-c-piclib
 ./usr/lib/librumpnet_local_pic.a		comp-c-piclib
 ./usr/lib/librumpnet_net80211_pic.a		comp-c-piclib
@@ -172,8 +186,6 @@
 ./usr/lib/librumpnet_sockin_pic.a		comp-c-piclib
 ./usr/lib/librumpnet_virtif_pic.a		comp-c-piclib
 ./usr/lib/librumpuser_pic.a			comp-c-piclib
-./usr/lib/librumphijack_pic.a			comp-c-piclib
-./usr/lib/librumpclient_pic.a			comp-c-piclib
 ./usr/lib/librumpvfs_fifofs_pic.a		comp-c-piclib
 ./usr/lib/librumpvfs_layerfs_pic.a		comp-c-piclib
 ./usr/lib/librumpvfs_pic.a			comp-c-piclib
@@ -250,6 +262,7 @@
 ./usr/libdata/debug/usr/lib/libform.so.6.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug		comp-sys-debug	gcc=3,debug
 ./usr/libdata/debug/usr/lib/libgcc_s.so.1.0.debug	comp-sys-debug	gcc,debug
+./usr/libdata/debug/usr/lib/libgmp.so.10.2		comp-c-shlib	gcc=45,debug
 ./usr/libdata/debug/usr/lib/libgnumalloc.so.1.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libgssapi.so.10.0.debug	comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libhdb.so.14.0.debug	comp-krb5-debug	kerberos,debug
@@ -274,17 +287,20 @@
 ./usr/libdata/debug/usr/lib/libldap_r.so.4.2.debug	comp-ldap-debug	ldap,debug
 ./usr/libdata/debug/usr/lib/liblua.so.1.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/liblwres.so.5.3.debug	comp-bind-debug	debug
+./usr/libdata/debug/usr/lib/liblzf.so.0.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/liblzma.so.1.0.debug	comp-sys-debug	debug
-./usr/libdata/debug/usr/lib/liblzf.so.0.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libm.so.0.9.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmagic.so.3.1.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmenu.so.6.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmj.so.1.0.debug		comp-crypto-debug	debug
+./usr/libdata/debug/usr/lib/libmpc.so.2.0		comp-c-shlib	gcc=45,debug
+./usr/libdata/debug/usr/lib/libmpfr.so.4.1		comp-c-shlib	gcc=45,debug
 ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/lib/libnpf.so.0.0.debug		comp-npf-debug	npf,debug
 ./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug
 ./usr/libdata/debug/usr/lib/libobjc.so.2.0.debug	comp-sys-debug	gcc=3,debug
 ./usr/libdata/debug/usr/lib/libobjc.so.3.0.debug	comp-sys-debug	gcc=4,debug
+./usr/libdata/debug/usr/lib/libobjc.so.3.0.debug	comp-sys-debug	gcc=45,debug
 ./usr/libdata/debug/usr/lib/libopcodes.so.4.0.debug	comp-c-debug	binutils,debug
 ./usr/libdata/debug/usr/lib/libossaudio.so.1.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libp2k.so.2.0.debug		comp-puffs-debug	debug
@@ -305,6 +321,7 @@
 ./usr/libdata/debug/usr/lib/librpcsvc.so.1.0.debug	comp-net-debug	debug
 ./usr/libdata/debug/usr/lib/librt.so.1.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/librump.so.0.0.debug	comp-rump-debug	debug
+./usr/libdata/debug/usr/lib/librumpclient.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpdev.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpdev_audio.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpdev_bpf.so.0.0.debug	comp-rump-debug	debug
@@ -354,6 +371,7 @@
 ./usr/libdata/debug/usr/lib/librumpfs_umap.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpfs_union.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpfs_zfs.so.0.0.debug		comp-rump-debug	debug,zfs
+./usr/libdata/debug/usr/lib/librumphijack.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpkern_crypto.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpkern_ksem.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpkern_solaris.so.0.0.debug	comp-rump-debug	debug,zfs
@@ -371,8 +389,6 @@
 ./usr/libdata/debug/usr/lib/librumpnet_sockin.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpnet_virtif.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpuser.so.0.0.debug	comp-rump-debug	debug
-./usr/libdata/debug/usr/lib/librumphijack.so.0.0.debug	comp-rump-debug	debug
-./usr/libdata/debug/usr/lib/librumpclient.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpvfs.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpvfs_fifofs.so.0.0.debug	comp-rump-debug	debug
 ./usr/libdata/debug/usr/lib/librumpvfs_layerfs.so.0.0.debug	comp-rump-debug	debug
@@ -383,6 +399,7 @@
 ./usr/libdata/debug/usr/lib/libssl.so.8.2.debug		comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/lib/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug
 ./usr/libdata/debug/usr/lib/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug
+./usr/libdata/debug/usr/lib/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug
 ./usr/libdata/debug/usr/lib/libterminfo.so.1.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug
--- a/etc/mtree/NetBSD.dist.base	Fri Jul 01 02:01:21 2011 +0000
+++ b/etc/mtree/NetBSD.dist.base	Fri Jul 01 02:10:07 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.87 2011/04/27 20:05:56 mbalmer Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.88 2011/07/01 02:10:07 mrg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -120,14 +120,16 @@
 ./usr/include/fs
 ./usr/include/fs/smbfs
 ./usr/include/g++
-# remove me when gcc3.3 upgrade is complete
-./usr/include/g++/std
 ./usr/include/g++/backward
+./usr/include/g++/bits
+./usr/include/g++/debug
+./usr/include/g++/decimal
 ./usr/include/g++/ext
-./usr/include/g++/bits
+./usr/include/g++/parallel
 ./usr/include/g++/tr1
-./usr/include/g++/debug
+./usr/include/g++/tr1_impl
 ./usr/include/gcc-4.1
+./usr/include/gcc-4.5
 ./usr/include/gssapi
 ./usr/include/isofs
 ./usr/include/isofs/cd9660