[gentoo-commits] repo/gentoo:master commit in: profiles/arch/riscv/rv32imac/ilp32d/, profiles/arch/riscv/rv32imac/ilp32/

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/riscv/rv32imac/ilp32d/, profiles/arch/riscv/rv32imac/ilp32/

[Andreas K. Hüttel]

commit:     d4a163f63d2675b19b683e256d7e2881f477eb0a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 15:25:42 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 15:45:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a163f6

profiles: Add riscv rv32imac[df] ilp32[d] non-multilib profile subdirs

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> 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 00000000000..7ed6ff82de6
--- /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 00000000000..959de434af0
--- /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 rv32imac/ilp32 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 00000000000..dc5b60c2dd2
--- /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 00000000000..e54ac40ffd2
--- /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 00000000000..c717be8a4aa
--- /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 00000000000..7ed6ff82de6
--- /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 00000000000..3354876fcc8
--- /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 00000000000..cf764cd5413
--- /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 00000000000..b2c900da504
--- /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] repo/gentoo:master commit in: profiles/arch/riscv/rv32imac/ilp32d/, profiles/arch/riscv/rv32imac/ilp32/

[Andreas K. Hüttel]

commit:     f6caba28e1a825acc76709c406c3b987253bbcc7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 20:16:41 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 20:17:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6caba28

riscv32: force 64bit time on (there is no other variant here)

Bug: https://bugs.gentoo.org/828001
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 profiles/arch/riscv/rv32imac/ilp32/make.defaults  | 9 +++++++++
 profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
index 702bf0db5663..4e7eed0bff7b 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
@@ -15,3 +15,12 @@ CFLAGS="-O2 -pipe -march=rv32imac -mabi=ilp32"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+
+## Mike Gilbert <floppym@gentoo.org> (2021-12-17)
+## Prevent automagic use of 64-bit time_t.
+## https://bugs.gentoo.org/828001
+#
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2023-10-10)
+# We need to undo this for riscv32 since it only has the 64bit interface
+#
+enable_year2038="yes"

diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
index d21fdce62781..2464269fd8e4 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -15,3 +15,12 @@ CFLAGS="-O2 -pipe -march=rv32imafdc -mabi=ilp32d"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
+
+## Mike Gilbert <floppym@gentoo.org> (2021-12-17)
+## Prevent automagic use of 64-bit time_t.
+## https://bugs.gentoo.org/828001
+#
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2023-10-10)
+# We need to undo this for riscv32 since it only has the 64bit interface
+#
+enable_year2038="yes"