From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76C8613835A for ; Sat, 5 Sep 2020 15:21:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A884BE08C8; Sat, 5 Sep 2020 15:21:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D4C2E08C8 for ; Sat, 5 Sep 2020 15:21:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A719B340C1C for ; Sat, 5 Sep 2020 15:21:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2998D33B for ; Sat, 5 Sep 2020 15:21:44 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1599316646.7d1b4e4b0bdc9988b448ec6dc487e3a361b6b77c.dilfridge@gentoo> Subject: [gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/, profiles/arch/riscv/ X-VCS-Repository: proj/riscv X-VCS-Files: profiles/arch/riscv/make.defaults profiles/arch/riscv/package.mask profiles/arch/riscv/rv64gc/make.defaults profiles/arch/riscv/rv64gc/package.mask profiles/arch/riscv/rv64gc/use.force profiles/arch/riscv/rv64gc/use.mask profiles/arch/riscv/use.force profiles/arch/riscv/use.mask X-VCS-Directories: profiles/arch/riscv/rv64gc/ profiles/arch/riscv/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 7d1b4e4b0bdc9988b448ec6dc487e3a361b6b77c X-VCS-Branch: master Date: Sat, 5 Sep 2020 15:21:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e5b869bf-8954-4d53-8143-485459dd8931 X-Archives-Hash: 1105ae4907af6d9f76f622c094ff6004 commit: 7d1b4e4b0bdc9988b448ec6dc487e3a361b6b77c Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 5 14:37:26 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Sep 5 14:37:26 2020 +0000 URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=7d1b4e4b Move as many settings as possible from riscv/rv64gc to riscv Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/make.defaults | 39 +++++++++++++++++++++------ profiles/arch/riscv/{rv64gc => }/package.mask | 0 profiles/arch/riscv/rv64gc/make.defaults | 32 +--------------------- profiles/arch/riscv/rv64gc/use.force | 4 --- profiles/arch/riscv/rv64gc/use.mask | 6 ----- profiles/arch/riscv/use.force | 4 +++ profiles/arch/riscv/use.mask | 6 +++++ 7 files changed, 42 insertions(+), 49 deletions(-) diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults index bae66d7..3a7d4ac 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 similarity index 100% rename from profiles/arch/riscv/rv64gc/package.mask rename to profiles/arch/riscv/package.mask diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index efa94c7..a5963cb 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 7ce55a8..eb2add7 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 6e01a57..eed1c21 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 5e5e335..d97bd12 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 f719211..3003db9 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 (2019-01-09) # no fam providers keyworded yet fam