[gentoo-commits] proj/riscv:master commit in: eclass/

[Andreas K. Hüttel]

commit:     43b14bae3ba30314759fce98e661b08f615e40a8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 19:37:26 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 19:37:26 2020 +0000
URL:        https://gitweb.gentoo.org/proj/riscv.git/commit/?id=43b14bae

multilib.eclass: Add rv32 abi

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 eclass/multilib.eclass | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 342d21a..9c7042f 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -397,19 +397,43 @@ multilib_env() {
                        : ${DEFAULT_ABI=ppc64}
                ;;
                riscv64*)
-                       export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d}
+                       export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d 
-march=rv64imafdc}
                        export CHOST_lp64d=${CTARGET}
                        export CTARGET_lp64d=${CTARGET}
                        export LIBDIR_lp64d="lib64/lp64d"
 
-                       export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64}
+                       export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64 
-march=rv64imac}
                        export CHOST_lp64=${CTARGET}
                        export CTARGET_lp64=${CTARGET}
                        export LIBDIR_lp64="lib64/lp64"
 
-                       : ${MULTILIB_ABIS=lp64d lp64}
+                       export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d 
-march=rv32imafdc}
+                       export CHOST_ilp32d=${CTARGET/riscv64/riscv32}
+                       export CTARGET_ilp32d=${CTARGET/riscv64/riscv32}
+                       export LIBDIR_ilp32d="lib32/ilp32d"
+
+                       export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 
-march=rv32imac}
+                       export CHOST_ilp32=${CTARGET/riscv64/riscv32}
+                       export CTARGET_ilp32=${CTARGET/riscv64/riscv32}
+                       export LIBDIR_ilp32="lib32/ilp32"
+
+                       : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32}
                        : ${DEFAULT_ABI=lp64d}
                ;;
+               riscv32*)
+                       export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d}
+                       export CHOST_ilp32d=${CTARGET}
+                       export CTARGET_ilp32d=${CTARGET}
+                       export LIBDIR_ilp32d="lib32/ilp32d"
+
+                       export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 
-march=rv32imac}
+                       export CHOST_ilp32=${CTARGET}
+                       export CTARGET_ilp32=${CTARGET}
+                       export LIBDIR_ilp32="lib32/ilp32"
+
+                       : ${MULTILIB_ABIS=ilp32d ilp32}
+                       : ${DEFAULT_ABI=ilp32d}
+               ;;
                s390x*)
                        export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not 
a typo
                        export CHOST_s390=${CTARGET/s390x/s390}