gentoo resync : 16.09.2020

14 files changed, 101 insertions, 0 deletions

diff --git a/profiles/arch/riscv/rv32imac/eapi b/profiles/arch/riscv/rv32imac/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/riscv/rv32imac/ilp32/eapi b/profiles/arch/riscv/rv32imac/ilp32/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
new file mode 100644
index 000000000000..959de434af0f
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V rv32imac/ilp32 no-multilib profile
+
+# We have only one ABI
+MULTILIB_ABIS="ilp32"
+DEFAULT_ABI="ilp32"
+ABI="ilp32"
+
+# We hide the useflags for the ABIs
+USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
new file mode 100644
index 000000000000..dc5b60c2dd26
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Undo multilib forcing.
+sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force
new file mode 100644
index 000000000000..e54ac40ffd20
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.force
@@ -0,0 +1,5 @@
+# Un-force the original multilib default-abi flag
+-abi_riscv_ilp32d
+
+# Force the abi of this profile here
+abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask
new file mode 100644
index 000000000000..c717be8a4aa4
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask
@@ -0,0 +1,10 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we do not want to use it.
+multilib
+
+# Mask the other multilib flags back for non-multilib profile.
+abi_riscv_lp64d
+abi_riscv_lp64
+abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/eapi b/profiles/arch/riscv/rv32imac/ilp32d/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32d/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
new file mode 100644
index 000000000000..bd66a518eab8
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -0,0 +1,15 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V rv32imac/ilp32d no-multilib profile
+
+CFLAGS="-O2 -pipe -march=rv32imacdf -mabi=ilp32d"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# We have only one ABI
+MULTILIB_ABIS="ilp32d"
+
+# We hide the useflags for the ABIs
+USE_EXPAND_HIDDEN="ABI_RISCV"
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
new file mode 100644
index 000000000000..cf764cd54132
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Undo multilib forcing.
+sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
new file mode 100644
index 000000000000..b2c900da5041
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
@@ -0,0 +1,10 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mask multilib, since we do not want to use it.
+multilib
+
+# Mask the other multilib flags back for non-multilib profile.
+abi_riscv_lp64d
+abi_riscv_lp64
+abi_riscv_ilp32
diff --git a/profiles/arch/riscv/rv32imac/make.defaults b/profiles/arch/riscv/rv32imac/make.defaults
new file mode 100644
index 000000000000..e23fe63fb251
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/make.defaults
@@ -0,0 +1,23 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V profile for rv32imac multilib
+#
+# This immediate profile is ONLY useful for internal purposes. It can NOT
+# generate stages or a working system due to limitations in gcc.
+
+CHOST="riscv32-unknown-linux-gnu"
+
+# Multilib ABIs
+MULTILIB_ABIS="ilp32d ilp32"
+DEFAULT_ABI="ilp32d"
+ABI="ilp32d"
+
+# Enable ilp32d by default
+ABI_RISCV="ilp32d"
+
+# Unhide the riscv/riscv-specific USE_EXPANDs
+USE_EXPAND_HIDDEN="-ABI_RISCV"
+
+# Implicitly enable ilp32d in ebuilds without multilib support
+IUSE_IMPLICIT="abi_riscv_ilp32d"
diff --git a/profiles/arch/riscv/rv32imac/parent b/profiles/arch/riscv/rv32imac/parent
new file mode 100644
index 000000000000..6ee1b9eff10c
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/parent
@@ -0,0 +1,2 @@
+..
+../../../features/multilib
diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force
new file mode 100644
index 000000000000..069813e17719
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/use.force
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag corresponding to the default ABI.
+abi_riscv_ilp32d
diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/use.mask
new file mode 100644
index 000000000000..d57df4d6abeb
--- /dev/null
+++ b/profiles/arch/riscv/rv32imac/use.mask
@@ -0,0 +1,6 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the multilib flags for this arch.
+-abi_riscv_ilp32d
+-abi_riscv_ilp32