gentoo resync : 16.09.2020

1 files changed, 31 insertions, 8 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