Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/riscv:master commit in: profiles/arch/riscv/rv32imac/ilp32/, profiles/arch/riscv/rv32imac/ilp32d/
Date: Sat, 05 Sep 2020 15:21:48
Message-Id: 1599319278.d81e5665c7e56534fd0f45a09a19b210df0dd1bd.dilfridge@gentoo
1 commit: d81e5665c7e56534fd0f45a09a19b210df0dd1bd
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 5 15:01:22 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 5 15:21:18 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=d81e5665
7
8 Add ipp32[d] non-multilib profile subdirs
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 profiles/arch/riscv/rv32imac/ilp32/eapi | 1 +
13 profiles/arch/riscv/rv32imac/ilp32/make.defaults | 12 ++++++++++++
14 profiles/arch/riscv/rv32imac/ilp32/package.use.force | 5 +++++
15 profiles/arch/riscv/rv32imac/ilp32/use.force | 5 +++++
16 profiles/arch/riscv/rv32imac/ilp32/use.mask | 10 ++++++++++
17 profiles/arch/riscv/rv32imac/ilp32d/eapi | 1 +
18 profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 15 +++++++++++++++
19 profiles/arch/riscv/rv32imac/ilp32d/package.use.force | 5 +++++
20 profiles/arch/riscv/rv32imac/ilp32d/use.mask | 10 ++++++++++
21 9 files changed, 64 insertions(+)
22
23 diff --git a/profiles/arch/riscv/rv32imac/ilp32/eapi b/profiles/arch/riscv/rv32imac/ilp32/eapi
24 new file mode 100644
25 index 0000000..7ed6ff8
26 --- /dev/null
27 +++ b/profiles/arch/riscv/rv32imac/ilp32/eapi
28 @@ -0,0 +1 @@
29 +5
30
31 diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
32 new file mode 100644
33 index 0000000..c540eed
34 --- /dev/null
35 +++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
36 @@ -0,0 +1,12 @@
37 +# Copyright 2019 Gentoo Authors
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +# RISC-V rv64gc/lp64 no-multilib profile
41 +
42 +# We have only one ABI
43 +MULTILIB_ABIS="ilp32"
44 +DEFAULT_ABI="ilp32"
45 +ABI="ilp32"
46 +
47 +# We hide the useflags for the ABIs
48 +USE_EXPAND_HIDDEN="ABI_RISCV"
49
50 diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
51 new file mode 100644
52 index 0000000..dc5b60c
53 --- /dev/null
54 +++ b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
55 @@ -0,0 +1,5 @@
56 +# Copyright 2019 Gentoo Authors
57 +# Distributed under the terms of the GNU General Public License v2
58 +
59 +# Undo multilib forcing.
60 +sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32d
61
62 diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force
63 new file mode 100644
64 index 0000000..e54ac40
65 --- /dev/null
66 +++ b/profiles/arch/riscv/rv32imac/ilp32/use.force
67 @@ -0,0 +1,5 @@
68 +# Un-force the original multilib default-abi flag
69 +-abi_riscv_ilp32d
70 +
71 +# Force the abi of this profile here
72 +abi_riscv_ilp32
73
74 diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask
75 new file mode 100644
76 index 0000000..c717be8
77 --- /dev/null
78 +++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask
79 @@ -0,0 +1,10 @@
80 +# Copyright 2019 Gentoo Authors
81 +# Distributed under the terms of the GNU General Public License v2
82 +
83 +# Mask multilib, since we do not want to use it.
84 +multilib
85 +
86 +# Mask the other multilib flags back for non-multilib profile.
87 +abi_riscv_lp64d
88 +abi_riscv_lp64
89 +abi_riscv_ilp32d
90
91 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/eapi b/profiles/arch/riscv/rv32imac/ilp32d/eapi
92 new file mode 100644
93 index 0000000..7ed6ff8
94 --- /dev/null
95 +++ b/profiles/arch/riscv/rv32imac/ilp32d/eapi
96 @@ -0,0 +1 @@
97 +5
98
99 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
100 new file mode 100644
101 index 0000000..3354876
102 --- /dev/null
103 +++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
104 @@ -0,0 +1,15 @@
105 +# Copyright 2019 Gentoo Authors
106 +# Distributed under the terms of the GNU General Public License v2
107 +
108 +# RISC-V rv64gc/lp64d no-multilib profile
109 +
110 +CFLAGS="-O2 -pipe -march=rv32imacdf -mabi=ilp32d"
111 +CXXFLAGS="${CFLAGS}"
112 +FFLAGS="${CFLAGS}"
113 +FCFLAGS="${CFLAGS}"
114 +
115 +# We have only one ABI
116 +MULTILIB_ABIS="ilp32d"
117 +
118 +# We hide the useflags for the ABIs
119 +USE_EXPAND_HIDDEN="ABI_RISCV"
120
121 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
122 new file mode 100644
123 index 0000000..cf764cd
124 --- /dev/null
125 +++ b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
126 @@ -0,0 +1,5 @@
127 +# Copyright 2019 Gentoo Authors
128 +# Distributed under the terms of the GNU General Public License v2
129 +
130 +# Undo multilib forcing.
131 +sys-apps/sandbox -abi_riscv_lp64d -abi_riscv_lp64 -abi_riscv_ilp32
132
133 diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
134 new file mode 100644
135 index 0000000..b2c900d
136 --- /dev/null
137 +++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
138 @@ -0,0 +1,10 @@
139 +# Copyright 2019 Gentoo Authors
140 +# Distributed under the terms of the GNU General Public License v2
141 +
142 +# Mask multilib, since we do not want to use it.
143 +multilib
144 +
145 +# Mask the other multilib flags back for non-multilib profile.
146 +abi_riscv_lp64d
147 +abi_riscv_lp64
148 +abi_riscv_ilp32