Update Metadata Cache

Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8776981893169997409
Change-Id: I06133307e5460433abec100a3c56ff7f859172e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/toolchains/+/4655797
Bot-Commit: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com>
diff --git a/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0 b/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0
index 45fd60f..afa18b4 100644
--- a/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0
+++ b/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-aarch64-cros-linux-gnu-bootstrap/binutils
+BDEPEND=dev-lang/go cross-aarch64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-aarch64-cros-linux-gnu/gcc
 RESTRICT=strip
-SLOT=aarch64-cros-linux-gnu-bootstrap
+SLOT=aarch64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33 b/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
index 45fd60f..afa18b4 100644
--- a/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-aarch64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-aarch64-cros-linux-gnu-bootstrap/binutils
+BDEPEND=dev-lang/go cross-aarch64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-aarch64-cros-linux-gnu/gcc
 RESTRICT=strip
-SLOT=aarch64-cros-linux-gnu-bootstrap
+SLOT=aarch64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0 b/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0
index f306b22..92cbb42 100644
--- a/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0
+++ b/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-aarch64-cros-linux-gnu/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-aarch64-cros-linux-gnu-bootstrap/gcc cross-aarch64-cros-linux-gnu/gcc ) ) cross-aarch64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-aarch64-cros-linux-gnu/glibc ) cxx? ( cross-aarch64-cros-linux-gnu/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-aarch64-cros-linux-gnu-bootstrap/gcc
 RESTRICT=strip
 SLOT=aarch64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0-r33 b/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0-r33
index f306b22..92cbb42 100644
--- a/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-aarch64-cros-linux-gnu/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-aarch64-cros-linux-gnu/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-aarch64-cros-linux-gnu-bootstrap/gcc cross-aarch64-cros-linux-gnu/gcc ) ) cross-aarch64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-aarch64-cros-linux-gnu/glibc ) cxx? ( cross-aarch64-cros-linux-gnu/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-aarch64-cros-linux-gnu-bootstrap/gcc
 RESTRICT=strip
 SLOT=aarch64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-aarch64-cros-linux-gnu/glibc-2.35-r20 b/metadata/md5-cache/cross-aarch64-cros-linux-gnu/glibc-2.35-r21
similarity index 93%
rename from metadata/md5-cache/cross-aarch64-cros-linux-gnu/glibc-2.35-r20
rename to metadata/md5-cache/cross-aarch64-cros-linux-gnu/glibc-2.35-r21
index 8a19287..7f8184b 100644
--- a/metadata/md5-cache/cross-aarch64-cros-linux-gnu/glibc-2.35-r20
+++ b/metadata/md5-cache/cross-aarch64-cros-linux-gnu/glibc-2.35-r21
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-aarch64-cros-linux-gnu/binutils-2.27 >=cross-aarch64-cros-linux-gnu/gcc-6.2 ) ) sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-aarch64-cros-linux-gnu/binutils-2.27 || ( cross-aarch64-cros-linux-gnu-bootstrap/gcc >=cross-aarch64-cros-linux-gnu/gcc-6.2 ) ) ) sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) cross-aarch64-cros-linux-gnu/linux-headers
 DESCRIPTION=GNU libc C library
@@ -12,4 +12,4 @@
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	gnuconfig	24782b842d9d9de6c82fa360b97d8914	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	5bd4686cbe063e46fff90664cfc1a5a1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=adaa9bdc2cd90382ac256a8fe4e91492
+_md5_=681012e0df6b6e29a2a7185cca86a62c
diff --git a/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0 b/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0
index cdf6516..b045687 100644
--- a/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0
+++ b/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-arm-none-eabi/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-arm-none-eabi-bootstrap/gcc cross-arm-none-eabi/gcc ) ) cross-arm-none-eabi/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-arm-none-eabi/glibc )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-arm-none-eabi-bootstrap/gcc
 RESTRICT=strip
 SLOT=arm-none-eabi
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0-r33 b/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0-r33
index cdf6516..b045687 100644
--- a/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-arm-none-eabi/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-arm-none-eabi/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-arm-none-eabi-bootstrap/gcc cross-arm-none-eabi/gcc ) ) cross-arm-none-eabi/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-arm-none-eabi/glibc )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-arm-none-eabi-bootstrap/gcc
 RESTRICT=strip
 SLOT=arm-none-eabi
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0 b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0
index 0704453..50b15f5 100644
--- a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0
+++ b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-armv7a-cros-linux-gnueabihf-bootstrap/binutils
+BDEPEND=dev-lang/go cross-armv7a-cros-linux-gnueabihf/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-armv7a-cros-linux-gnueabihf/gcc
 RESTRICT=strip
