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/rv64gc/, profiles/arch/riscv/
Date: Sat, 05 Sep 2020 15:21:48
Message-Id: 1599316646.7d1b4e4b0bdc9988b448ec6dc487e3a361b6b77c.dilfridge@gentoo
1 commit: 7d1b4e4b0bdc9988b448ec6dc487e3a361b6b77c
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 5 14:37:26 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 5 14:37:26 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=7d1b4e4b
7
8 Move as many settings as possible from riscv/rv64gc to riscv
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 profiles/arch/riscv/make.defaults | 39 +++++++++++++++++++++------
13 profiles/arch/riscv/{rv64gc => }/package.mask | 0
14 profiles/arch/riscv/rv64gc/make.defaults | 32 +---------------------
15 profiles/arch/riscv/rv64gc/use.force | 4 ---
16 profiles/arch/riscv/rv64gc/use.mask | 6 -----
17 profiles/arch/riscv/use.force | 4 +++
18 profiles/arch/riscv/use.mask | 6 +++++
19 7 files changed, 42 insertions(+), 49 deletions(-)
20
21 diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults
22 index bae66d7..3a7d4ac 100644
23 --- a/profiles/arch/riscv/make.defaults
24 +++ b/profiles/arch/riscv/make.defaults
25 @@ -1,25 +1,48 @@
26 # Copyright 2019 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -# Main RISC-V profile directory.
30 +# Main RISC-V profile directory. Common settings for all riscv profiles.
31
32 # This is not a complete profile. Use the subdirectories!
33
34 ARCH="riscv"
35 ACCEPT_KEYWORDS="riscv ~riscv"
36
37 -CHOST="riscv64-unknown-linux-gnu"
38 +CFLAGS="-O2 -pipe"
39 +CXXFLAGS="${CFLAGS}"
40 +FFLAGS="${CFLAGS}"
41 +FCFLAGS="${CFLAGS}"
42 +
43 +SYMLINK_LIB="no"
44 +
45 +# Flags for lp64d
46 +LIBDIR_lp64d="lib64/lp64d"
47 +CFLAGS_lp64d="-mabi=lp64d"
48 +LDFLAGS_lp64d="-m elf64lriscv"
49 +CHOST_lp64d="riscv64-unknown-linux-gnu"
50 +
51 +# Flags for lp64
52 +LIBDIR_lp64="lib64/lp64"
53 +CFLAGS_lp64="-mabi=lp64"
54 +LDFLAGS_lp64="-m elf64lriscv_lp64"
55 +CHOST_lp64="riscv64-unknown-linux-gnu"
56 +
57 +# Flags for ilp32d
58 +LIBDIR_ilp32d="lib32/ilp32d"
59 +CFLAGS_ilp32d="-mabi=ilp32d -march=rv32imafdc"
60 +LDFLAGS_ilp32d="-m elf32lriscv"
61 +CHOST_ilp32d="riscv32-unknown-linux-gnu"
62 +
63 +# Flags for ilp32
64 +LIBDIR_ilp32="lib32/ilp32"
65 +CFLAGS_ilp32="-mabi=ilp32 -march=rv32imac"
66 +LDFLAGS_ilp32="-m elf32lriscv_ilp32"
67 +CHOST_ilp32="riscv32-unknown-linux-gnu"
68
69 # Since many people will want to test this in qemu...
70 FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
71
72 # The following stuff is, e.g., defined in subdirs:
73 -# CFLAGS
74 -# CXXFLAGS
75 -# FFLAGS
76 -# FCFLAGS
77 # ABI
78 # DEFAULT_ABI
79 # MULTILIB_ABIS
80 -# CHOST_riscv
81 -# LIBDIR_riscv
82
83 diff --git a/profiles/arch/riscv/rv64gc/package.mask b/profiles/arch/riscv/package.mask
84 similarity index 100%
85 rename from profiles/arch/riscv/rv64gc/package.mask
86 rename to profiles/arch/riscv/package.mask
87
88 diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/make.defaults
89 index efa94c7..a5963cb 100644
90 --- a/profiles/arch/riscv/rv64gc/make.defaults
91 +++ b/profiles/arch/riscv/rv64gc/make.defaults
92 @@ -6,43 +6,13 @@
93 # This immediate profile is ONLY useful for internal purposes; it can generate
94 # stages just fine, but the only "hardware" that can run them is qemu-user ...
95
96 -CFLAGS="-O2 -pipe"
97 -CXXFLAGS="${CFLAGS}"
98 -FFLAGS="${CFLAGS}"
99 -FCFLAGS="${CFLAGS}"
100 +CHOST="riscv64-unknown-linux-gnu"
101
102 # Multilib ABIs
103 MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
104 DEFAULT_ABI="lp64d"
105 ABI="lp64d"
106
107 -# Library directories
108 -LIBDIR_lp64d="lib64/lp64d"
109 -LIBDIR_lp64="lib64/lp64"
110 -LIBDIR_ilp32d="lib32/ilp32d"
111 -LIBDIR_ilp32="lib32/ilp32"
112 -SYMLINK_LIB="no"
113 -
114 -# Flags for lp64d
115 -CFLAGS_lp64d="-mabi=lp64d"
116 -LDFLAGS_lp64d="-m elf64lriscv"
117 -CHOST_lp64d="riscv64-unknown-linux-gnu"
118 -
119 -# Flags for lp64
120 -CFLAGS_lp64="-mabi=lp64"
121 -LDFLAGS_lp64="-m elf64lriscv_lp64"
122 -CHOST_lp64="riscv64-unknown-linux-gnu"
123 -
124 -# Flags for ilp32d
125 -CFLAGS_ilp32d="-mabi=ilp32d -march=rv32imafdc"
126 -LDFLAGS_ilp32d="-m elf32lriscv"
127 -CHOST_ilp32d="riscv32-unknown-linux-gnu"
128 -
129 -# Flags for ilp32
130 -CFLAGS_ilp32="-mabi=ilp32 -march=rv32imac"
131 -LDFLAGS_ilp32="-m elf32lriscv_ilp32"
132 -CHOST_ilp32="riscv32-unknown-linux-gnu"
133 -
134 # Enable lp64d by default
135 ABI_RISCV="lp64d"
136
137
138 diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force
139 index 7ce55a8..eb2add7 100644
140 --- a/profiles/arch/riscv/rv64gc/use.force
141 +++ b/profiles/arch/riscv/rv64gc/use.force
142 @@ -3,7 +3,3 @@
143
144 # Force the flag corresponding to the default ABI.
145 abi_riscv_lp64d
146 -
147 -# Right now we have only one Python available, so we must use it
148 -python_targets_python3_7
149 -python_single_target_python3_7
150
151 diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
152 index 6e01a57..eed1c21 100644
153 --- a/profiles/arch/riscv/rv64gc/use.mask
154 +++ b/profiles/arch/riscv/rv64gc/use.mask
155 @@ -4,9 +4,3 @@
156 # Unmask the multilib flags for this arch.
157 -abi_riscv_lp64d
158 -abi_riscv_lp64
159 -
160 -# Our Python has a lot of trouble with the two-level libdir.
161 -python_targets_python2_7
162 -python_targets_python3_6
163 -python_single_target_python2_7
164 -python_single_target_python3_6
165
166 diff --git a/profiles/arch/riscv/use.force b/profiles/arch/riscv/use.force
167 index 5e5e335..d97bd12 100644
168 --- a/profiles/arch/riscv/use.force
169 +++ b/profiles/arch/riscv/use.force
170 @@ -3,3 +3,7 @@
171
172 # Force the flag which corresponds to ARCH.
173 riscv
174 +
175 +# Right now we have only one Python available, so we must use it
176 +python_targets_python3_7
177 +python_single_target_python3_7
178
179 diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
180 index f719211..3003db9 100644
181 --- a/profiles/arch/riscv/use.mask
182 +++ b/profiles/arch/riscv/use.mask
183 @@ -4,6 +4,12 @@
184 # Unmask the flag which corresponds to ARCH.
185 -riscv
186
187 +# Our Python has a lot of trouble with the two-level libdir.
188 +python_targets_python2_7
189 +python_targets_python3_6
190 +python_single_target_python2_7
191 +python_single_target_python3_6
192 +
193 # Ben Kohler <bkohler@g.o> (2019-01-09)
194 # no fam providers keyworded yet
195 fam