1 |
commit: 3aa52014348806588d416e0ee73c51014925876e |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 5 20:47:43 2020 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 5 20:47:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=3aa52014 |
7 |
|
8 |
Add support for rv32 abis to multilib-build.eclass |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
eclass/multilib-build.eclass | 14 +++++++++++--- |
13 |
1 file changed, 11 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
16 |
index 620bdce..dc4f8a2 100644 |
17 |
--- a/eclass/multilib-build.eclass |
18 |
+++ b/eclass/multilib-build.eclass |
19 |
@@ -49,6 +49,8 @@ _MULTILIB_FLAGS=( |
20 |
# abi_ppc_64:ppc64 |
21 |
abi_riscv_lp64d:lp64d |
22 |
abi_riscv_lp64:lp64 |
23 |
+ abi_riscv_ilp32d:ilp32d |
24 |
+ abi_riscv_ilp32:ilp32 |
25 |
abi_s390_32:s390 |
26 |
abi_s390_64:s390x |
27 |
) |
28 |
@@ -492,12 +494,18 @@ multilib_prepare_wrappers() { |
29 |
# error "abi_mips_o32 not supported by the package." |
30 |
# endif |
31 |
#elif defined(__riscv) |
32 |
-# if defined(__riscv_float_abi_double) |
33 |
+# if (__WORDSIZE == 64) && defined(__riscv_float_abi_double) |
34 |
# error "abi_riscv_lp64d not supported by the package." |
35 |
-# elif defined(__riscv_float_abi_single) |
36 |
+# elif (__WORDSIZE == 64) && defined(__riscv_float_abi_single) |
37 |
# error "abi_riscv_lp64f not supported by the package." |
38 |
-# else |
39 |
+# elif (__WORDSIZE == 64) |
40 |
# error "abi_riscv_lp64 not supported by the package." |
41 |
+# elif (__WORDSIZE == 32) && defined(__riscv_float_abi_double) |
42 |
+# error "abi_riscv_ilp32d not supported by the package." |
43 |
+# elif (__WORDSIZE == 32) && defined(__riscv_float_abi_single) |
44 |
+# error "abi_riscv_ilp32f not supported by the package." |
45 |
+# else |
46 |
+# error "abi_riscv_ilp32 not supported by the package." |
47 |
# endif |
48 |
#elif defined(__sparc__) |
49 |
# if defined(__arch64__) |