-SLOT=armv7a-cros-linux-gnueabihf-bootstrap
+SLOT=armv7a-cros-linux-gnueabihf
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0-r33 b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0-r33
index 0704453..50b15f5 100644
--- a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc-10.2.0-r33
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-armv7a-cros-linux-gnueabihf-bootstrap/binutils
+BDEPEND=dev-lang/go cross-armv7a-cros-linux-gnueabihf/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-armv7a-cros-linux-gnueabihf/gcc
 RESTRICT=strip
-SLOT=armv7a-cros-linux-gnueabihf-bootstrap
+SLOT=armv7a-cros-linux-gnueabihf
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0 b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0
index 16a8f1a..08a409b 100644
--- a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0
+++ b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-armv7a-cros-linux-gnueabihf/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc cross-armv7a-cros-linux-gnueabihf/gcc ) ) cross-armv7a-cros-linux-gnueabihf/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-armv7a-cros-linux-gnueabihf/glibc ) cxx? ( cross-armv7a-cros-linux-gnueabihf/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc
 RESTRICT=strip
 SLOT=armv7a-cros-linux-gnueabihf
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0-r33 b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0-r33
index 16a8f1a..08a409b 100644
--- a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-armv7a-cros-linux-gnueabihf/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc cross-armv7a-cros-linux-gnueabihf/gcc ) ) cross-armv7a-cros-linux-gnueabihf/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-armv7a-cros-linux-gnueabihf/glibc ) cxx? ( cross-armv7a-cros-linux-gnueabihf/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc
 RESTRICT=strip
 SLOT=armv7a-cros-linux-gnueabihf
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/glibc-2.35-r20 b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/glibc-2.35-r21
similarity index 92%
rename from metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/glibc-2.35-r20
rename to metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/glibc-2.35-r21
index f856685..514452d 100644
--- a/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/glibc-2.35-r20
+++ b/metadata/md5-cache/cross-armv7a-cros-linux-gnueabihf/glibc-2.35-r21
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-armv7a-cros-linux-gnueabihf/binutils-2.27 >=cross-armv7a-cros-linux-gnueabihf/gcc-6.2 ) ) sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-armv7a-cros-linux-gnueabihf/binutils-2.27 || ( cross-armv7a-cros-linux-gnueabihf-bootstrap/gcc >=cross-armv7a-cros-linux-gnueabihf/gcc-6.2 ) ) ) sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) cross-armv7a-cros-linux-gnueabihf/linux-headers
 DESCRIPTION=GNU libc C library
@@ -12,4 +12,4 @@
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	gnuconfig	24782b842d9d9de6c82fa360b97d8914	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	5bd4686cbe063e46fff90664cfc1a5a1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=adaa9bdc2cd90382ac256a8fe4e91492
+_md5_=681012e0df6b6e29a2a7185cca86a62c
diff --git a/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0 b/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0
index a6265c1..23d3de6 100644
--- a/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0
+++ b/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-armv7m-cros-eabi/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-armv7m-cros-eabi-bootstrap/gcc cross-armv7m-cros-eabi/gcc ) ) cross-armv7m-cros-eabi/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-armv7m-cros-eabi/glibc )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-armv7m-cros-eabi-bootstrap/gcc
 RESTRICT=strip
 SLOT=armv7m-cros-eabi
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0-r33 b/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0-r33
index a6265c1..23d3de6 100644
--- a/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-armv7m-cros-eabi/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-armv7m-cros-eabi/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-armv7m-cros-eabi-bootstrap/gcc cross-armv7m-cros-eabi/gcc ) ) cross-armv7m-cros-eabi/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-armv7m-cros-eabi/glibc )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-armv7m-cros-eabi-bootstrap/gcc
 RESTRICT=strip
 SLOT=armv7m-cros-eabi
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0 b/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0
index f266900..5236570 100644
--- a/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0
+++ b/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-i686-cros-linux-gnu-bootstrap/binutils
+BDEPEND=dev-lang/go cross-i686-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-i686-cros-linux-gnu/gcc
 RESTRICT=strip
-SLOT=i686-cros-linux-gnu-bootstrap
+SLOT=i686-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0-r33 b/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
index f266900..5236570 100644
--- a/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-i686-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-i686-cros-linux-gnu-bootstrap/binutils
+BDEPEND=dev-lang/go cross-i686-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-i686-cros-linux-gnu/gcc
 RESTRICT=strip
