[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/lp64d/, profiles/arch/riscv/rv64gc/, ...
commit: 7ef4dcca5d316f15663165a25aef5bd608ab8c0e Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Sep 11 15:29:13 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Sep 11 15:29:13 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=7ef4dcca profiles: arch/riscv moved to main tree Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/eapi | 1 - profiles/arch/riscv/make.defaults | 48 profiles/arch/riscv/package.accept_keywords| 7 -- profiles/arch/riscv/package.mask | 5 - profiles/arch/riscv/package.use.mask | 124 - profiles/arch/riscv/packages | 5 - profiles/arch/riscv/packages.build | 3 - profiles/arch/riscv/parent | 1 - profiles/arch/riscv/rv32imac/eapi | 1 - profiles/arch/riscv/rv32imac/ilp32/eapi| 1 - profiles/arch/riscv/rv32imac/ilp32/make.defaults | 12 -- .../arch/riscv/rv32imac/ilp32/package.use.force| 5 - profiles/arch/riscv/rv32imac/ilp32/use.force | 5 - profiles/arch/riscv/rv32imac/ilp32/use.mask| 10 -- profiles/arch/riscv/rv32imac/ilp32d/eapi | 1 - profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 15 --- .../arch/riscv/rv32imac/ilp32d/package.use.force | 5 - profiles/arch/riscv/rv32imac/ilp32d/use.mask | 10 -- profiles/arch/riscv/rv32imac/make.defaults | 23 profiles/arch/riscv/rv32imac/parent| 2 - profiles/arch/riscv/rv32imac/use.force | 5 - profiles/arch/riscv/rv32imac/use.mask | 6 - 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 | 10 -- 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 | 10 -- profiles/arch/riscv/rv64gc/make.defaults | 23 profiles/arch/riscv/rv64gc/parent | 2 - profiles/arch/riscv/rv64gc/use.force | 5 - profiles/arch/riscv/rv64gc/use.mask| 8 -- profiles/arch/riscv/use.force | 9 -- profiles/arch/riscv/use.mask | 48 38 files changed, 460 deletions(-) diff --git a/profiles/arch/riscv/eapi b/profiles/arch/riscv/eapi deleted file mode 100644 index 7ed6ff8..000 --- a/profiles/arch/riscv/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults deleted file mode 100644 index 3a7d4ac..000 --- a/profiles/arch/riscv/make.defaults +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# 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" - -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: -# ABI -# DEFAULT_ABI -# MULTILIB_ABIS diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords deleted file mode 100644 index 3ebc00a..000 --- a/profiles/arch/riscv/package.accept_keywords +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Even if someone makes Portage accept other keywords, here -# we need specific versions / patches for riscv! -sys-devel/gcc -amd64 -~amd64 -sys-libs/glibc -amd64 -~amd64 diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask deleted file mode 100644
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv32imac/ilp32/, profiles/arch/riscv/rv32imac/ilp32d/
commit: d81e5665c7e56534fd0f45a09a19b210df0dd1bd Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 5 15:01:22 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Sep 5 15:21:18 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=d81e5665 Add ipp32[d] non-multilib profile subdirs Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv32imac/ilp32/eapi | 1 + profiles/arch/riscv/rv32imac/ilp32/make.defaults | 12 profiles/arch/riscv/rv32imac/ilp32/package.use.force | 5 + profiles/arch/riscv/rv32imac/ilp32/use.force | 5 + profiles/arch/riscv/rv32imac/ilp32/use.mask | 10 ++ profiles/arch/riscv/rv32imac/ilp32d/eapi | 1 + profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 15 +++ profiles/arch/riscv/rv32imac/ilp32d/package.use.force | 5 + profiles/arch/riscv/rv32imac/ilp32d/use.mask | 10 ++ 9 files changed, 64 insertions(+) diff --git a/profiles/arch/riscv/rv32imac/ilp32/eapi b/profiles/arch/riscv/rv32imac/ilp32/eapi new file mode 100644 index 000..7ed6ff8 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults new file mode 100644 index 000..c540eed --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults @@ -0,0 +1,12 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V rv64gc/lp64 no-multilib profile + +# We have only one ABI +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 new file mode 100644 index 000..dc5b60c --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/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 -abi_riscv_lp64 -abi_riscv_ilp32d diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force new file mode 100644 index 000..e54ac40 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/use.force @@ -0,0 +1,5 @@ +# Un-force the original multilib default-abi flag +-abi_riscv_ilp32d + +# Force the abi of this profile here +abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask new file mode 100644 index 000..c717be8 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask @@ -0,0 +1,10 @@ +# 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 +abi_riscv_lp64 +abi_riscv_ilp32d diff --git a/profiles/arch/riscv/rv32imac/ilp32d/eapi b/profiles/arch/riscv/rv32imac/ilp32d/eapi new file mode 100644 index 000..7ed6ff8 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults new file mode 100644 index 000..3354876 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/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=rv32imacdf -mabi=ilp32d" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +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 new file mode 100644 index 000..cf764cd --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/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 -abi_riscv_lp64 -abi_riscv_ilp32 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask new file mode 100644 index 000..b2c900d --- /dev/null +++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask @@ -0,0 +1,10 @@ +# 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 +abi_riscv_lp64 +abi_riscv_ilp32
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/, profiles/arch/riscv/rv64gc/
commit: a7c43cebd36f4ab1240e9798532d524daac77441 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 5 14:24:22 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Sep 5 14:24:22 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=a7c43ceb Copy arch/riscv contents from main tree Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/eapi| 1 + profiles/arch/riscv/make.defaults | 25 ++ profiles/arch/riscv/package.accept_keywords | 7 ++ profiles/arch/riscv/package.use.mask| 124 profiles/arch/riscv/packages| 5 ++ profiles/arch/riscv/packages.build | 3 + profiles/arch/riscv/parent | 1 + profiles/arch/riscv/rv64gc/parent | 2 +- profiles/arch/riscv/use.force | 5 ++ profiles/arch/riscv/use.mask| 42 ++ 10 files changed, 214 insertions(+), 1 deletion(-) diff --git a/profiles/arch/riscv/eapi b/profiles/arch/riscv/eapi new file mode 100644 index 000..7ed6ff8 --- /dev/null +++ b/profiles/arch/riscv/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults new file mode 100644 index 000..bae66d7 --- /dev/null +++ b/profiles/arch/riscv/make.defaults @@ -0,0 +1,25 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Main RISC-V profile directory. + +# This is not a complete profile. Use the subdirectories! + +ARCH="riscv" +ACCEPT_KEYWORDS="riscv ~riscv" + +CHOST="riscv64-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/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords new file mode 100644 index 000..3ebc00a --- /dev/null +++ b/profiles/arch/riscv/package.accept_keywords @@ -0,0 +1,7 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Even if someone makes Portage accept other keywords, here +# we need specific versions / patches for riscv! +sys-devel/gcc -amd64 -~amd64 +sys-libs/glibc -amd64 -~amd64 diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask new file mode 100644 index 000..0a948e7 --- /dev/null +++ b/profiles/arch/riscv/package.use.mask @@ -0,0 +1,124 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Ulrich Müller (2020-01-12) +# Dependencies not keyworded +app-editors/emacs gui + +# Yixun Lan (2020-09-01) +# Dependencies not keyworded +dev-libs/jansson doc + +# Jakov Smolic (2020-08-14) +# Large amount of missing keywords +# Bug #724358 +>=dev-libs/json-c-0.15 doc + +# Sam James (2020-07-31) +# Large amount of missing keywords for cmake and friends +# bug #720296, bug #724358 +dev-util/cmake doc test +dev-libs/jsoncpp doc + +# Lars Wendler (2020-05-10) +# Missing keyword +media-libs/freetype brotli + +# Patrick McLean (2020-04-16) +# Lots of python dependencies, mask to facilitate keywording +# keywording dev-libs/libfido2 +dev-libs/libcbor doc + +# Joonas Niilola (2020-03-26) +# Dependency not keyworded on ~riscv +dev-libs/libpipeline test +sys-apps/kbd test + +# Patrick McLean (2020-02-15) +# Mask until dev-libs/libfido2 is keyworded +net-misc/openssh security-key + +# Sergei Trofimovich (2019-12-02) +# media-libs/gd is not keyworded on riscv +sys-libs/glibc gd + +# Dependency resolution is broken because +# sys-fs/lvm2 has no riscv keyword +sys-fs/e2fsprogs cron + +# This doesn't work for (any) riscv yet. +dev-libs/libpcre2 jit +dev-libs/libpcre jit +dev-vcs/git pcre-jit + +# Not yet tested / unkeyworded dependencies +# This includes also packages which do not support python-3 or +# do not support python-3.7 yet. + +app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp test +app-admin/sysstat lm-sensors +app-arch/unzip natspec +app-crypt/gnupg smartcard tofu wks-server +app-crypt/mit-krb5 doc test xinetd +app-crypt/pinentry fltk gnome-keyring +app-doc/doxygen latex dot +app-editors/emacs alsa json lcms mailutils +app-misc/pax-utils python +app-text/asciidoc graphviz test +app-text/po4a test +app-text/xmlto text +dev-lang/python tk +dev-libs/boost mpi numpy zstd +dev-libs/check doc subunit +dev-libs/glib gtk-doc test +dev-libs/icu doc +dev-libs/iniparser doc +dev-libs/libgcrypt doc +dev-libs/libnl python +dev-libs/libusb doc +dev-libs/libxslt python +dev-libs/libyaml doc +dev-python/argcomplete test +dev-python/aiohttp doc test +dev-python/cython doc test +dev-python/jinja doc test +dev-python/lxml test
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv32imac/
commit: 2be6302e962634986ea593d71ac7ca1b6e6ba6a4 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 5 14:50:07 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Sep 5 15:21:15 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=2be6302e Add intermediate rv32imac profile Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv32imac/eapi | 1 + profiles/arch/riscv/rv32imac/make.defaults | 23 +++ profiles/arch/riscv/rv32imac/parent| 2 ++ profiles/arch/riscv/rv32imac/use.force | 5 + profiles/arch/riscv/rv32imac/use.mask | 6 ++ 5 files changed, 37 insertions(+) diff --git a/profiles/arch/riscv/rv32imac/eapi b/profiles/arch/riscv/rv32imac/eapi new file mode 100644 index 000..7ed6ff8 --- /dev/null +++ b/profiles/arch/riscv/rv32imac/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/arch/riscv/rv32imac/make.defaults b/profiles/arch/riscv/rv32imac/make.defaults new file mode 100644 index 000..57c09ed --- /dev/null +++ b/profiles/arch/riscv/rv32imac/make.defaults @@ -0,0 +1,23 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# RISC-V profile for rv32imac multilib +# +# This immediate profile is ONLY useful for internal purposes. It can NOT +# generate stages or a working system due to limitations in gcc. + +CHOST="riscv32-unknown-linux-gnu" + +# Multilib ABIs +MULTILIB_ABIS="ilp32d ilp32" +DEFAULT_ABI="ilp32d" +ABI="ilp32d" + +# Enable lp64d by default +ABI_RISCV="ilp32d" + +# Unhide the riscv/rv64gc-specific USE_EXPANDs +USE_EXPAND_HIDDEN="-ABI_RISCV" + +# Implicitly enable lp64d in ebuilds without multilib support +IUSE_IMPLICIT="abi_riscv_ilp32d" diff --git a/profiles/arch/riscv/rv32imac/parent b/profiles/arch/riscv/rv32imac/parent new file mode 100644 index 000..c87ae0e --- /dev/null +++ b/profiles/arch/riscv/rv32imac/parent @@ -0,0 +1,2 @@ +.. +gentoo:features/multilib diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force new file mode 100644 index 000..069813e --- /dev/null +++ b/profiles/arch/riscv/rv32imac/use.force @@ -0,0 +1,5 @@ +# 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_ilp32d diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/use.mask new file mode 100644 index 000..d57df4d --- /dev/null +++ b/profiles/arch/riscv/rv32imac/use.mask @@ -0,0 +1,6 @@ +# Copyright 2019 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
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/, profiles/arch/riscv/
commit: 7d1b4e4b0bdc9988b448ec6dc487e3a361b6b77c Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 5 14:37:26 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Sep 5 14:37:26 2020 + 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
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/lp64d/, profiles/arch/riscv/rv64gc/, ...
commit: 15af1c5f1c4710c6abd70332277a0af9160b3961 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Sep 5 14:44:31 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Sep 5 15:20:55 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=15af1c5f Properly enable all 4 abi here Once the useflags are gone we should probably move to 6 abi :) Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv64gc/lp64/use.mask | 2 ++ profiles/arch/riscv/rv64gc/lp64d/use.mask | 2 ++ profiles/arch/riscv/rv64gc/use.mask | 2 ++ 3 files changed, 6 insertions(+) diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask index 9f26ae6..1e0176b 100644 --- a/profiles/arch/riscv/rv64gc/lp64/use.mask +++ b/profiles/arch/riscv/rv64gc/lp64/use.mask @@ -6,3 +6,5 @@ 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/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask index fd1d144..1015280 100644 --- a/profiles/arch/riscv/rv64gc/lp64d/use.mask +++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask @@ -6,3 +6,5 @@ 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/use.mask b/profiles/arch/riscv/rv64gc/use.mask index eed1c21..b38fe8b 100644 --- a/profiles/arch/riscv/rv64gc/use.mask +++ b/profiles/arch/riscv/rv64gc/use.mask @@ -4,3 +4,5 @@ # Unmask the multilib flags for this arch. -abi_riscv_lp64d -abi_riscv_lp64 +-abi_riscv_ilp32d +-abi_riscv_ilp32
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/
commit: c0dc5c35d746f798ca1835a77ec0b396803cd723 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Sep 3 10:10:23 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Sep 3 10:10:23 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=c0dc5c35 profiles: Add rv32 abis to multilib profile Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv64gc/make.defaults | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index 46206e2..efa94c7 100644 --- a/profiles/arch/riscv/rv64gc/make.defaults +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -2,6 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # RISC-V profile for rv64gc multilib +# +# 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}" @@ -9,13 +12,15 @@ FFLAGS="${CFLAGS}" FCFLAGS="${CFLAGS}" # Multilib ABIs -MULTILIB_ABIS="lp64d lp64" +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 @@ -28,6 +33,16 @@ 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"
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/, profiles/arch/riscv/rv64gc/lp64d/, ...
commit: c48b642b70771ff5b57b0876e31bc0335787d870 Author: Andreas K. Hüttel gentoo org> AuthorDate: Wed Sep 2 22:01:26 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Wed Sep 2 22:01:26 2020 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=c48b642b profiles: Copy rv64 arch tree Signed-off-by: Andreas K. Hüttel 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 000..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 000..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 000..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 000..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 000..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 000..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 000..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 000..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 000..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 000..fd1d144 ---
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/
commit: 248700760bbf8684c44cc5c4cbc66877d0ccc012 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu May 2 23:29:01 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu May 2 23:29:01 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=24870076 profiles: Yes, python-3.7 Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv64gc/make.defaults | 2 +- profiles/arch/riscv/rv64gc/use.force | 4 profiles/arch/riscv/rv64gc/use.mask | 4 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index 0326c28..0d78820 100644 --- a/profiles/arch/riscv/rv64gc/make.defaults +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -39,4 +39,4 @@ IUSE_IMPLICIT="abi_riscv_lp64d" # Enable Python 3.7 (and potentially later versions) only PYTHON_TARGETS="python3_7" -PYTHON_SINGLE_TARGET="-* python3_7" +PYTHON_SINGLE_TARGET="python3_7" diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force index 020f290..dc4d06c 100644 --- a/profiles/arch/riscv/rv64gc/use.force +++ b/profiles/arch/riscv/rv64gc/use.force @@ -1,2 +1,6 @@ # Force the flag corresponding to the default ABI. abi_riscv_lp64d + +# Right now we have only one Python available +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 f7180f2..74618e4 100644 --- a/profiles/arch/riscv/rv64gc/use.mask +++ b/profiles/arch/riscv/rv64gc/use.mask @@ -9,3 +9,7 @@ python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 +python_single_target_python2_7 +python_single_target_python3_5 +python_single_target_python3_6 +
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/
commit: 87df7ca6bd149b0b637856004650b5cca2924d39 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu May 2 22:04:09 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu May 2 22:04:09 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=87df7ca6 profiles: Really only python-3.7 Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv64gc/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index 0d78820..0326c28 100644 --- a/profiles/arch/riscv/rv64gc/make.defaults +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -39,4 +39,4 @@ IUSE_IMPLICIT="abi_riscv_lp64d" # Enable Python 3.7 (and potentially later versions) only PYTHON_TARGETS="python3_7" -PYTHON_SINGLE_TARGET="python3_7" +PYTHON_SINGLE_TARGET="-* python3_7"
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/, profiles/arch/riscv/
commit: 5a576e626fb9459377ad3628f780b47ab2888158 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu May 2 21:44:56 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu May 2 21:44:56 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=5a576e62 profiles: Rework so we only use python-3.7 (no patches needed there) Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.accept_keywords | 1 - profiles/arch/riscv/rv64gc/make.defaults | 4 profiles/arch/riscv/{ => rv64gc}/package.mask | 2 +- profiles/arch/riscv/rv64gc/use.mask | 8 profiles/arch/riscv/use.mask | 3 --- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords index 41b16e7..dc5941f 100644 --- a/profiles/arch/riscv/package.accept_keywords +++ b/profiles/arch/riscv/package.accept_keywords @@ -1,5 +1,4 @@ # we need specific versions / patches for riscv -dev-lang/python -amd64 -~amd64 sys-devel/gcc -amd64 -~amd64 sys-libs/glibc -amd64 -~amd64 diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults index 43de775..0d78820 100644 --- a/profiles/arch/riscv/rv64gc/make.defaults +++ b/profiles/arch/riscv/rv64gc/make.defaults @@ -36,3 +36,7 @@ USE_EXPAND_HIDDEN="-ABI_RISCV" # Implicitly enable lp64d in ebuilds without multilib support IUSE_IMPLICIT="abi_riscv_lp64d" + +# Enable Python 3.7 (and potentially later versions) only +PYTHON_TARGETS="python3_7" +PYTHON_SINGLE_TARGET="python3_7" diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/rv64gc/package.mask similarity index 70% rename from profiles/arch/riscv/package.mask rename to profiles/arch/riscv/rv64gc/package.mask index 887eef2..e351251 100644 --- a/profiles/arch/riscv/package.mask +++ b/profiles/arch/riscv/rv64gc/package.mask @@ -1,2 +1,2 @@ # Doesnt work properly with the two-level libdirs -dev-lang/python:2.7 +
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: d5d38a549bb4bfcd097601a1f704900cb2d410c9 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Apr 28 19:38:40 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Apr 28 19:38:40 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=d5d38a54 profiles: Force using overlay glibc Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords index 1d48590..41b16e7 100644 --- a/profiles/arch/riscv/package.accept_keywords +++ b/profiles/arch/riscv/package.accept_keywords @@ -1,6 +1,7 @@ # we need specific versions / patches for riscv dev-lang/python -amd64 -~amd64 sys-devel/gcc -amd64 -~amd64 +sys-libs/glibc -amd64 -~amd64 # we need static qemu *from* ~amd64 app-emulation/qemu-riscv64-bin ~amd64
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 4f07ed0f2e9212b1edf71d82e16d17a094fd2b77 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Apr 28 10:04:32 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Apr 28 10:04:32 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=4f07ed0f profiles: We need overlay gcc Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.accept_keywords | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords index b166f7b..1d48590 100644 --- a/profiles/arch/riscv/package.accept_keywords +++ b/profiles/arch/riscv/package.accept_keywords @@ -1,5 +1,6 @@ -# we need python patched for riscv +# we need specific versions / patches for riscv dev-lang/python -amd64 -~amd64 +sys-devel/gcc -amd64 -~amd64 # we need static qemu *from* ~amd64 app-emulation/qemu-riscv64-bin ~amd64
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/lp64/, profiles/arch/riscv/rv64gc/lp64d/, ...
commit: c03b60f650c68650c35319406348a63cb3062f1c Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 27 20:33:04 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 27 20:33:04 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=c03b60f6 profiles: Hook into multilib system. Fingers crossed. Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/parent | 1 + profiles/arch/riscv/rv64gc/lp64/package.use.force | 2 ++ profiles/arch/riscv/rv64gc/lp64/use.mask | 5 + profiles/arch/riscv/rv64gc/lp64d/package.use.force | 2 ++ profiles/arch/riscv/rv64gc/lp64d/use.mask | 5 + profiles/arch/riscv/rv64gc/use.force | 2 ++ profiles/arch/riscv/rv64gc/use.mask| 3 +++ profiles/arch/riscv/use.force | 2 ++ profiles/arch/riscv/use.mask | 6 ++ profiles/features/multilib/package.use | 3 +++ profiles/features/multilib/parent | 1 + 11 files changed, 32 insertions(+) diff --git a/profiles/arch/riscv/parent b/profiles/arch/riscv/parent index eb001c6..c5b66f7 100644 --- a/profiles/arch/riscv/parent +++ b/profiles/arch/riscv/parent @@ -1 +1,2 @@ ../base +../../features/multilib 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 000..a319d3e --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64/package.use.force @@ -0,0 +1,2 @@ +# Undo multilib forcing. +sys-apps/sandbox -abi_riscv_lp64d diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask new file mode 100644 index 000..5d1fa74 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64/use.mask @@ -0,0 +1,5 @@ +# Mask multilib, since we cannot use it. +multilib + +# Mask the multilib flags back for non-multilib profile. +abi_riscv_lp64d 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 000..fe0910f --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64d/package.use.force @@ -0,0 +1,2 @@ +# 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 000..c3b6781 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/lp64d/use.mask @@ -0,0 +1,5 @@ +# Mask multilib, since we cannot use it. +multilib + +# Mask the multilib flags back for non-multilib profile. +abi_riscv_lp64 diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force new file mode 100644 index 000..020f290 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/use.force @@ -0,0 +1,2 @@ +# 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 new file mode 100644 index 000..cf1e9a0 --- /dev/null +++ b/profiles/arch/riscv/rv64gc/use.mask @@ -0,0 +1,3 @@ +# Unmask the multilib flags for this arch. +-abi_riscv_lp64d +-abi_riscv_lp64 diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force new file mode 100644 index 000..612aced --- /dev/null +++ b/profiles/arch/riscv/use.force @@ -0,0 +1,2 @@ +# Force the flag which corresponds to ARCH. +riscv diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask index 840b97a..d974bbe 100644 --- a/profiles/arch/riscv/use.mask +++ b/profiles/arch/riscv/use.mask @@ -1,3 +1,9 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Unmask the flag which corresponds to ARCH. +-riscv + # The required library has not been ported to riscv yet. seccomp diff --git a/profiles/features/multilib/package.use b/profiles/features/multilib/package.use new file mode 100644 index 000..b01f51f --- /dev/null +++ b/profiles/features/multilib/package.use @@ -0,0 +1,3 @@ +# Enable all ABIs by default so we can protect any non-native binaries that +# might be executed. +sys-apps/sandbox abi_riscv_lp64d abi_riscv_lp64 diff --git a/profiles/features/multilib/parent b/profiles/features/multilib/parent new file mode 100644 index 000..8dccfc9 --- /dev/null +++ b/profiles/features/multilib/parent @@ -0,0 +1 @@ +gentoo:features/multilib
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 011b672240ed512e6dcdf670b244665978c4b024 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 27 20:02:59 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 27 20:02:59 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=011b6722 profiles: Add x86-64 static qemu-riscv64 to all stages for now (here, stage1) Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/packages.build | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/arch/riscv/packages.build b/profiles/arch/riscv/packages.build new file mode 100644 index 000..9d8dcba --- /dev/null +++ b/profiles/arch/riscv/packages.build @@ -0,0 +1,5 @@ +# For now we add the x86-64 qemu-riscv64 static binary to all +# stages. This makes life somewhat simpler for working without +# real hardware. + +app-emulation/qemu-riscv64-bin
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 693d28672b76d893d1295c195a9f3f1011d40e5a Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 27 19:58:41 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 27 19:58:41 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=693d2867 profiles: Add x86-64 static qemu-riscv64 to all stages for now Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.accept_keywords | 3 +++ profiles/arch/riscv/packages| 4 2 files changed, 7 insertions(+) diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords index 245de3d..b166f7b 100644 --- a/profiles/arch/riscv/package.accept_keywords +++ b/profiles/arch/riscv/package.accept_keywords @@ -1,2 +1,5 @@ # we need python patched for riscv dev-lang/python -amd64 -~amd64 + +# we need static qemu *from* ~amd64 +app-emulation/qemu-riscv64-bin ~amd64 diff --git a/profiles/arch/riscv/packages b/profiles/arch/riscv/packages new file mode 100644 index 000..cef240a --- /dev/null +++ b/profiles/arch/riscv/packages @@ -0,0 +1,4 @@ +# For now we add the x86-64 qemu-riscv64 static binary to all +# stages. This makes life somewhat simpler for working without +# real hardware. +*app-emulation/qemu-riscv64-bin
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 906c695d3140dcc6cc6fe458cc9fedc11c2b9490 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Apr 21 10:34:20 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Apr 21 10:34:20 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=906c695d profiles: One more victim of missing pcre-jit Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.use.mask | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask index e89ccfe..e6cd04d 100644 --- a/profiles/arch/riscv/package.use.mask +++ b/profiles/arch/riscv/package.use.mask @@ -2,3 +2,4 @@ # This doesn't work for (any) riscv yet. dev-libs/libpcre2 jit dev-libs/libpcre jit +dev-vcs/git pcre-jit
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv64gc/lp64/, profiles/arch/riscv/rv64gc/lp64d/
commit: 3a2d48852ad356ec7f192a0dfcaf7c970278ea98 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 23:56:45 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 23:56:45 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=3a2d4885 profiles: write -mabi= explicitly in cflags Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/rv64gc/lp64/make.defaults | 5 + profiles/arch/riscv/rv64gc/lp64d/make.defaults | 5 + 2 files changed, 10 insertions(+) diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults index fe2afc5..8c6534c 100644 --- a/profiles/arch/riscv/rv64gc/lp64/make.defaults +++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults @@ -3,6 +3,11 @@ # RISC-V rv64gc/lp64 no-multilib profile +CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + # We have only one ABI MULTILIB_ABIS="lp64" diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults index 7b72704..85372ab 100644 --- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults +++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults @@ -3,6 +3,11 @@ # 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"
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 4a9918a78c722540146ad462514bba8ad6d2c36f Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 23:37:05 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 23:37:05 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=4a9918a7 profiles: Make sure we get python patched for riscv Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.accept_keywords | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/arch/riscv/package.accept_keywords b/profiles/arch/riscv/package.accept_keywords new file mode 100644 index 000..245de3d --- /dev/null +++ b/profiles/arch/riscv/package.accept_keywords @@ -0,0 +1,2 @@ +# we need python patched for riscv +dev-lang/python -amd64 -~amd64
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: dfd270cc3975c78f11b40685a10fad9ad927d1ce Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 18:20:20 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 18:20:20 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=dfd270cc profiles: No Python 2 here, since it has lots of trouble with two-stage libdir Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/use.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask index 1898783..840b97a 100644 --- a/profiles/arch/riscv/use.mask +++ b/profiles/arch/riscv/use.mask @@ -1,2 +1,5 @@ # The required library has not been ported to riscv yet. seccomp + +# Python 2 has a lot of trouble with the two-level libdir. +python_targets_python2_7
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 3a1a8ec1c97dfb5e5c2d8f8e048e96eb1297f761 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 17:24:31 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 17:24:31 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=3a1a8ec1 profiles: Also accept amd64 keywords for now Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults index f7ee72c..9a66fed 100644 --- a/profiles/arch/riscv/make.defaults +++ b/profiles/arch/riscv/make.defaults @@ -4,7 +4,7 @@ # Main RISC-V profile ARCH="riscv" -ACCEPT_KEYWORDS="riscv ~riscv" +ACCEPT_KEYWORDS="amd64 ~amd64 riscv ~riscv" CHOST="riscv64-unknown-linux-gnu"
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 2089e1911e0ac2c3de36ab319d134c1800224813 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 18:22:22 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 18:22:22 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=2089e191 profiles: No Python 2 here, since it has lots of trouble with two-stage libdir Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.mask | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask new file mode 100644 index 000..887eef2 --- /dev/null +++ b/profiles/arch/riscv/package.mask @@ -0,0 +1,2 @@ +# Doesnt work properly with the two-level libdirs +dev-lang/python:2.7
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 92f16fc7d09f66f1b0b8147ebeb1972153eec778 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 17:23:05 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 17:23:05 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=92f16fc7 profiles: Disable advanced portage features to make qemu work Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/make.defaults | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults index 1e1fc22..f7ee72c 100644 --- a/profiles/arch/riscv/make.defaults +++ b/profiles/arch/riscv/make.defaults @@ -8,6 +8,9 @@ ACCEPT_KEYWORDS="riscv ~riscv" CHOST="riscv64-unknown-linux-gnu" +# Since many people will want to test this in qemu... +FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox" + # This is not a complete profile. The following stuff is # defined in subdirs: # CFLAGS
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 1bf52040c6aeb618fc72885857ae1bfdda49 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 17:27:51 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 17:27:51 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=1bf52040 profiles: mask libpcre jit flag, not supported yet Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/package.use.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask new file mode 100644 index 000..e89ccfe --- /dev/null +++ b/profiles/arch/riscv/package.use.mask @@ -0,0 +1,4 @@ + +# This doesn't work for (any) riscv yet. +dev-libs/libpcre2 jit +dev-libs/libpcre jit
[gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/
commit: 66d4af6c7a7882d488f328f7e4157a6200cd2d9a Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Apr 20 17:29:47 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Apr 20 17:29:47 2019 + URL:https://gitweb.gentoo.org/proj/riscv.git/commit/?id=66d4af6c profiles: Globally mask useflag seccomp; library does not work yet on riscv Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/arch/riscv/use.mask | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask new file mode 100644 index 000..1898783 --- /dev/null +++ b/profiles/arch/riscv/use.mask @@ -0,0 +1,2 @@ +# The required library has not been ported to riscv yet. +seccomp