1 |
commit: 88a020c8438369bdfc9e8d44fe9a0a0689588f19 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 23 21:07:48 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 2 11:18:55 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a020c8 |
7 |
|
8 |
profiles: consolidate arch/riscv files |
9 |
|
10 |
Now this is the big and ugly one. Since the 17.0 profiles are gone now, we can |
11 |
simplify... |
12 |
|
13 |
* All information from riscv/rv32imac and riscv/rv64gc is moved into their |
14 |
subdirs; these two are not valid profile dirs anymore. |
15 |
* A new subdir riscv/rv64gc/lp64d-multilib is created as replacement. |
16 |
* We do not by default pull in multilib and disable it then everywhere anymore. |
17 |
Instead we only pull in multilib in the riscv/rv64gc/lp64d-multilib dir. |
18 |
|
19 |
* The make.defaults in riscv specifies the two-level libdirs used ONLY |
20 |
for multilib secondary ABI (i.e. in practice never except when experimenting). |
21 |
The libdir for the primary, default ABI MUST be overridden in the specific |
22 |
profile to a single-level path. |
23 |
* This makes the need for the 1level directory go away. |
24 |
|
25 |
* We use for the default ABI "lib64" (64bit) or "lib" (32bit) to keep the |
26 |
structure of other arches, as also stated in the specs as fallback. |
27 |
Note that the 2-level libdirs for 32bit remain lib32/*; using lib/* here |
28 |
does not work. |
29 |
|
30 |
* default/linux/riscv now pulls in arch/riscv, |
31 |
default/linux/riscv/20.0/rv64gc and default/linux/riscv/20.0/rv32imac |
32 |
build on that but add no further arch dir. |
33 |
|
34 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
35 |
|
36 |
profiles/arch/riscv/1level/make.defaults | 7 ------- |
37 |
profiles/arch/riscv/1level/package.mask | 5 ----- |
38 |
profiles/arch/riscv/1level/package.unmask | 5 ----- |
39 |
profiles/arch/riscv/make.defaults | 12 +++++++++++- |
40 |
profiles/arch/riscv/package.mask | 6 +++--- |
41 |
profiles/arch/riscv/rv32imac/eapi | 1 - |
42 |
profiles/arch/riscv/rv32imac/ilp32/make.defaults | 12 ++++++++++-- |
43 |
profiles/arch/riscv/rv32imac/{ => ilp32}/package.mask | 0 |
44 |
profiles/arch/riscv/rv32imac/ilp32/package.use.force | 3 --- |
45 |
profiles/arch/riscv/rv32imac/ilp32/use.force | 2 -- |
46 |
profiles/arch/riscv/rv32imac/ilp32/use.mask | 6 +++--- |
47 |
profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 13 +++++++++---- |
48 |
profiles/arch/riscv/rv32imac/{ => ilp32d}/package.mask | 0 |
49 |
profiles/arch/riscv/rv32imac/ilp32d/package.use.force | 2 -- |
50 |
profiles/arch/riscv/rv32imac/ilp32d/use.mask | 4 ++-- |
51 |
profiles/arch/riscv/rv32imac/parent | 2 -- |
52 |
profiles/arch/riscv/rv32imac/use.force | 2 -- |
53 |
profiles/arch/riscv/rv32imac/use.mask | 5 ----- |
54 |
profiles/arch/riscv/rv64gc/eapi | 1 - |
55 |
profiles/arch/riscv/rv64gc/lp64/make.defaults | 13 ++++++++----- |
56 |
profiles/arch/riscv/rv64gc/lp64/package.use.force | 2 -- |
57 |
profiles/arch/riscv/rv64gc/lp64/use.force | 2 -- |
58 |
profiles/arch/riscv/rv64gc/lp64/use.mask | 5 ----- |
59 |
profiles/arch/riscv/{1level => rv64gc/lp64d-multilib}/eapi | 0 |
60 |
.../arch/riscv/rv64gc/{ => lp64d-multilib}/make.defaults | 5 ++++- |
61 |
profiles/arch/riscv/rv64gc/lp64d-multilib/parent | 1 + |
62 |
profiles/arch/riscv/rv64gc/lp64d/make.defaults | 13 +++++++++---- |
63 |
profiles/arch/riscv/rv64gc/lp64d/package.use.force | 2 -- |
64 |
profiles/arch/riscv/rv64gc/lp64d/use.mask | 5 ----- |
65 |
profiles/arch/riscv/rv64gc/parent | 2 -- |
66 |
profiles/arch/riscv/rv64gc/use.force | 2 -- |
67 |
profiles/arch/riscv/rv64gc/use.mask | 2 -- |
68 |
profiles/default/linux/riscv/20.0/rv32imac/parent | 2 -- |
69 |
.../default/linux/riscv/20.0/rv64gc/multilib/make.defaults | 10 ---------- |
70 |
profiles/default/linux/riscv/20.0/rv64gc/multilib/parent | 1 + |
71 |
profiles/default/linux/riscv/20.0/rv64gc/parent | 2 -- |
72 |
profiles/default/linux/riscv/parent | 1 + |
73 |
37 files changed, 62 insertions(+), 96 deletions(-) |
74 |
|
75 |
diff --git a/profiles/arch/riscv/1level/make.defaults b/profiles/arch/riscv/1level/make.defaults |
76 |
deleted file mode 100644 |
77 |
index 2a8d8bdc9bb3..000000000000 |
78 |
--- a/profiles/arch/riscv/1level/make.defaults |
79 |
+++ /dev/null |
80 |
@@ -1,7 +0,0 @@ |
81 |
-# Copyright 2021 Gentoo Authors |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
- |
84 |
-LIBDIR_lp64d="lib64" |
85 |
-LIBDIR_lp64="lib64" |
86 |
-LIBDIR_ilp32d="lib" |
87 |
-LIBDIR_ilp32="lib" |
88 |
|
89 |
diff --git a/profiles/arch/riscv/1level/package.mask b/profiles/arch/riscv/1level/package.mask |
90 |
deleted file mode 100644 |
91 |
index eb4368881cc3..000000000000 |
92 |
--- a/profiles/arch/riscv/1level/package.mask |
93 |
+++ /dev/null |
94 |
@@ -1,5 +0,0 @@ |
95 |
-# Copyright 2021 Gentoo Authors |
96 |
-# Distributed under the terms of the GNU General Public License v2 |
97 |
- |
98 |
-# Doesnt work properly with the one-level libdirs |
99 |
-<sys-apps/baselayout-2.7-r3 |
100 |
|
101 |
diff --git a/profiles/arch/riscv/1level/package.unmask b/profiles/arch/riscv/1level/package.unmask |
102 |
deleted file mode 100644 |
103 |
index 61bf895f5679..000000000000 |
104 |
--- a/profiles/arch/riscv/1level/package.unmask |
105 |
+++ /dev/null |
106 |
@@ -1,5 +0,0 @@ |
107 |
-# Copyright 2021 Gentoo Authors |
108 |
-# Distributed under the terms of the GNU General Public License v2 |
109 |
- |
110 |
-# Does work properly with the one-level libdirs |
111 |
-<dev-lang/python-3.7 |
112 |
|
113 |
diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults |
114 |
index 3a7d4ac18e7f..6006d582a10a 100644 |
115 |
--- a/profiles/arch/riscv/make.defaults |
116 |
+++ b/profiles/arch/riscv/make.defaults |
117 |
@@ -15,6 +15,15 @@ FCFLAGS="${CFLAGS}" |
118 |
|
119 |
SYMLINK_LIB="no" |
120 |
|
121 |
+# Note about LIBDIR_*: |
122 |
+# 1) To keep in step with other arches and distributions we use "lib" for 32bit |
123 |
+# and "lib64" for 64bit for the *default* ABI. |
124 |
+# NOT the two level dirs from the specification, and NOT lib32 as specified |
125 |
+# as 32bit fallback. |
126 |
+# 2) The LIBDIRs provided *here* are the ones for secondary ABI in the multilib |
127 |
+# case. |
128 |
+# The LIBDIR for the *primary* ABI MUST be overridden in an inheriting profile. |
129 |
+ |
130 |
# Flags for lp64d |
131 |
LIBDIR_lp64d="lib64/lp64d" |
132 |
CFLAGS_lp64d="-mabi=lp64d" |
133 |
@@ -42,7 +51,8 @@ CHOST_ilp32="riscv32-unknown-linux-gnu" |
134 |
# Since many people will want to test this in qemu... |
135 |
FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox" |
136 |
|
137 |
-# The following stuff is, e.g., defined in subdirs: |
138 |
+# The following stuff MUST be defined in subdirs: |
139 |
# ABI |
140 |
# DEFAULT_ABI |
141 |
# MULTILIB_ABIS |
142 |
+# LIBDIR_* for DEFAULT_ABI |
143 |
|
144 |
diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask |
145 |
index 43580b7b49a0..3b8aa5520537 100644 |
146 |
--- a/profiles/arch/riscv/package.mask |
147 |
+++ b/profiles/arch/riscv/package.mask |
148 |
@@ -1,5 +1,5 @@ |
149 |
-# Copyright 2019 Gentoo Authors |
150 |
+# Copyright 2019-2021 Gentoo Authors |
151 |
# Distributed under the terms of the GNU General Public License v2 |
152 |
|
153 |
-# Doesnt work properly with the two-level libdirs |
154 |
-<dev-lang/python-3.7 |
155 |
+# Doesnt work properly with the one-level libdirs |
156 |
+<sys-apps/baselayout-2.7-r3 |
157 |
|
158 |
diff --git a/profiles/arch/riscv/rv32imac/eapi b/profiles/arch/riscv/rv32imac/eapi |
159 |
deleted file mode 100644 |
160 |
index 7ed6ff82de6b..000000000000 |
161 |
--- a/profiles/arch/riscv/rv32imac/eapi |
162 |
+++ /dev/null |
163 |
@@ -1 +0,0 @@ |
164 |
-5 |
165 |
|
166 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults |
167 |
index 1065af43c9a8..702bf0db5663 100644 |
168 |
--- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults |
169 |
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults |
170 |
@@ -1,9 +1,17 @@ |
171 |
-# Copyright 2019 Gentoo Authors |
172 |
+# Copyright 2019-2021 Gentoo Authors |
173 |
# Distributed under the terms of the GNU General Public License v2 |
174 |
|
175 |
# RISC-V rv32imac/ilp32 no-multilib profile |
176 |
|
177 |
-# We have only one ABI |
178 |
+CHOST="riscv32-unknown-linux-gnu" |
179 |
+ |
180 |
MULTILIB_ABIS="ilp32" |
181 |
DEFAULT_ABI="ilp32" |
182 |
ABI="ilp32" |
183 |
+ |
184 |
+LIBDIR_ilp32="lib" |
185 |
+ |
186 |
+CFLAGS="-O2 -pipe -march=rv32imac -mabi=ilp32" |
187 |
+CXXFLAGS="${CFLAGS}" |
188 |
+FFLAGS="${CFLAGS}" |
189 |
+FCFLAGS="${CFLAGS}" |
190 |
|
191 |
diff --git a/profiles/arch/riscv/rv32imac/package.mask b/profiles/arch/riscv/rv32imac/ilp32/package.mask |
192 |
similarity index 100% |
193 |
copy from profiles/arch/riscv/rv32imac/package.mask |
194 |
copy to profiles/arch/riscv/rv32imac/ilp32/package.mask |
195 |
|
196 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force |
197 |
deleted file mode 100644 |
198 |
index aacc29b1d56e..000000000000 |
199 |
--- a/profiles/arch/riscv/rv32imac/ilp32/package.use.force |
200 |
+++ /dev/null |
201 |
@@ -1,3 +0,0 @@ |
202 |
-# Copyright 2019 Gentoo Authors |
203 |
-# Distributed under the terms of the GNU General Public License v2 |
204 |
- |
205 |
|
206 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force |
207 |
deleted file mode 100644 |
208 |
index 82bb958a577a..000000000000 |
209 |
--- a/profiles/arch/riscv/rv32imac/ilp32/use.force |
210 |
+++ /dev/null |
211 |
@@ -1,2 +0,0 @@ |
212 |
-# Copyright 2020 Gentoo Authors |
213 |
-# Distributed under the terms of the GNU General Public License v2 |
214 |
|
215 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask |
216 |
index 991c792750ad..9779cbad81b5 100644 |
217 |
--- a/profiles/arch/riscv/rv32imac/ilp32/use.mask |
218 |
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask |
219 |
@@ -1,5 +1,5 @@ |
220 |
-# Copyright 2019 Gentoo Authors |
221 |
+# Copyright 2019-2020 Gentoo Authors |
222 |
# Distributed under the terms of the GNU General Public License v2 |
223 |
|
224 |
-# Mask multilib, since we do not want to use it. |
225 |
-multilib |
226 |
+# sys-libs/libseccomp has not been ported to rv32 yet |
227 |
+seccomp |
228 |
|
229 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults |
230 |
index d19b0ba49931..d21fdce62781 100644 |
231 |
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults |
232 |
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults |
233 |
@@ -1,12 +1,17 @@ |
234 |
-# Copyright 2019 Gentoo Authors |
235 |
+# Copyright 2019-2021 Gentoo Authors |
236 |
# Distributed under the terms of the GNU General Public License v2 |
237 |
|
238 |
# RISC-V rv32imac/ilp32d no-multilib profile |
239 |
|
240 |
+CHOST="riscv32-unknown-linux-gnu" |
241 |
+ |
242 |
+MULTILIB_ABIS="ilp32d" |
243 |
+DEFAULT_ABI="ilp32d" |
244 |
+ABI="ilp32d" |
245 |
+ |
246 |
+LIBDIR_ilp32d="lib" |
247 |
+ |
248 |
CFLAGS="-O2 -pipe -march=rv32imafdc -mabi=ilp32d" |
249 |
CXXFLAGS="${CFLAGS}" |
250 |
FFLAGS="${CFLAGS}" |
251 |
FCFLAGS="${CFLAGS}" |
252 |
- |
253 |
-# We have only one ABI |
254 |
-MULTILIB_ABIS="ilp32d" |
255 |
|
256 |
diff --git a/profiles/arch/riscv/rv32imac/package.mask b/profiles/arch/riscv/rv32imac/ilp32d/package.mask |
257 |
similarity index 100% |
258 |
rename from profiles/arch/riscv/rv32imac/package.mask |
259 |
rename to profiles/arch/riscv/rv32imac/ilp32d/package.mask |
260 |
|
261 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force |
262 |
deleted file mode 100644 |
263 |
index 9de5ab734497..000000000000 |
264 |
--- a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force |
265 |
+++ /dev/null |
266 |
@@ -1,2 +0,0 @@ |
267 |
-# Copyright 2019-2020 Gentoo Authors |
268 |
-# Distributed under the terms of the GNU General Public License v2 |
269 |
|
270 |
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask |
271 |
index d8172baa5f5f..9779cbad81b5 100644 |
272 |
--- a/profiles/arch/riscv/rv32imac/ilp32d/use.mask |
273 |
+++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask |
274 |
@@ -1,5 +1,5 @@ |
275 |
# Copyright 2019-2020 Gentoo Authors |
276 |
# Distributed under the terms of the GNU General Public License v2 |
277 |
|
278 |
-# Mask multilib, since we do not want to use it. |
279 |
-multilib |
280 |
+# sys-libs/libseccomp has not been ported to rv32 yet |
281 |
+seccomp |
282 |
|
283 |
diff --git a/profiles/arch/riscv/rv32imac/parent b/profiles/arch/riscv/rv32imac/parent |
284 |
deleted file mode 100644 |
285 |
index 6ee1b9eff10c..000000000000 |
286 |
--- a/profiles/arch/riscv/rv32imac/parent |
287 |
+++ /dev/null |
288 |
@@ -1,2 +0,0 @@ |
289 |
-.. |
290 |
-../../../features/multilib |
291 |
|
292 |
diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force |
293 |
deleted file mode 100644 |
294 |
index 9de5ab734497..000000000000 |
295 |
--- a/profiles/arch/riscv/rv32imac/use.force |
296 |
+++ /dev/null |
297 |
@@ -1,2 +0,0 @@ |
298 |
-# Copyright 2019-2020 Gentoo Authors |
299 |
-# Distributed under the terms of the GNU General Public License v2 |
300 |
|
301 |
diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/use.mask |
302 |
deleted file mode 100644 |
303 |
index 9779cbad81b5..000000000000 |
304 |
--- a/profiles/arch/riscv/rv32imac/use.mask |
305 |
+++ /dev/null |
306 |
@@ -1,5 +0,0 @@ |
307 |
-# Copyright 2019-2020 Gentoo Authors |
308 |
-# Distributed under the terms of the GNU General Public License v2 |
309 |
- |
310 |
-# sys-libs/libseccomp has not been ported to rv32 yet |
311 |
-seccomp |
312 |
|
313 |
diff --git a/profiles/arch/riscv/rv64gc/eapi b/profiles/arch/riscv/rv64gc/eapi |
314 |
deleted file mode 100644 |
315 |
index 7ed6ff82de6b..000000000000 |
316 |
--- a/profiles/arch/riscv/rv64gc/eapi |
317 |
+++ /dev/null |
318 |
@@ -1 +0,0 @@ |
319 |
-5 |
320 |
|
321 |
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults |
322 |
index 4aeb573215d2..e811f8eb643a 100644 |
323 |
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults |
324 |
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults |
325 |
@@ -3,12 +3,15 @@ |
326 |
|
327 |
# RISC-V rv64gc/lp64 no-multilib profile |
328 |
|
329 |
-CFLAGS="-O2 -pipe" |
330 |
-CXXFLAGS="${CFLAGS}" |
331 |
-FFLAGS="${CFLAGS}" |
332 |
-FCFLAGS="${CFLAGS}" |
333 |
+CHOST="riscv64-unknown-linux-gnu" |
334 |
|
335 |
-# We have only one ABI |
336 |
MULTILIB_ABIS="lp64" |
337 |
DEFAULT_ABI="lp64" |
338 |
ABI="lp64" |
339 |
+ |
340 |
+LIBDIR_lp64="lib64" |
341 |
+ |
342 |
+CFLAGS="-O2 -pipe -march=rv64imac -mabi=lp64" |
343 |
+CXXFLAGS="${CFLAGS}" |
344 |
+FFLAGS="${CFLAGS}" |
345 |
+FCFLAGS="${CFLAGS}" |
346 |
|
347 |
diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force b/profiles/arch/riscv/rv64gc/lp64/package.use.force |
348 |
deleted file mode 100644 |
349 |
index 9de5ab734497..000000000000 |
350 |
--- a/profiles/arch/riscv/rv64gc/lp64/package.use.force |
351 |
+++ /dev/null |
352 |
@@ -1,2 +0,0 @@ |
353 |
-# Copyright 2019-2020 Gentoo Authors |
354 |
-# Distributed under the terms of the GNU General Public License v2 |
355 |
|
356 |
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force b/profiles/arch/riscv/rv64gc/lp64/use.force |
357 |
deleted file mode 100644 |
358 |
index 9de5ab734497..000000000000 |
359 |
--- a/profiles/arch/riscv/rv64gc/lp64/use.force |
360 |
+++ /dev/null |
361 |
@@ -1,2 +0,0 @@ |
362 |
-# Copyright 2019-2020 Gentoo Authors |
363 |
-# Distributed under the terms of the GNU General Public License v2 |
364 |
|
365 |
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask |
366 |
deleted file mode 100644 |
367 |
index d8172baa5f5f..000000000000 |
368 |
--- a/profiles/arch/riscv/rv64gc/lp64/use.mask |
369 |
+++ /dev/null |
370 |
@@ -1,5 +0,0 @@ |
371 |
-# Copyright 2019-2020 Gentoo Authors |
372 |
-# Distributed under the terms of the GNU General Public License v2 |
373 |
- |
374 |
-# Mask multilib, since we do not want to use it. |
375 |
-multilib |
376 |
|
377 |
diff --git a/profiles/arch/riscv/1level/eapi b/profiles/arch/riscv/rv64gc/lp64d-multilib/eapi |
378 |
similarity index 100% |
379 |
rename from profiles/arch/riscv/1level/eapi |
380 |
rename to profiles/arch/riscv/rv64gc/lp64d-multilib/eapi |
381 |
|
382 |
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults |
383 |
similarity index 72% |
384 |
rename from profiles/arch/riscv/rv64gc/make.defaults |
385 |
rename to profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults |
386 |
index e35f63c8d1e1..3546d506abb7 100644 |
387 |
--- a/profiles/arch/riscv/rv64gc/make.defaults |
388 |
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults |
389 |
@@ -3,7 +3,7 @@ |
390 |
|
391 |
# RISC-V profile for rv64gc multilib |
392 |
# |
393 |
-# This immediate profile is ONLY useful for internal purposes; it can generate |
394 |
+# This profile is ONLY useful for internal purposes; it can generate |
395 |
# stages just fine, but the only "hardware" that can run them is qemu-user ... |
396 |
|
397 |
CHOST="riscv64-unknown-linux-gnu" |
398 |
@@ -12,3 +12,6 @@ CHOST="riscv64-unknown-linux-gnu" |
399 |
MULTILIB_ABIS="lp64d lp64 ilp32d ilp32" |
400 |
DEFAULT_ABI="lp64d" |
401 |
ABI="lp64d" |
402 |
+ |
403 |
+# One-level dir for the default abi |
404 |
+LIBDIR_lp64d="lib64" |
405 |
|
406 |
diff --git a/profiles/arch/riscv/rv64gc/lp64d-multilib/parent b/profiles/arch/riscv/rv64gc/lp64d-multilib/parent |
407 |
new file mode 100644 |
408 |
index 000000000000..d6e19b529616 |
409 |
--- /dev/null |
410 |
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/parent |
411 |
@@ -0,0 +1 @@ |
412 |
+../../../../features/multilib |
413 |
|
414 |
diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults |
415 |
index f595f6ac4437..80a9bdad63ee 100644 |
416 |
--- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults |
417 |
+++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults |
418 |
@@ -1,12 +1,17 @@ |
419 |
-# Copyright 2019 Gentoo Authors |
420 |
+# Copyright 2019-2021 Gentoo Authors |
421 |
# Distributed under the terms of the GNU General Public License v2 |
422 |
|
423 |
# RISC-V rv64gc/lp64d no-multilib profile |
424 |
|
425 |
+CHOST="riscv64-unknown-linux-gnu" |
426 |
+ |
427 |
+MULTILIB_ABIS="lp64d" |
428 |
+DEFAULT_ABI="lp64d" |
429 |
+ABI="lp64d" |
430 |
+ |
431 |
+LIBDIR_lp64d="lib64" |
432 |
+ |
433 |
CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64d" |
434 |
CXXFLAGS="${CFLAGS}" |
435 |
FFLAGS="${CFLAGS}" |
436 |
FCFLAGS="${CFLAGS}" |
437 |
- |
438 |
-# We have only one ABI |
439 |
-MULTILIB_ABIS="lp64d" |
440 |
|
441 |
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/profiles/arch/riscv/rv64gc/lp64d/package.use.force |
442 |
deleted file mode 100644 |
443 |
index 9de5ab734497..000000000000 |
444 |
--- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force |
445 |
+++ /dev/null |
446 |
@@ -1,2 +0,0 @@ |
447 |
-# Copyright 2019-2020 Gentoo Authors |
448 |
-# Distributed under the terms of the GNU General Public License v2 |
449 |
|
450 |
diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask |
451 |
deleted file mode 100644 |
452 |
index 991c792750ad..000000000000 |
453 |
--- a/profiles/arch/riscv/rv64gc/lp64d/use.mask |
454 |
+++ /dev/null |
455 |
@@ -1,5 +0,0 @@ |
456 |
-# Copyright 2019 Gentoo Authors |
457 |
-# Distributed under the terms of the GNU General Public License v2 |
458 |
- |
459 |
-# Mask multilib, since we do not want to use it. |
460 |
-multilib |
461 |
|
462 |
diff --git a/profiles/arch/riscv/rv64gc/parent b/profiles/arch/riscv/rv64gc/parent |
463 |
deleted file mode 100644 |
464 |
index 6ee1b9eff10c..000000000000 |
465 |
--- a/profiles/arch/riscv/rv64gc/parent |
466 |
+++ /dev/null |
467 |
@@ -1,2 +0,0 @@ |
468 |
-.. |
469 |
-../../../features/multilib |
470 |
|
471 |
diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force |
472 |
deleted file mode 100644 |
473 |
index 9de5ab734497..000000000000 |
474 |
--- a/profiles/arch/riscv/rv64gc/use.force |
475 |
+++ /dev/null |
476 |
@@ -1,2 +0,0 @@ |
477 |
-# Copyright 2019-2020 Gentoo Authors |
478 |
-# Distributed under the terms of the GNU General Public License v2 |
479 |
|
480 |
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask |
481 |
deleted file mode 100644 |
482 |
index 9de5ab734497..000000000000 |
483 |
--- a/profiles/arch/riscv/rv64gc/use.mask |
484 |
+++ /dev/null |
485 |
@@ -1,2 +0,0 @@ |
486 |
-# Copyright 2019-2020 Gentoo Authors |
487 |
-# Distributed under the terms of the GNU General Public License v2 |
488 |
|
489 |
diff --git a/profiles/default/linux/riscv/20.0/rv32imac/parent b/profiles/default/linux/riscv/20.0/rv32imac/parent |
490 |
index 4e6e3225bf31..b8f5b5cbc9d2 100644 |
491 |
--- a/profiles/default/linux/riscv/20.0/rv32imac/parent |
492 |
+++ b/profiles/default/linux/riscv/20.0/rv32imac/parent |
493 |
@@ -1,4 +1,2 @@ |
494 |
../.. |
495 |
-../../../../../arch/riscv/rv32imac |
496 |
../../../../../releases/17.0 |
497 |
-../../../../../arch/riscv/1level |
498 |
|
499 |
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults b/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults |
500 |
deleted file mode 100644 |
501 |
index 42e660f1a345..000000000000 |
502 |
--- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults |
503 |
+++ /dev/null |
504 |
@@ -1,10 +0,0 @@ |
505 |
-# Copyright 2021 Gentoo Authors |
506 |
-# Distributed under the terms of the GNU General Public License v2 |
507 |
- |
508 |
-# we need to reset the two-level libdirs here, otherwise the one-level |
509 |
-# paths lead to collisions... note that the default abi libdir remains |
510 |
-# "lib64" |
511 |
- |
512 |
-LIBDIR_lp64="lib64/lp64" |
513 |
-LIBDIR_ilp32d="lib32/ilp32d" |
514 |
-LIBDIR_ilp32="lib32/ilp32" |
515 |
|
516 |
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent |
517 |
index f3229c5b9876..eef8b55d0efc 100644 |
518 |
--- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent |
519 |
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent |
520 |
@@ -1 +1,2 @@ |
521 |
.. |
522 |
+../../../../../../arch/riscv/rv64gc/lp64d-multilib |
523 |
|
524 |
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/parent b/profiles/default/linux/riscv/20.0/rv64gc/parent |
525 |
index 0f380a1962bb..b8f5b5cbc9d2 100644 |
526 |
--- a/profiles/default/linux/riscv/20.0/rv64gc/parent |
527 |
+++ b/profiles/default/linux/riscv/20.0/rv64gc/parent |
528 |
@@ -1,4 +1,2 @@ |
529 |
../.. |
530 |
-../../../../../arch/riscv/rv64gc |
531 |
../../../../../releases/17.0 |
532 |
-../../../../../arch/riscv/1level |
533 |
|
534 |
diff --git a/profiles/default/linux/riscv/parent b/profiles/default/linux/riscv/parent |
535 |
index 9f9d2cbed246..1f65d976126f 100644 |
536 |
--- a/profiles/default/linux/riscv/parent |
537 |
+++ b/profiles/default/linux/riscv/parent |
538 |
@@ -1,2 +1,3 @@ |
539 |
../../../base |
540 |
.. |
541 |
+../../../arch/riscv |