-SLOT=i686-cros-linux-gnu-bootstrap
+SLOT=i686-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0 b/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0
index c70c26c..c3da593 100644
--- a/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0
+++ b/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-i686-cros-linux-gnu/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-i686-cros-linux-gnu-bootstrap/gcc cross-i686-cros-linux-gnu/gcc ) ) cross-i686-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-i686-cros-linux-gnu/glibc ) cxx? ( cross-i686-cros-linux-gnu/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-i686-cros-linux-gnu-bootstrap/gcc
 RESTRICT=strip
 SLOT=i686-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0-r33 b/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0-r33
index c70c26c..c3da593 100644
--- a/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-i686-cros-linux-gnu/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-i686-cros-linux-gnu/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-i686-cros-linux-gnu-bootstrap/gcc cross-i686-cros-linux-gnu/gcc ) ) cross-i686-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-i686-cros-linux-gnu/glibc ) cxx? ( cross-i686-cros-linux-gnu/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-i686-cros-linux-gnu-bootstrap/gcc
 RESTRICT=strip
 SLOT=i686-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-i686-cros-linux-gnu/glibc-2.35-r20 b/metadata/md5-cache/cross-i686-cros-linux-gnu/glibc-2.35-r21
similarity index 93%
rename from metadata/md5-cache/cross-i686-cros-linux-gnu/glibc-2.35-r20
rename to metadata/md5-cache/cross-i686-cros-linux-gnu/glibc-2.35-r21
index 103aaa4..113960d 100644
--- a/metadata/md5-cache/cross-i686-cros-linux-gnu/glibc-2.35-r20
+++ b/metadata/md5-cache/cross-i686-cros-linux-gnu/glibc-2.35-r21
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-i686-cros-linux-gnu/binutils-2.27 >=cross-i686-cros-linux-gnu/gcc-6.2 ) ) sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-i686-cros-linux-gnu/binutils-2.27 || ( cross-i686-cros-linux-gnu-bootstrap/gcc >=cross-i686-cros-linux-gnu/gcc-6.2 ) ) ) sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) cross-i686-cros-linux-gnu/linux-headers
 DESCRIPTION=GNU libc C library
@@ -12,4 +12,4 @@
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	gnuconfig	24782b842d9d9de6c82fa360b97d8914	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	5bd4686cbe063e46fff90664cfc1a5a1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=adaa9bdc2cd90382ac256a8fe4e91492
+_md5_=681012e0df6b6e29a2a7185cca86a62c
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0 b/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0
index 94211ac..fef07bc 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnu-bootstrap/binutils
+BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnu/gcc
 RESTRICT=strip
-SLOT=x86_64-cros-linux-gnu-bootstrap
+SLOT=x86_64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33 b/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
index 94211ac..fef07bc 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnu-bootstrap/gcc-10.2.0-r33
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnu-bootstrap/binutils
+BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnu/gcc
 RESTRICT=strip
-SLOT=x86_64-cros-linux-gnu-bootstrap
+SLOT=x86_64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0 b/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0
index af1c7ee..ee485d4 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnu/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-x86_64-cros-linux-gnu-bootstrap/gcc cross-x86_64-cros-linux-gnu/gcc ) ) cross-x86_64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-x86_64-cros-linux-gnu/glibc ) cxx? ( cross-x86_64-cros-linux-gnu/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnu-bootstrap/gcc
 RESTRICT=strip
 SLOT=x86_64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0-r33 b/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0-r33
index af1c7ee..ee485d4 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnu/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnu/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-x86_64-cros-linux-gnu-bootstrap/gcc cross-x86_64-cros-linux-gnu/gcc ) ) cross-x86_64-cros-linux-gnu/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-x86_64-cros-linux-gnu/glibc ) cxx? ( cross-x86_64-cros-linux-gnu/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnu-bootstrap/gcc
 RESTRICT=strip
 SLOT=x86_64-cros-linux-gnu
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnu/glibc-2.35-r20 b/metadata/md5-cache/cross-x86_64-cros-linux-gnu/glibc-2.35-r21
similarity index 93%
rename from metadata/md5-cache/cross-x86_64-cros-linux-gnu/glibc-2.35-r20
rename to metadata/md5-cache/cross-x86_64-cros-linux-gnu/glibc-2.35-r21
index 50376e8..6bdbfeb 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnu/glibc-2.35-r20
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnu/glibc-2.35-r21
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-x86_64-cros-linux-gnu/binutils-2.27 >=cross-x86_64-cros-linux-gnu/gcc-6.2 ) ) sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-x86_64-cros-linux-gnu/binutils-2.27 || ( cross-x86_64-cros-linux-gnu-bootstrap/gcc >=cross-x86_64-cros-linux-gnu/gcc-6.2 ) ) ) sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) cross-x86_64-cros-linux-gnu/linux-headers
 DESCRIPTION=GNU libc C library
@@ -12,4 +12,4 @@
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	gnuconfig	24782b842d9d9de6c82fa360b97d8914	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	5bd4686cbe063e46fff90664cfc1a5a1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=adaa9bdc2cd90382ac256a8fe4e91492
+_md5_=681012e0df6b6e29a2a7185cca86a62c
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0 b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0
index 4f160ce..61967f0 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnux32-bootstrap/binutils
+BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnux32/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnux32/gcc
 RESTRICT=strip
