diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-06-08 20:24:20 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-06-08 20:24:20 +0000 |
| commit | 9bdd7554cc12a8fcf3e8d5fb30fd9cbc01fb60eb (patch) | |
| tree | 6df8280a398e01428fd3659275f59c01cb4d7add | |
| parent | 2021-06-08 20:05:20 UTC (diff) | |
| parent | riscv: Add 20.0 profiles with single-level libdir, untested so far (diff) | |
| download | gentoo-9bdd7554cc12a8fcf3e8d5fb30fd9cbc01fb60eb.tar.gz gentoo-9bdd7554cc12a8fcf3e8d5fb30fd9cbc01fb60eb.tar.bz2 gentoo-9bdd7554cc12a8fcf3e8d5fb30fd9cbc01fb60eb.zip | |
Merge updates from master
19 files changed, 42 insertions, 6 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 095e3a4f4508..93c062cb36ac 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -399,22 +399,22 @@ multilib_env() { export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64imafdc} export CHOST_lp64d=${CTARGET} export CTARGET_lp64d=${CTARGET} - export LIBDIR_lp64d="lib64/lp64d" + export LIBDIR_lp64d=${LIBDIR_lp64d-lib64/lp64d} export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64 -march=rv64imac} export CHOST_lp64=${CTARGET} export CTARGET_lp64=${CTARGET} - export LIBDIR_lp64="lib64/lp64" + export LIBDIR_lp64=${LIBDIR_lp64-lib64/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 LIBDIR_ilp32d=${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" + export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32} : ${DEFAULT_ABI=lp64d} @@ -423,12 +423,12 @@ multilib_env() { export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d} export CHOST_ilp32d=${CTARGET} export CTARGET_ilp32d=${CTARGET} - export LIBDIR_ilp32d="lib32/ilp32d" + export LIBDIR_ilp32d=${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" + export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} : ${MULTILIB_ABIS=ilp32d ilp32} : ${DEFAULT_ABI=ilp32d} diff --git a/profiles/arch/riscv/1level/eapi b/profiles/arch/riscv/1level/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/arch/riscv/1level/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/1level/make.defaults b/profiles/arch/riscv/1level/make.defaults new file mode 100644 index 000000000000..2a8d8bdc9bb3 --- /dev/null +++ b/profiles/arch/riscv/1level/make.defaults @@ -0,0 +1,7 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +LIBDIR_lp64d="lib64" +LIBDIR_lp64="lib64" +LIBDIR_ilp32d="lib" +LIBDIR_ilp32="lib" diff --git a/profiles/default/linux/riscv/20.0/rv32imac/eapi b/profiles/default/linux/riscv/20.0/rv32imac/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv32imac/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv32imac/ilp32/eapi b/profiles/default/linux/riscv/20.0/rv32imac/ilp32/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv32imac/ilp32/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv32imac/ilp32/parent b/profiles/default/linux/riscv/20.0/rv32imac/ilp32/parent new file mode 100644 index 000000000000..a29c20c15237 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv32imac/ilp32/parent @@ -0,0 +1,2 @@ +.. +../../../../../../arch/riscv/rv32imac/ilp32 diff --git a/profiles/default/linux/riscv/20.0/rv32imac/ilp32d/eapi b/profiles/default/linux/riscv/20.0/rv32imac/ilp32d/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv32imac/ilp32d/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv32imac/ilp32d/parent b/profiles/default/linux/riscv/20.0/rv32imac/ilp32d/parent new file mode 100644 index 000000000000..f30144c36328 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv32imac/ilp32d/parent @@ -0,0 +1,2 @@ +.. +../../../../../../arch/riscv/rv32imac/ilp32d diff --git a/profiles/default/linux/riscv/20.0/rv32imac/parent b/profiles/default/linux/riscv/20.0/rv32imac/parent new file mode 100644 index 000000000000..4e6e3225bf31 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv32imac/parent @@ -0,0 +1,4 @@ +../.. +../../../../../arch/riscv/rv32imac +../../../../../releases/17.0 +../../../../../arch/riscv/1level diff --git a/profiles/default/linux/riscv/20.0/rv64gc/eapi b/profiles/default/linux/riscv/20.0/rv64gc/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/parent new file mode 100644 index 000000000000..0273fe595371 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/parent @@ -0,0 +1,2 @@ +.. +../../../../../../arch/riscv/rv64gc/lp64 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/parent new file mode 100644 index 000000000000..44f88d3e2df0 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../targets/systemd diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/parent new file mode 100644 index 000000000000..f497f659b838 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/parent @@ -0,0 +1,2 @@ +.. +../../../../../../arch/riscv/rv64gc/lp64d diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/parent new file mode 100644 index 000000000000..44f88d3e2df0 --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../targets/systemd diff --git a/profiles/default/linux/riscv/20.0/rv64gc/parent b/profiles/default/linux/riscv/20.0/rv64gc/parent new file mode 100644 index 000000000000..0f380a1962bb --- /dev/null +++ b/profiles/default/linux/riscv/20.0/rv64gc/parent @@ -0,0 +1,4 @@ +../.. +../../../../../arch/riscv/rv64gc +../../../../../releases/17.0 +../../../../../arch/riscv/1level |