commit: c974e8f4c7bae82f974232d4a577a7627f7d7a09
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 23:33:40 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 23:34:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c974e8f4
multilib-build.eclass: Fix riscv abi conditionals in pseudo-header
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
eclass/multilib-build.eclass | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index dc4f8a2bd15..21ca275c3c7 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -494,15 +494,15 @@ multilib_prepare_wrappers() {
# error "abi_mips_o32 not supported by the package."
# endif
#elif defined(__riscv)
-# if (__WORDSIZE == 64) && defined(__riscv_float_abi_double)
+# if (__riscv_xlen == 64) && defined(__riscv_float_abi_double)
# error "abi_riscv_lp64d not supported by the package."
-# elif (__WORDSIZE == 64) && defined(__riscv_float_abi_single)
+# elif (__riscv_xlen == 64) && defined(__riscv_float_abi_single)
# error "abi_riscv_lp64f not supported by the package."
-# elif (__WORDSIZE == 64)
+# elif (__riscv_xlen == 64)
# error "abi_riscv_lp64 not supported by the package."
-# elif (__WORDSIZE == 32) && defined(__riscv_float_abi_double)
+# elif (__riscv_xlen == 32) && defined(__riscv_float_abi_double)
# error "abi_riscv_ilp32d not supported by the package."
-# elif (__WORDSIZE == 32) && defined(__riscv_float_abi_single)
+# 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."
