diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
| commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
| tree | 44068672445b1418489aed82de58df3c470289e7 /eclass/multilib.eclass | |
| parent | 0f15659d48c193027158492acb726297501202c5 (diff) | |
gentoo resync : 04.01.2022
Diffstat (limited to 'eclass/multilib.eclass')
| -rw-r--r-- | eclass/multilib.eclass | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 483f8d10c721..fadd371f3ca7 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -368,6 +368,15 @@ multilib_env() { ;; esac ;; + loongarch64*) + export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d} + export CHOST_lp64d=${CTARGET} + export CTARGET_lp64d=${CTARGET} + export LIBDIR_lp64d=${LIBDIR_lp64d-lib64} + + : ${MULTILIB_ABIS=lp64d} + : ${DEFAULT_ABI=lp64d} + ;; mips64*|mipsisa64*) export CFLAGS_o32=${CFLAGS_o32--mabi=32} export CHOST_o32=${CTARGET/mips64/mips} @@ -403,7 +412,18 @@ multilib_env() { : ${DEFAULT_ABI=ppc64} ;; riscv64*) - export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64imafdc} + : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32} + : ${DEFAULT_ABI=lp64d} + + # the default abi is set to the 1-level libdir default + + local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}" + local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable} + export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib64} + + # all other abi are set to the 2-level libdir default + + export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64gc} export CHOST_lp64d=${CTARGET} export CTARGET_lp64d=${CTARGET} export LIBDIR_lp64d=${LIBDIR_lp64d-lib64/lp64d} @@ -422,12 +442,20 @@ multilib_env() { export CHOST_ilp32=${CTARGET/riscv64/riscv32} export CTARGET_ilp32=${CTARGET/riscv64/riscv32} export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} - - : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32} - : ${DEFAULT_ABI=lp64d} ;; riscv32*) - export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d} + : ${MULTILIB_ABIS=ilp32d ilp32} + : ${DEFAULT_ABI=ilp32d} + + # the default abi is set to the 1-level libdir default + + local __libdir_riscvdefaultabi_variable="LIBDIR_${DEFAULT_ABI}" + local __libdir_riscvdefaultabi=${!__libdir_riscvdefaultabi_variable} + export ${__libdir_riscvdefaultabi_variable}=${__libdir_riscvdefaultabi:-lib} + + # all other abi are set to the 2-level libdir default + + export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d -march=rv32imafdc} export CHOST_ilp32d=${CTARGET} export CTARGET_ilp32d=${CTARGET} export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d} @@ -436,9 +464,6 @@ multilib_env() { export CHOST_ilp32=${CTARGET} export CTARGET_ilp32=${CTARGET} export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} - - : ${MULTILIB_ABIS=ilp32d ilp32} - : ${DEFAULT_ABI=ilp32d} ;; s390x*) export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo |