diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 21ca275c3c774..585364de62730 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -47,10 +47,6 @@ _MULTILIB_FLAGS=(
 	abi_mips_o32:o32
 #	abi_ppc_32:ppc,ppc_aix,ppc_macos
 #	abi_ppc_64:ppc64
-	abi_riscv_lp64d:lp64d
-	abi_riscv_lp64:lp64
-	abi_riscv_ilp32d:ilp32d
-	abi_riscv_ilp32:ilp32
 	abi_s390_32:s390
 	abi_s390_64:s390x
 )
@@ -493,20 +489,6 @@ multilib_prepare_wrappers() {
 #	elif(_MIPS_SIM == _ABIO32) /* o32 */
 #		error "abi_mips_o32 not supported by the package."
 #	endif
-#elif defined(__riscv)
-#	if (__riscv_xlen == 64) && defined(__riscv_float_abi_double)
-#		error "abi_riscv_lp64d not supported by the package."
-#	elif (__riscv_xlen == 64) && defined(__riscv_float_abi_single)
-#		error "abi_riscv_lp64f not supported by the package."
-#	elif (__riscv_xlen == 64)
-#		error "abi_riscv_lp64 not supported by the package."
-#	elif (__riscv_xlen == 32) && defined(__riscv_float_abi_double)
-#		error "abi_riscv_ilp32d not supported by the package."
-#	elif (__riscv_xlen == 32) && defined(__riscv_float_abi_single)
-#		error "abi_riscv_ilp32f not supported by the package."
-#	else
-#		error "abi_riscv_ilp32 not supported by the package."
-#	endif
 #elif defined(__sparc__)
 #	if defined(__arch64__)
 #		error "abi_sparc_64 not supported by the package."