diff options
Diffstat (limited to 'profiles/arch/riscv')
21 files changed, 13 insertions, 99 deletions
diff --git a/profiles/arch/riscv/packages b/profiles/arch/riscv/packages index b089d412189e..9de5ab734497 100644 --- a/profiles/arch/riscv/packages +++ b/profiles/arch/riscv/packages @@ -1,5 +1,2 @@ # Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - -# For the initial hot experimentation phase... -*sys-devel/gdb diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults index 959de434af0f..1065af43c9a8 100644 --- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults +++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults @@ -7,6 +7,3 @@ 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 index dc5b60c2dd26..aacc29b1d56e 100644 --- a/profiles/arch/riscv/rv32imac/ilp32/package.use.force +++ b/profiles/arch/riscv/rv32imac/ilp32/package.use.force @@ -1,5 +1,3 @@ # 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 index e54ac40ffd20..82bb958a577a 100644 --- a/profiles/arch/riscv/rv32imac/ilp32/use.force +++ b/profiles/arch/riscv/rv32imac/ilp32/use.force @@ -1,5 +1,2 @@ -# Un-force the original multilib default-abi flag --abi_riscv_ilp32d - -# Force the abi of this profile here -abi_riscv_ilp32 +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask index c717be8a4aa4..991c792750ad 100644 --- a/profiles/arch/riscv/rv32imac/ilp32/use.mask +++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask @@ -3,8 +3,3 @@ # 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/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults index bd66a518eab8..a53334741ede 100644 --- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults +++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults @@ -10,6 +10,3 @@ 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 index cf764cd54132..9de5ab734497 100644 --- a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force +++ b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force @@ -1,5 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 index b2c900da5041..d8172baa5f5f 100644 --- a/profiles/arch/riscv/rv32imac/ilp32d/use.mask +++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask @@ -1,10 +1,5 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 index e23fe63fb251..da381b453f83 100644 --- a/profiles/arch/riscv/rv32imac/make.defaults +++ b/profiles/arch/riscv/rv32imac/make.defaults @@ -12,12 +12,3 @@ CHOST="riscv32-unknown-linux-gnu" 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/use.force b/profiles/arch/riscv/rv32imac/use.force index 069813e17719..9de5ab734497 100644 --- a/profiles/arch/riscv/rv32imac/use.force +++ b/profiles/arch/riscv/rv32imac/use.force @@ -1,5 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 index d57df4d6abeb..9de5ab734497 100644 --- a/profiles/arch/riscv/rv32imac/use.mask +++ b/profiles/arch/riscv/rv32imac/use.mask @@ -1,6 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults index f4b3042683c5..4aeb573215d2 100644 --- a/profiles/arch/riscv/rv64gc/lp64/make.defaults +++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults @@ -12,6 +12,3 @@ FCFLAGS="${CFLAGS}" 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 index e25bb13182b5..9de5ab734497 100644 --- a/profiles/arch/riscv/rv64gc/lp64/package.use.force +++ b/profiles/arch/riscv/rv64gc/lp64/package.use.force @@ -1,5 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 index d04bb8b3d835..9de5ab734497 100644 --- a/profiles/arch/riscv/rv64gc/lp64/use.force +++ b/profiles/arch/riscv/rv64gc/lp64/use.force @@ -1,5 +1,2 @@ -# Un-force the original multilib default-abi flag --abi_riscv_lp64d - -# Force the abi of this profile here -abi_riscv_lp64 +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask index 1e0176b85cb0..d8172baa5f5f 100644 --- a/profiles/arch/riscv/rv64gc/lp64/use.mask +++ b/profiles/arch/riscv/rv64gc/lp64/use.mask @@ -1,10 +1,5 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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_ilp32d -abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults index 85372ab59289..f595f6ac4437 100644 --- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults +++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults @@ -10,6 +10,3 @@ 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 index 73fe93666cc9..9de5ab734497 100644 --- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force +++ b/profiles/arch/riscv/rv64gc/lp64d/package.use.force @@ -1,5 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 index 101528080621..991c792750ad 100644 --- a/profiles/arch/riscv/rv64gc/lp64d/use.mask +++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask @@ -3,8 +3,3 @@ # Mask multilib, since we do not want to use it. multilib - -# Mask the other multilib flags back for non-multilib profile. -abi_riscv_lp64 -abi_riscv_ilp32d -abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index a5963cb2fcba..e35f63c8d1e1 100644 --- a/profiles/arch/riscv/rv64gc/make.defaults +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -12,12 +12,3 @@ CHOST="riscv64-unknown-linux-gnu" MULTILIB_ABIS="lp64d lp64 ilp32d ilp32" DEFAULT_ABI="lp64d" ABI="lp64d" - -# 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/use.force b/profiles/arch/riscv/rv64gc/use.force index eb2add7ba6b7..9de5ab734497 100644 --- a/profiles/arch/riscv/rv64gc/use.force +++ b/profiles/arch/riscv/rv64gc/use.force @@ -1,5 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - -# Force the flag corresponding to the default ABI. -abi_riscv_lp64d diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask index b38fe8be382f..9de5ab734497 100644 --- a/profiles/arch/riscv/rv64gc/use.mask +++ b/profiles/arch/riscv/rv64gc/use.mask @@ -1,8 +1,2 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 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 --abi_riscv_ilp32d --abi_riscv_ilp32 |