Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/riscv:master commit in: eclass/
Date: Wed, 02 Sep 2020 19:39:40
Message-Id: 1599075446.43b14bae3ba30314759fce98e661b08f615e40a8.dilfridge@gentoo
1 commit: 43b14bae3ba30314759fce98e661b08f615e40a8
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 19:37:26 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 19:37:26 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=43b14bae
7
8 multilib.eclass: Add rv32 abi
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 eclass/multilib.eclass | 30 +++++++++++++++++++++++++++---
13 1 file changed, 27 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
16 index 342d21a..9c7042f 100644
17 --- a/eclass/multilib.eclass
18 +++ b/eclass/multilib.eclass
19 @@ -397,19 +397,43 @@ multilib_env() {
20 : ${DEFAULT_ABI=ppc64}
21 ;;
22 riscv64*)
23 - export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d}
24 + export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64imafdc}
25 export CHOST_lp64d=${CTARGET}
26 export CTARGET_lp64d=${CTARGET}
27 export LIBDIR_lp64d="lib64/lp64d"
28
29 - export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64}
30 + export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64 -march=rv64imac}
31 export CHOST_lp64=${CTARGET}
32 export CTARGET_lp64=${CTARGET}
33 export LIBDIR_lp64="lib64/lp64"
34
35 - : ${MULTILIB_ABIS=lp64d lp64}
36 + export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d -march=rv32imafdc}
37 + export CHOST_ilp32d=${CTARGET/riscv64/riscv32}
38 + export CTARGET_ilp32d=${CTARGET/riscv64/riscv32}
39 + export LIBDIR_ilp32d="lib32/ilp32d"
40 +
41 + export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac}
42 + export CHOST_ilp32=${CTARGET/riscv64/riscv32}
43 + export CTARGET_ilp32=${CTARGET/riscv64/riscv32}
44 + export LIBDIR_ilp32="lib32/ilp32"
45 +
46 + : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32}
47 : ${DEFAULT_ABI=lp64d}
48 ;;
49 + riscv32*)
50 + export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d}
51 + export CHOST_ilp32d=${CTARGET}
52 + export CTARGET_ilp32d=${CTARGET}
53 + export LIBDIR_ilp32d="lib32/ilp32d"
54 +
55 + export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac}
56 + export CHOST_ilp32=${CTARGET}
57 + export CTARGET_ilp32=${CTARGET}
58 + export LIBDIR_ilp32="lib32/ilp32"
59 +
60 + : ${MULTILIB_ABIS=ilp32d ilp32}
61 + : ${DEFAULT_ABI=ilp32d}
62 + ;;
63 s390x*)
64 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
65 export CHOST_s390=${CTARGET/s390x/s390}