3 files changed, 12 insertions, 0 deletions
diff --git a/sys-devel/gcc/gcc-10.2.0-r1.ebuild b/sys-devel/gcc/gcc-10.2.0-r1.ebuild
index 79c068077f23..2d2ebe50bcea 100644
--- a/sys-devel/gcc/gcc-10.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-10.2.0-r1.ebuild
@@ -11,3 +11,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
index 5a5beeba49e7..c185e457003a 100644
--- a/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.2.1_pre9999.ebuild
@@ -26,5 +26,7 @@ src_prepare() {
 		rm -v "${WORKDIR}/patch/$p" || die
 	done
 
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+
 	toolchain_src_prepare
 }
diff --git a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
index d3af1f28e50b..db0a49eef12f 100644
--- a/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
@@ -15,3 +15,8 @@ EGIT_BRANCH=master
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	toolchain_src_prepare
+}