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

profiles: Copy rv64 arch tree

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

 profiles/arch/riscv/rv64gc/eapi                    |  1 +
 profiles/arch/riscv/rv64gc/lp64/eapi               |  1 +
 profiles/arch/riscv/rv64gc/lp64/make.defaults      | 17 ++++++++++
 profiles/arch/riscv/rv64gc/lp64/package.use.force  |  5 +++
 profiles/arch/riscv/rv64gc/lp64/use.force          |  5 +++
 profiles/arch/riscv/rv64gc/lp64/use.mask           |  8 +++++
 profiles/arch/riscv/rv64gc/lp64d/eapi              |  1 +
 profiles/arch/riscv/rv64gc/lp64d/make.defaults     | 15 +++++++++
 profiles/arch/riscv/rv64gc/lp64d/package.use.force |  5 +++
 profiles/arch/riscv/rv64gc/lp64d/use.mask          |  8 +++++
 profiles/arch/riscv/rv64gc/make.defaults           | 38 ++++++++++++++++++++++
 profiles/arch/riscv/rv64gc/package.mask            |  5 +++
 profiles/arch/riscv/rv64gc/parent                  |  2 ++
 profiles/arch/riscv/rv64gc/use.force               |  9 +++++
 profiles/arch/riscv/rv64gc/use.mask                | 12 +++++++
 15 files changed, 132 insertions(+)

diff --git a/profiles/arch/riscv/rv64gc/eapi b/profiles/arch/riscv/rv64gc/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/arch/riscv/rv64gc/lp64/eapi 
b/profiles/arch/riscv/rv64gc/lp64/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults 
b/profiles/arch/riscv/rv64gc/lp64/make.defaults
new file mode 100644
index 0000000..f4b3042
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -0,0 +1,17 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V rv64gc/lp64 no-multilib profile
+
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# We have only one ABI
+MULTILIB_ABIS="lp64"
+DEFAULT_ABI="lp64"
+ABI="lp64"
+
+# We hide the useflags for the ABIs
+USE_EXPAND_HIDDEN="ABI_RISCV"

diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force 
b/profiles/arch/riscv/rv64gc/lp64/package.use.force
new file mode 100644
index 0000000..e25bb13
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/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

diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force 
b/profiles/arch/riscv/rv64gc/lp64/use.force
new file mode 100644
index 0000000..d04bb8b
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/use.force
@@ -0,0 +1,5 @@
+# Un-force the original multilib default-abi flag
+-abi_riscv_lp64d
+
+# Force the abi of this profile here
+abi_riscv_lp64

diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask 
b/profiles/arch/riscv/rv64gc/lp64/use.mask
new file mode 100644
index 0000000..9f26ae6
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64/use.mask
@@ -0,0 +1,8 @@
+# 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

diff --git a/profiles/arch/riscv/rv64gc/lp64d/eapi 
b/profiles/arch/riscv/rv64gc/lp64d/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64d/eapi
@@ -0,0 +1 @@
+5

diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults 
b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
new file mode 100644
index 0000000..85372ab
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
@@ -0,0 +1,15 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V rv64gc/lp64d no-multilib profile
+
+CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64d"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# We have only one ABI
+MULTILIB_ABIS="lp64d"
+
+# We hide the useflags for the ABIs
+USE_EXPAND_HIDDEN="ABI_RISCV"

diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force 
b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
new file mode 100644
index 0000000..73fe936
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64d/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_lp64

diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask 
b/profiles/arch/riscv/rv64gc/lp64d/use.mask
new file mode 100644
index 0000000..fd1d144
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask
@@ -0,0 +1,8 @@
+# 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_lp64

diff --git a/profiles/arch/riscv/rv64gc/make.defaults 
b/profiles/arch/riscv/rv64gc/make.defaults
new file mode 100644
index 0000000..46206e2
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/make.defaults
@@ -0,0 +1,38 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# RISC-V profile for rv64gc multilib
+
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+# Multilib ABIs
+MULTILIB_ABIS="lp64d lp64"
+DEFAULT_ABI="lp64d"
+ABI="lp64d"
+
+# Library directories
+LIBDIR_lp64d="lib64/lp64d"
+LIBDIR_lp64="lib64/lp64"
+SYMLINK_LIB="no"
+
+# Flags for lp64d
+CFLAGS_lp64d="-mabi=lp64d"
+LDFLAGS_lp64d="-m elf64lriscv"
+CHOST_lp64d="riscv64-unknown-linux-gnu"
+
+# Flags for lp64
+CFLAGS_lp64="-mabi=lp64"
+LDFLAGS_lp64="-m elf64lriscv_lp64"
+CHOST_lp64="riscv64-unknown-linux-gnu"
+
+# Enable lp64d by default
+ABI_RISCV="lp64d"
+
+# Unhide the riscv/rv64gc-specific USE_EXPANDs
+USE_EXPAND_HIDDEN="-ABI_RISCV"
+
+# Implicitly enable lp64d in ebuilds without multilib support
+IUSE_IMPLICIT="abi_riscv_lp64d"

diff --git a/profiles/arch/riscv/rv64gc/package.mask 
b/profiles/arch/riscv/rv64gc/package.mask
new file mode 100644
index 0000000..43580b7
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/package.mask
@@ -0,0 +1,5 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Doesnt work properly with the two-level libdirs
+<dev-lang/python-3.7

diff --git a/profiles/arch/riscv/rv64gc/parent 
b/profiles/arch/riscv/rv64gc/parent
new file mode 100644
index 0000000..a4737b6
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/parent
@@ -0,0 +1,2 @@
+gentoo:arch/riscv
+gentoo:features/multilib

diff --git a/profiles/arch/riscv/rv64gc/use.force 
b/profiles/arch/riscv/rv64gc/use.force
new file mode 100644
index 0000000..7ce55a8
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/use.force
@@ -0,0 +1,9 @@
+# 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_lp64d
+
+# Right now we have only one Python available, so we must use it
+python_targets_python3_7
+python_single_target_python3_7

diff --git a/profiles/arch/riscv/rv64gc/use.mask 
b/profiles/arch/riscv/rv64gc/use.mask
new file mode 100644
index 0000000..6e01a57
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the multilib flags for this arch.
+-abi_riscv_lp64d
+-abi_riscv_lp64
+
+# Our Python has a lot of trouble with the two-level libdir.
+python_targets_python2_7
+python_targets_python3_6
+python_single_target_python2_7
+python_single_target_python3_6

Reply via email to