profiles: Move as many settings as possible from riscv/rv64gc to riscv

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

7 files changed, 42 insertions, 49 deletions

diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults
index bae66d7316cc..3a7d4ac18e7f 100644
--- a/profiles/arch/riscv/make.defaults
+++ b/profiles/arch/riscv/make.defaults
@@ -1,25 +1,48 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Main RISC-V profile directory.
+# Main RISC-V profile directory. Common settings for all riscv profiles.
 
 # This is not a complete profile. Use the subdirectories!
 
 ARCH="riscv"
 ACCEPT_KEYWORDS="riscv ~riscv"
 
-CHOST="riscv64-unknown-linux-gnu"
+CFLAGS="-O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
+
+SYMLINK_LIB="no"
+
+# Flags for lp64d
+LIBDIR_lp64d="lib64/lp64d"
+CFLAGS_lp64d="-mabi=lp64d"
+LDFLAGS_lp64d="-m elf64lriscv"
+CHOST_lp64d="riscv64-unknown-linux-gnu"
+
+# Flags for lp64
+LIBDIR_lp64="lib64/lp64"
+CFLAGS_lp64="-mabi=lp64"
+LDFLAGS_lp64="-m elf64lriscv_lp64"
+CHOST_lp64="riscv64-unknown-linux-gnu"
+
+# Flags for ilp32d
+LIBDIR_ilp32d="lib32/ilp32d"
+CFLAGS_ilp32d="-mabi=ilp32d -march=rv32imafdc"
+LDFLAGS_ilp32d="-m elf32lriscv"
+CHOST_ilp32d="riscv32-unknown-linux-gnu"
+
+# Flags for ilp32
+LIBDIR_ilp32="lib32/ilp32"
+CFLAGS_ilp32="-mabi=ilp32 -march=rv32imac"
+LDFLAGS_ilp32="-m elf32lriscv_ilp32"
+CHOST_ilp32="riscv32-unknown-linux-gnu"
 
 # Since many people will want to test this in qemu...
 FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
 
 # The following stuff is, e.g., defined in subdirs:
-# CFLAGS
-# CXXFLAGS
-# FFLAGS
-# FCFLAGS
 # ABI
 # DEFAULT_ABI
 # MULTILIB_ABIS
-# CHOST_riscv
-# LIBDIR_riscv
diff --git a/profiles/arch/riscv/rv64gc/package.mask b/profiles/arch/riscv/package.mask
index 43580b7b49a0..43580b7b49a0 100644
--- a/profiles/arch/riscv/rv64gc/package.mask
+++ b/profiles/arch/riscv/package.mask
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults
index efa94c72668e..a5963cb2fcba 100644
--- a/profiles/arch/riscv/rv64gc/make.defaults
+++ b/profiles/arch/riscv/rv64gc/make.defaults
@@ -6,43 +6,13 @@
 # This immediate profile is ONLY useful for internal purposes; it can generate
 # stages just fine, but the only "hardware" that can run them is qemu-user ...
 
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
+CHOST="riscv64-unknown-linux-gnu"
 
 # Multilib ABIs
 MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
 DEFAULT_ABI="lp64d"
 ABI="lp64d"
 
-# Library directories
-LIBDIR_lp64d="lib64/lp64d"
-LIBDIR_lp64="lib64/lp64"
-LIBDIR_ilp32d="lib32/ilp32d"
-LIBDIR_ilp32="lib32/ilp32"
-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"
-
-# Flags for ilp32d
-CFLAGS_ilp32d="-mabi=ilp32d -march=rv32imafdc"
-LDFLAGS_ilp32d="-m elf32lriscv"
-CHOST_ilp32d="riscv32-unknown-linux-gnu"
-
-# Flags for ilp32
-CFLAGS_ilp32="-mabi=ilp32 -march=rv32imac"
-LDFLAGS_ilp32="-m elf32lriscv_ilp32"
-CHOST_ilp32="riscv32-unknown-linux-gnu"
-
 # Enable lp64d by default
 ABI_RISCV="lp64d"
 
diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force
index 7ce55a8948e1..eb2add7ba6b7 100644
--- a/profiles/arch/riscv/rv64gc/use.force
+++ b/profiles/arch/riscv/rv64gc/use.force
@@ -3,7 +3,3 @@
 
 # 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
index 6e01a574cebb..eed1c2149222 100644
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ b/profiles/arch/riscv/rv64gc/use.mask
@@ -4,9 +4,3 @@
 # 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
diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
index 5e5e335685cb..d97bd1215470 100644
--- a/profiles/arch/riscv/use.force
+++ b/profiles/arch/riscv/use.force
@@ -3,3 +3,7 @@
 
 # Force the flag which corresponds to ARCH.
 riscv
+
+# 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/use.mask b/profiles/arch/riscv/use.mask
index f7192116dbfa..3003db9f9964 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -4,6 +4,12 @@
 # Unmask the flag which corresponds to ARCH.
 -riscv
 
+# 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
+
 # Ben Kohler <bkohler@gentoo.org> (2019-01-09)
 # no fam providers keyworded yet
 fam