-SLOT=x86_64-cros-linux-gnux32-bootstrap
+SLOT=x86_64-cros-linux-gnux32
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0-r33 b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0-r33
index 4f160ce..61967f0 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32-bootstrap/gcc-10.2.0-r33
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnux32-bootstrap/binutils
+BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnux32/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
@@ -7,9 +7,9 @@
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnux32/gcc
 RESTRICT=strip
-SLOT=x86_64-cros-linux-gnux32-bootstrap
+SLOT=x86_64-cros-linux-gnux32
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0 b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0
index f97cc45..4c456ec 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnux32/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-x86_64-cros-linux-gnux32-bootstrap/gcc cross-x86_64-cros-linux-gnux32/gcc ) ) cross-x86_64-cros-linux-gnux32/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-x86_64-cros-linux-gnux32/glibc ) cxx? ( cross-x86_64-cros-linux-gnux32/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnux32-bootstrap/gcc
 RESTRICT=strip
 SLOT=x86_64-cros-linux-gnux32
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0-r33 b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0-r33
index f97cc45..4c456ec 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0-r33
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/gcc-10.2.0-r33
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/go cross-x86_64-cros-linux-gnux32/binutils
+BDEPEND=dev-lang/go cxx? ( || ( cross-x86_64-cros-linux-gnux32-bootstrap/gcc cross-x86_64-cros-linux-gnux32/gcc ) ) cross-x86_64-cros-linux-gnux32/binutils
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875
+DEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 cxx? ( cross-x86_64-cros-linux-gnux32/glibc ) cxx? ( cross-x86_64-cros-linux-gnux32/linux-headers )
 DESCRIPTION=The GNU Compiler Collection. Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking. This Compiler is based off of Crosstoolv14.
 EAPI=7
 IUSE=cet gcc_repo gcj git_gcc go graphite gtk hardened hardfp llvm_libgcc mounted_gcc multilib nls cxx openmp test tests +thumb upstream_gcc vanilla vtable_verify +wrapper_ccache
 KEYWORDS=*
 LICENSE=GPL-3 LGPL-3 libgcc FDL-1.2
 PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 )
+RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-devel/gcc-config-1.6 virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpc-0.8.1 >=dev-libs/mpfr-2.4.2 graphite? ( >=dev-libs/cloog-0.18.0 >=dev-libs/isl-0.11.1 ) !cross-x86_64-cros-linux-gnux32-bootstrap/gcc
 RESTRICT=strip
 SLOT=x86_64-cros-linux-gnux32
 SRC_URI=mirror://gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-10.2.0-patches-6.tar.bz2
 _eclasses_=binutils-funcs	8a78951d3d64239c136ad8ea85e8ab5c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=66db35264a5f817e4b8566afbeb143cc
+_md5_=03840f1fef8e29b0ec23d9d4217ad102
diff --git a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/glibc-2.35-r20 b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/glibc-2.35-r21
similarity index 92%
rename from metadata/md5-cache/cross-x86_64-cros-linux-gnux32/glibc-2.35-r20
rename to metadata/md5-cache/cross-x86_64-cros-linux-gnux32/glibc-2.35-r21
index 0cc4175..8ed4bd4 100644
--- a/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/glibc-2.35-r20
+++ b/metadata/md5-cache/cross-x86_64-cros-linux-gnux32/glibc-2.35-r21
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-x86_64-cros-linux-gnux32/binutils-2.27 >=cross-x86_64-cros-linux-gnux32/gcc-6.2 ) ) sys-devel/gnuconfig virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.7 dev-lang/python:3.8 dev-lang/python:3.9 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) !headers-only? ( !crosscompile_opts_headers-only? ( >=cross-x86_64-cros-linux-gnux32/binutils-2.27 || ( cross-x86_64-cros-linux-gnux32-bootstrap/gcc >=cross-x86_64-cros-linux-gnux32/gcc-6.2 ) ) ) sys-devel/gnuconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
 DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) cross-x86_64-cros-linux-gnux32/linux-headers
 DESCRIPTION=GNU libc C library
@@ -12,4 +12,4 @@
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	b3ead43a6957a00bec2e415bd5c52d27	gnuconfig	24782b842d9d9de6c82fa360b97d8914	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	c3cf317581e5bd068a4b851f03dd8cba	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	5bd4686cbe063e46fff90664cfc1a5a1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	528ab0a9e1ee02c57524ad3bede3c57e
-_md5_=adaa9bdc2cd90382ac256a8fe4e91492
+_md5_=681012e0df6b6e29a2a7185cca86a62c