diff options
Diffstat (limited to 'meta/recipes-devtools')
209 files changed, 1559 insertions, 6440 deletions
diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index fb4ff899d2..68bd7c5407 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb | |||
@@ -49,7 +49,7 @@ DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" | |||
49 | 49 | ||
50 | EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ | 50 | EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ |
51 | -DDPKG_DATADIR=${datadir}/dpkg \ | 51 | -DDPKG_DATADIR=${datadir}/dpkg \ |
52 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ | 52 | -DTRIEHASH_EXECUTABLE=${UNPACKDIR}/triehash \ |
53 | -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ | 53 | -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ |
54 | -DCMAKE_DISABLE_FIND_PACKAGE_SECCOMP=True \ | 54 | -DCMAKE_DISABLE_FIND_PACKAGE_SECCOMP=True \ |
55 | -DWITH_TESTS=False \ | 55 | -DWITH_TESTS=False \ |
diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc index 3b6f47d4ce..d4e94d0162 100644 --- a/meta/recipes-devtools/binutils/binutils-2.42.inc +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc | |||
@@ -20,7 +20,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" | |||
20 | 20 | ||
21 | CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" | 21 | CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier" |
22 | 22 | ||
23 | SRCREV ?= "553c7f61b74badf91df484450944675efd9cd485" | 23 | SRCREV ?= "73b22b4481e85635eb978585f405c4433bcc0174" |
24 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" | 24 | BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https" |
25 | SRC_URI = "\ | 25 | SRC_URI = "\ |
26 | ${BINUTILS_GIT_URI} \ | 26 | ${BINUTILS_GIT_URI} \ |
@@ -36,5 +36,6 @@ SRC_URI = "\ | |||
36 | file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ | 36 | file://0013-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ |
37 | file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ | 37 | file://0014-Remove-duplicate-pe-dll.o-entry-deom-targ_extra_ofil.patch \ |
38 | file://0015-gprofng-change-use-of-bignum-to-bigint.patch \ | 38 | file://0015-gprofng-change-use-of-bignum-to-bigint.patch \ |
39 | file://0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch \ | ||
39 | " | 40 | " |
40 | S = "${WORKDIR}/git" | 41 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/binutils/binutils/0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch b/meta/recipes-devtools/binutils/binutils/0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch new file mode 100644 index 0000000000..7b52425a38 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0016-aarch64-Remove-asserts-from-operand-qualifier-decode.patch | |||
@@ -0,0 +1,382 @@ | |||
1 | From 5b1c70bfe0d8f84dc28237d6150b7b9d57c791a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Victor Do Nascimento <victor.donascimento@arm.com> | ||
3 | Date: Tue, 16 Apr 2024 11:49:15 +0100 | ||
4 | Subject: [PATCH] aarch64: Remove asserts from operand qualifier decoders | ||
5 | [PR31595] | ||
6 | |||
7 | Given that the disassembler should never abort when decoding | ||
8 | (potentially random) data, assertion statements in the | ||
9 | `get_*reg_qualifier_from_value' function family prove problematic. | ||
10 | |||
11 | Consider the random 32-bit word W, encoded in a data segment and | ||
12 | encountered on execution of `objdump -D <obj_name>'. | ||
13 | |||
14 | If: | ||
15 | |||
16 | (W & ~opcode_mask) == valid instruction | ||
17 | |||
18 | Then before `print_insn_aarch64_word' has a chance to report the | ||
19 | instruction as potentially undefined, an attempt will be made to have | ||
20 | the qualifiers for the instruction's register operands (if any) | ||
21 | decoded. If the relevant bits do not map onto a valid qualifier for | ||
22 | the matched instruction-like word, an abort will be triggered and the | ||
23 | execution of objdump aborted. | ||
24 | |||
25 | As this scenario is perfectly feasible and, in light of the fact that | ||
26 | objdump must successfully decode all sections of a given object file, | ||
27 | it is not appropriate to assert in this family of functions. | ||
28 | |||
29 | Therefore, we add a new pseudo-qualifier `AARCH64_OPND_QLF_ERR' for | ||
30 | handling invalid qualifier-associated values and re-purpose the | ||
31 | assertion conditions in qualifier-retrieving functions to be the | ||
32 | predicate guarding the returning of the calculated qualifier type. | ||
33 | If the predicate fails, we return this new qualifier and allow the | ||
34 | caller to handle the error as appropriate. | ||
35 | |||
36 | As these functions are called either from within | ||
37 | `aarch64_extract_operand' or `do_special_decoding', both of which are | ||
38 | expected to return non-zero values, it suffices that callers return | ||
39 | zero upon encountering `AARCH64_OPND_QLF_ERR'. | ||
40 | |||
41 | Ar present the error presented in the hypothetical scenario has been | ||
42 | encountered in `get_sreg_qualifier_from_value', but the change is made | ||
43 | to the whole family to keep the interface consistent. | ||
44 | |||
45 | Bug: https://sourceware.org/PR31595 | ||
46 | |||
47 | Upstream-Status: Backport [commit 2601b201e95ea0edab89342ee7137c74e88a8a79] | ||
48 | |||
49 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
50 | --- | ||
51 | .../testsuite/binutils-all/aarch64/illegal.d | 1 + | ||
52 | .../testsuite/binutils-all/aarch64/illegal.s | 3 + | ||
53 | include/opcode/aarch64.h | 3 + | ||
54 | opcodes/aarch64-dis.c | 98 +++++++++++++++---- | ||
55 | 4 files changed, 87 insertions(+), 18 deletions(-) | ||
56 | |||
57 | diff --git a/binutils/testsuite/binutils-all/aarch64/illegal.d b/binutils/testsuite/binutils-all/aarch64/illegal.d | ||
58 | index 4b90a1d9f39..b69318aec85 100644 | ||
59 | --- a/binutils/testsuite/binutils-all/aarch64/illegal.d | ||
60 | +++ b/binutils/testsuite/binutils-all/aarch64/illegal.d | ||
61 | @@ -8,5 +8,6 @@ Disassembly of section \.text: | ||
62 | |||
63 | 0+000 <.*>: | ||
64 | [ ]+0:[ ]+68ea18cc[ ]+.inst[ ]+0x68ea18cc ; undefined | ||
65 | +[ ]+4:[ ]+9dc39839[ ]+.inst[ ]+0x9dc39839 ; undefined | ||
66 | #pass | ||
67 | |||
68 | diff --git a/binutils/testsuite/binutils-all/aarch64/illegal.s b/binutils/testsuite/binutils-all/aarch64/illegal.s | ||
69 | index 216cbe6f265..43668c6db55 100644 | ||
70 | --- a/binutils/testsuite/binutils-all/aarch64/illegal.s | ||
71 | +++ b/binutils/testsuite/binutils-all/aarch64/illegal.s | ||
72 | @@ -4,4 +4,7 @@ | ||
73 | # ldpsw x12, x6, [x6],#-8 ; illegal because one of the dest regs is also the address reg | ||
74 | .inst 0x68ea18cc | ||
75 | |||
76 | + # illegal, resembles the opcode `ldapur' with invalid qualifier bits | ||
77 | + .inst 0x9dc39839 | ||
78 | + | ||
79 | # FIXME: Add more illegal instructions here. | ||
80 | diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h | ||
81 | index 2fca9528c20..e8fe93ef127 100644 | ||
82 | --- a/include/opcode/aarch64.h | ||
83 | +++ b/include/opcode/aarch64.h | ||
84 | @@ -894,6 +894,9 @@ enum aarch64_opnd_qualifier | ||
85 | /* Special qualifier helping retrieve qualifier information during the | ||
86 | decoding time (currently not in use). */ | ||
87 | AARCH64_OPND_QLF_RETRIEVE, | ||
88 | + | ||
89 | + /* Special qualifier used for indicating error in qualifier retrieval. */ | ||
90 | + AARCH64_OPND_QLF_ERR, | ||
91 | }; | ||
92 | |||
93 | /* Instruction class. */ | ||
94 | diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c | ||
95 | index 96f42ae862a..b70e6da9eb7 100644 | ||
96 | --- a/opcodes/aarch64-dis.c | ||
97 | +++ b/opcodes/aarch64-dis.c | ||
98 | @@ -219,9 +219,10 @@ static inline enum aarch64_opnd_qualifier | ||
99 | get_greg_qualifier_from_value (aarch64_insn value) | ||
100 | { | ||
101 | enum aarch64_opnd_qualifier qualifier = AARCH64_OPND_QLF_W + value; | ||
102 | - assert (value <= 0x1 | ||
103 | - && aarch64_get_qualifier_standard_value (qualifier) == value); | ||
104 | - return qualifier; | ||
105 | + if (value <= 0x1 | ||
106 | + && aarch64_get_qualifier_standard_value (qualifier) == value) | ||
107 | + return qualifier; | ||
108 | + return AARCH64_OPND_QLF_ERR; | ||
109 | } | ||
110 | |||
111 | /* Given VALUE, return qualifier for a vector register. This does not support | ||
112 | @@ -237,9 +238,10 @@ get_vreg_qualifier_from_value (aarch64_insn value) | ||
113 | if (qualifier >= AARCH64_OPND_QLF_V_2H) | ||
114 | qualifier += 1; | ||
115 | |||
116 | - assert (value <= 0x8 | ||
117 | - && aarch64_get_qualifier_standard_value (qualifier) == value); | ||
118 | - return qualifier; | ||
119 | + if (value <= 0x8 | ||
120 | + && aarch64_get_qualifier_standard_value (qualifier) == value) | ||
121 | + return qualifier; | ||
122 | + return AARCH64_OPND_QLF_ERR; | ||
123 | } | ||
124 | |||
125 | /* Given VALUE, return qualifier for an FP or AdvSIMD scalar register. */ | ||
126 | @@ -248,9 +250,10 @@ get_sreg_qualifier_from_value (aarch64_insn value) | ||
127 | { | ||
128 | enum aarch64_opnd_qualifier qualifier = AARCH64_OPND_QLF_S_B + value; | ||
129 | |||
130 | - assert (value <= 0x4 | ||
131 | - && aarch64_get_qualifier_standard_value (qualifier) == value); | ||
132 | - return qualifier; | ||
133 | + if (value <= 0x4 | ||
134 | + && aarch64_get_qualifier_standard_value (qualifier) == value) | ||
135 | + return qualifier; | ||
136 | + return AARCH64_OPND_QLF_ERR; | ||
137 | } | ||
138 | |||
139 | /* Given the instruction in *INST which is probably half way through the | ||
140 | @@ -263,13 +266,17 @@ get_expected_qualifier (const aarch64_inst *inst, int i) | ||
141 | { | ||
142 | aarch64_opnd_qualifier_seq_t qualifiers; | ||
143 | /* Should not be called if the qualifier is known. */ | ||
144 | - assert (inst->operands[i].qualifier == AARCH64_OPND_QLF_NIL); | ||
145 | - int invalid_count; | ||
146 | - if (aarch64_find_best_match (inst, inst->opcode->qualifiers_list, | ||
147 | - i, qualifiers, &invalid_count)) | ||
148 | - return qualifiers[i]; | ||
149 | + if (inst->operands[i].qualifier == AARCH64_OPND_QLF_NIL) | ||
150 | + { | ||
151 | + int invalid_count; | ||
152 | + if (aarch64_find_best_match (inst, inst->opcode->qualifiers_list, | ||
153 | + i, qualifiers, &invalid_count)) | ||
154 | + return qualifiers[i]; | ||
155 | + else | ||
156 | + return AARCH64_OPND_QLF_NIL; | ||
157 | + } | ||
158 | else | ||
159 | - return AARCH64_OPND_QLF_NIL; | ||
160 | + return AARCH64_OPND_QLF_ERR; | ||
161 | } | ||
162 | |||
163 | /* Operand extractors. */ | ||
164 | @@ -355,6 +362,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
165 | aarch64_insn value = extract_field (FLD_imm4_11, code, 0); | ||
166 | /* Depend on AARCH64_OPND_Ed to determine the qualifier. */ | ||
167 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
168 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
169 | + return 0; | ||
170 | shift = get_logsz (aarch64_get_qualifier_esize (info->qualifier)); | ||
171 | info->reglane.index = value >> shift; | ||
172 | } | ||
173 | @@ -374,6 +383,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
174 | if (pos > 3) | ||
175 | return false; | ||
176 | info->qualifier = get_sreg_qualifier_from_value (pos); | ||
177 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
178 | + return 0; | ||
179 | info->reglane.index = (unsigned) (value >> 1); | ||
180 | } | ||
181 | } | ||
182 | @@ -381,6 +392,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
183 | { | ||
184 | /* Need information in other operand(s) to help decoding. */ | ||
185 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
186 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
187 | + return 0; | ||
188 | switch (info->qualifier) | ||
189 | { | ||
190 | case AARCH64_OPND_QLF_S_4B: | ||
191 | @@ -405,6 +418,8 @@ aarch64_ext_reglane (const aarch64_operand *self, aarch64_opnd_info *info, | ||
192 | |||
193 | /* Need information in other operand(s) to help decoding. */ | ||
194 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
195 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
196 | + return 0; | ||
197 | switch (info->qualifier) | ||
198 | { | ||
199 | case AARCH64_OPND_QLF_S_H: | ||
200 | @@ -644,9 +659,15 @@ aarch64_ext_advsimd_imm_shift (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
201 | 1xxx 1 2D */ | ||
202 | info->qualifier = | ||
203 | get_vreg_qualifier_from_value ((pos << 1) | (int) Q); | ||
204 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
205 | + return false; | ||
206 | } | ||
207 | else | ||
208 | - info->qualifier = get_sreg_qualifier_from_value (pos); | ||
209 | + { | ||
210 | + info->qualifier = get_sreg_qualifier_from_value (pos); | ||
211 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
212 | + return 0; | ||
213 | + } | ||
214 | |||
215 | if (info->type == AARCH64_OPND_IMM_VLSR) | ||
216 | /* immh <shift> | ||
217 | @@ -773,6 +794,8 @@ aarch64_ext_advsimd_imm_modified (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
218 | |||
219 | /* cmode */ | ||
220 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
221 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
222 | + return 0; | ||
223 | switch (info->qualifier) | ||
224 | { | ||
225 | case AARCH64_OPND_QLF_NIL: | ||
226 | @@ -1014,6 +1037,8 @@ aarch64_ext_ft (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
227 | if (value > 0x4) | ||
228 | return false; | ||
229 | info->qualifier = get_sreg_qualifier_from_value (value); | ||
230 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
231 | + return 0; | ||
232 | } | ||
233 | |||
234 | return true; | ||
235 | @@ -1086,6 +1111,8 @@ aarch64_ext_rcpc3_addr_offset (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
236 | aarch64_operand_error *errors ATTRIBUTE_UNUSED) | ||
237 | { | ||
238 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
239 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
240 | + return 0; | ||
241 | |||
242 | /* Rn */ | ||
243 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
244 | @@ -1105,6 +1132,8 @@ aarch64_ext_addr_offset (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
245 | aarch64_operand_error *errors ATTRIBUTE_UNUSED) | ||
246 | { | ||
247 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
248 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
249 | + return 0; | ||
250 | |||
251 | /* Rn */ | ||
252 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
253 | @@ -1154,6 +1183,8 @@ aarch64_ext_addr_regoff (const aarch64_operand *self ATTRIBUTE_UNUSED, | ||
254 | /* Need information in other operand(s) to help achieve the decoding | ||
255 | from 'S' field. */ | ||
256 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
257 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
258 | + return 0; | ||
259 | /* Get the size of the data element that is accessed, which may be | ||
260 | different from that of the source register size, e.g. in strb/ldrb. */ | ||
261 | size = aarch64_get_qualifier_esize (info->qualifier); | ||
262 | @@ -1172,6 +1203,8 @@ aarch64_ext_addr_simm (const aarch64_operand *self, aarch64_opnd_info *info, | ||
263 | { | ||
264 | aarch64_insn imm; | ||
265 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
266 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
267 | + return 0; | ||
268 | |||
269 | /* Rn */ | ||
270 | info->addr.base_regno = extract_field (FLD_Rn, code, 0); | ||
271 | @@ -1210,6 +1243,8 @@ aarch64_ext_addr_uimm12 (const aarch64_operand *self, aarch64_opnd_info *info, | ||
272 | { | ||
273 | int shift; | ||
274 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
275 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
276 | + return 0; | ||
277 | shift = get_logsz (aarch64_get_qualifier_esize (info->qualifier)); | ||
278 | /* Rn */ | ||
279 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
280 | @@ -1228,6 +1263,8 @@ aarch64_ext_addr_simm10 (const aarch64_operand *self, aarch64_opnd_info *info, | ||
281 | aarch64_insn imm; | ||
282 | |||
283 | info->qualifier = get_expected_qualifier (inst, info->idx); | ||
284 | + if (info->qualifier == AARCH64_OPND_QLF_ERR) | ||
285 | + return 0; | ||
286 | /* Rn */ | ||
287 | info->addr.base_regno = extract_field (self->fields[0], code, 0); | ||
288 | /* simm10 */ | ||
289 | @@ -2467,6 +2504,8 @@ decode_sizeq (aarch64_inst *inst) | ||
290 | if (mask == 0x7) | ||
291 | { | ||
292 | inst->operands[idx].qualifier = get_vreg_qualifier_from_value (value); | ||
293 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
294 | + return 0; | ||
295 | return 1; | ||
296 | } | ||
297 | |||
298 | @@ -2649,6 +2688,8 @@ do_special_decoding (aarch64_inst *inst) | ||
299 | idx = select_operand_for_sf_field_coding (inst->opcode); | ||
300 | value = extract_field (FLD_sf, inst->value, 0); | ||
301 | inst->operands[idx].qualifier = get_greg_qualifier_from_value (value); | ||
302 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
303 | + return 0; | ||
304 | if ((inst->opcode->flags & F_N) | ||
305 | && extract_field (FLD_N, inst->value, 0) != value) | ||
306 | return 0; | ||
307 | @@ -2659,6 +2700,8 @@ do_special_decoding (aarch64_inst *inst) | ||
308 | idx = select_operand_for_sf_field_coding (inst->opcode); | ||
309 | value = extract_field (FLD_lse_sz, inst->value, 0); | ||
310 | inst->operands[idx].qualifier = get_greg_qualifier_from_value (value); | ||
311 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
312 | + return 0; | ||
313 | } | ||
314 | /* rcpc3 'size' field. */ | ||
315 | if (inst->opcode->flags & F_RCPC3_SIZE) | ||
316 | @@ -2670,12 +2713,18 @@ do_special_decoding (aarch64_inst *inst) | ||
317 | { | ||
318 | if (aarch64_operands[inst->operands[i].type].op_class | ||
319 | == AARCH64_OPND_CLASS_INT_REG) | ||
320 | - inst->operands[i].qualifier = get_greg_qualifier_from_value (value & 1); | ||
321 | + { | ||
322 | + inst->operands[i].qualifier = get_greg_qualifier_from_value (value & 1); | ||
323 | + if (inst->operands[i].qualifier == AARCH64_OPND_QLF_ERR) | ||
324 | + return 0; | ||
325 | + } | ||
326 | else if (aarch64_operands[inst->operands[i].type].op_class | ||
327 | == AARCH64_OPND_CLASS_FP_REG) | ||
328 | { | ||
329 | value += (extract_field (FLD_opc1, inst->value, 0) << 2); | ||
330 | inst->operands[i].qualifier = get_sreg_qualifier_from_value (value); | ||
331 | + if (inst->operands[i].qualifier == AARCH64_OPND_QLF_ERR) | ||
332 | + return 0; | ||
333 | } | ||
334 | } | ||
335 | } | ||
336 | @@ -2709,7 +2758,11 @@ do_special_decoding (aarch64_inst *inst) | ||
337 | /* For most related instruciton, the 'size' field is fully available for | ||
338 | operand encoding. */ | ||
339 | if (mask == 0x3) | ||
340 | - inst->operands[idx].qualifier = get_sreg_qualifier_from_value (value); | ||
341 | + { | ||
342 | + inst->operands[idx].qualifier = get_sreg_qualifier_from_value (value); | ||
343 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
344 | + return 0; | ||
345 | + } | ||
346 | else | ||
347 | { | ||
348 | get_operand_possible_qualifiers (idx, inst->opcode->qualifiers_list, | ||
349 | @@ -2744,6 +2797,9 @@ do_special_decoding (aarch64_inst *inst) | ||
350 | Q = (unsigned) extract_field (FLD_Q, inst->value, inst->opcode->mask); | ||
351 | inst->operands[0].qualifier = | ||
352 | get_vreg_qualifier_from_value ((num << 1) | Q); | ||
353 | + if (inst->operands[0].qualifier == AARCH64_OPND_QLF_ERR) | ||
354 | + return 0; | ||
355 | + | ||
356 | } | ||
357 | |||
358 | if ((inst->opcode->flags & F_OPD_SIZE) && inst->opcode->iclass == sve2_urqvs) | ||
359 | @@ -2753,7 +2809,11 @@ do_special_decoding (aarch64_inst *inst) | ||
360 | inst->opcode->mask); | ||
361 | inst->operands[0].qualifier | ||
362 | = get_vreg_qualifier_from_value (1 + (size << 1)); | ||
363 | + if (inst->operands[0].qualifier == AARCH64_OPND_QLF_ERR) | ||
364 | + return 0; | ||
365 | inst->operands[2].qualifier = get_sreg_qualifier_from_value (size); | ||
366 | + if (inst->operands[2].qualifier == AARCH64_OPND_QLF_ERR) | ||
367 | + return 0; | ||
368 | } | ||
369 | |||
370 | if (inst->opcode->flags & F_GPRSIZE_IN_Q) | ||
371 | @@ -2772,6 +2832,8 @@ do_special_decoding (aarch64_inst *inst) | ||
372 | assert (idx == 0 || idx == 1); | ||
373 | value = extract_field (FLD_Q, inst->value, 0); | ||
374 | inst->operands[idx].qualifier = get_greg_qualifier_from_value (value); | ||
375 | + if (inst->operands[idx].qualifier == AARCH64_OPND_QLF_ERR) | ||
376 | + return 0; | ||
377 | } | ||
378 | |||
379 | if (inst->opcode->flags & F_LDS_SIZE) | ||
380 | -- | ||
381 | 2.34.1 | ||
382 | |||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb index 15cc7ac244..fac9f8f7ef 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb | |||
@@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib" | |||
18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ | 18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ |
19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ | 19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ |
20 | " | 20 | " |
21 | SRCREV = "3793e987d2b4e878410da16f33d963043d137d48" | 21 | SRCREV = "5d97c32d6f94cf6f473a5f82964e3edaeb1b146e" |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
24 | PACKAGECONFIG ??= " \ | 24 | PACKAGECONFIG ??= " \ |
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb index bf8be1ad0c..9dc5caf87c 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | |||
@@ -13,23 +13,31 @@ DEPENDS += "gnu-config-native" | |||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${PV}.tar.bz2 \ | 14 | ${SOURCEFORGE_MIRROR}/project/cdrtools/cdrtools-${PV}.tar.bz2 \ |
15 | file://0001-Don-t-set-uid-gid-during-install.patch \ | 15 | file://0001-Don-t-set-uid-gid-during-install.patch \ |
16 | file://riscv64-linux-gcc.rul \ | 16 | file://riscv64-linux-gcc.rul \ |
17 | file://gcc14-fix.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" | 20 | SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" |
20 | SRC_URI[sha256sum] = "ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f" | 21 | SRC_URI[sha256sum] = "ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f" |
21 | 22 | ||
22 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 23 | EXTRA_OEMAKE = "-e MAKEFLAGS= CPPOPTX='${CPPFLAGS}' COPTX='${CFLAGS}' C++OPTX='${CXXFLAGS}' LDOPTX='${LDFLAGS}' GMAKE_NOWARN='true'" |
23 | 24 | ||
24 | # Stop failures when 'cc' can't be found | 25 | # Stop failures when 'cc' can't be found |
25 | export ac_cv_prog_CC = "${CC}" | 26 | export ac_cv_prog_CC = "${CC}" |
26 | 27 | ||
27 | inherit native | 28 | inherit native |
28 | 29 | ||
30 | # Use -std=gnu89 to build with gcc-14 (https://bugs.gentoo.org/903876) | ||
31 | # this needs to be after native inherit (which sets CFLAGS to BUILD_CFLAGS) | ||
32 | CFLAGS += "-std=gnu89" | ||
33 | |||
29 | do_configure() { | 34 | do_configure() { |
35 | # cdda2wav does not build with GCC 14 | ||
36 | rm -f ${S}/TARGETS/55cdda2wav | ||
37 | |||
30 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/autoconf | 38 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/autoconf |
31 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/autoconf | 39 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/autoconf |
32 | install -m 0644 ${WORKDIR}/riscv64-linux-gcc.rul ${S}/RULES/ | 40 | install -m 0644 ${UNPACKDIR}/riscv64-linux-gcc.rul ${S}/RULES/ |
33 | } | 41 | } |
34 | 42 | ||
35 | do_install() { | 43 | do_install() { |
diff --git a/meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch b/meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch new file mode 100644 index 0000000000..ce02bb8bcf --- /dev/null +++ b/meta/recipes-devtools/cdrtools/cdrtools/gcc14-fix.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> | ||
2 | Upstream-Status: Inappropriate [native] | ||
3 | --- cdrtools-3.01/autoconf/configure~ 2015-07-06 23:41:27.000000000 +0200 | ||
4 | +++ cdrtools-3.01/autoconf/configure 2024-05-01 09:37:40.897253690 +0200 | ||
5 | @@ -1205,7 +1205,7 @@ | ||
6 | #line 1206 "configure" | ||
7 | #include "confdefs.h" | ||
8 | |||
9 | -main(){return(0);} | ||
10 | +int main(){return(0);} | ||
11 | EOF | ||
12 | if { (eval echo configure:1211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
13 | ac_cv_prog_cc_works=yes | ||
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb index 7f89441fb4..ddc41f289e 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM:append = " \ | |||
16 | file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ | 16 | file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ |
17 | file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ | 17 | file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ |
18 | file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ | 18 | file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ |
19 | file://Utilities/cmcurl/COPYING;md5=db8448a1e43eb2125f7740fc397db1f6 \ | 19 | file://Utilities/cmcurl/COPYING;md5=eed2e5088e1ac619c9a1c747da291d75 \ |
20 | " | 20 | " |
21 | 21 | ||
22 | B = "${WORKDIR}/build" | 22 | B = "${WORKDIR}/build" |
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ab9f459c05..1155c1bbe0 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" | |||
10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | 10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" |
11 | SECTION = "console/utils" | 11 | SECTION = "console/utils" |
12 | LICENSE = "BSD-3-Clause" | 12 | LICENSE = "BSD-3-Clause" |
13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ | 13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ |
14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ | 14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ |
15 | " | 15 | " |
16 | 16 | ||
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | |||
19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" | 22 | SRC_URI[sha256sum] = "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" |
23 | 23 | ||
24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
25 | 25 | ||
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch index b2933d88be..b7ec3e7bac 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 | 1 | From 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Wed, 28 Dec 2022 17:51:27 +0800 | 3 | Date: Wed, 28 Dec 2022 17:51:27 +0800 |
4 | Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 | 4 | Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 |
@@ -18,10 +18,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt | 20 | diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt |
21 | index 9387247366..d3de01f4e8 100644 | 21 | index 3dd24f1e..4a0f6773 100644 |
22 | --- a/Utilities/cmcurl/CMakeLists.txt | 22 | --- a/Utilities/cmcurl/CMakeLists.txt |
23 | +++ b/Utilities/cmcurl/CMakeLists.txt | 23 | +++ b/Utilities/cmcurl/CMakeLists.txt |
24 | @@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") | 24 | @@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") |
25 | set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") | 25 | set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") |
26 | set(SHARE_LIB_OBJECT OFF) | 26 | set(SHARE_LIB_OBJECT OFF) |
27 | set(USE_LIBIDN2 ON) | 27 | set(USE_LIBIDN2 ON) |
@@ -30,6 +30,3 @@ index 9387247366..d3de01f4e8 100644 | |||
30 | set(USE_NGTCP2 OFF) | 30 | set(USE_NGTCP2 OFF) |
31 | set(USE_QUICHE OFF) | 31 | set(USE_QUICHE OFF) |
32 | set(USE_WIN32_IDN OFF) | 32 | set(USE_WIN32_IDN OFF) |
33 | -- | ||
34 | 2.43.0 | ||
35 | |||
diff --git a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch index d6f7308fe0..af164084d0 100644 --- a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +++ b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fd9a04c1434e12f21c043385e306e0b52d38d749 Mon Sep 17 00:00:00 2001 | 1 | From 2d3f6933f78d393514a48f8222ac8c3c39cb5fc7 Mon Sep 17 00:00:00 2001 |
2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
3 | Date: Thu, 5 Jul 2018 10:28:04 -0300 | 3 | Date: Thu, 5 Jul 2018 10:28:04 -0300 |
4 | Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal | 4 | Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal |
@@ -13,16 +13,15 @@ Upstream-Status: Inappropriate [config] | |||
13 | 13 | ||
14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
16 | |||
17 | --- | 16 | --- |
18 | Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ | 17 | Utilities/cmlibarchive/CMakeLists.txt | 8 ++------ |
19 | 1 file changed, 2 insertions(+), 6 deletions(-) | 18 | 1 file changed, 2 insertions(+), 6 deletions(-) |
20 | 19 | ||
21 | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt | 20 | diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt |
22 | index bfcaf30..2960683 100644 | 21 | index e47184b7..e4964c32 100644 |
23 | --- a/Utilities/cmlibarchive/CMakeLists.txt | 22 | --- a/Utilities/cmlibarchive/CMakeLists.txt |
24 | +++ b/Utilities/cmlibarchive/CMakeLists.txt | 23 | +++ b/Utilities/cmlibarchive/CMakeLists.txt |
25 | @@ -682,12 +682,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) | 24 | @@ -721,12 +721,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) |
26 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) | 25 | LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H) |
27 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) | 26 | LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H) |
28 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) | 27 | LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H) |
@@ -35,5 +34,5 @@ index bfcaf30..2960683 100644 | |||
35 | +SET(HAVE_EXT2FS_EXT2_FS_H 0) | 34 | +SET(HAVE_EXT2FS_EXT2_FS_H 0) |
36 | +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) | 35 | +SET(HAVE_WORKING_EXT2_IOC_GETFLAGS 0) |
37 | LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) | 36 | LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) |
37 | LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H) | ||
38 | LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) | 38 | LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H) |
39 | LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H) | ||
diff --git a/meta/recipes-devtools/cmake/cmake_3.28.3.bb b/meta/recipes-devtools/cmake/cmake_3.29.3.bb index 9146fa8c0f..9146fa8c0f 100644 --- a/meta/recipes-devtools/cmake/cmake_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake_3.29.3.bb | |||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.1.bb index 1f97c99bde..e6714629af 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.0.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.1.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p | |||
9 | file://0001-include-rpm-rpmstring.h.patch \ | 9 | file://0001-include-rpm-rpmstring.h.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRCREV = "10a8a7af4f1de3f98a21a7d08fe3a46ef306d197" | 12 | SRCREV = "78b0c3ff48bd58eb9c0a72879cf1025e9f225684" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
diff --git a/meta/recipes-devtools/devel-config/distcc-config.bb b/meta/recipes-devtools/devel-config/distcc-config.bb index 698fd3585a..2c30488b82 100644 --- a/meta/recipes-devtools/devel-config/distcc-config.bb +++ b/meta/recipes-devtools/devel-config/distcc-config.bb | |||
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 | |||
6 | 6 | ||
7 | SRC_URI = "file://distcc.sh" | 7 | SRC_URI = "file://distcc.sh" |
8 | 8 | ||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}/sources" |
10 | UNPACKDIR = "${S}" | ||
10 | 11 | ||
11 | # Default to the host machine for a running qemu session | 12 | # Default to the host machine for a running qemu session |
12 | DISTCC_HOSTS ?= "192.168.7.1" | 13 | DISTCC_HOSTS ?= "192.168.7.1" |
diff --git a/meta/recipes-devtools/devel-config/nfs-export-root.bb b/meta/recipes-devtools/devel-config/nfs-export-root.bb index 5e69962d7c..ad5486aa87 100644 --- a/meta/recipes-devtools/devel-config/nfs-export-root.bb +++ b/meta/recipes-devtools/devel-config/nfs-export-root.bb | |||
@@ -3,10 +3,10 @@ DESCRIPTION = "Enables NFS access from any host to the entire filesystem (for de | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
5 | 5 | ||
6 | |||
7 | SRC_URI = "file://exports" | 6 | SRC_URI = "file://exports" |
8 | 7 | ||
9 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}/sources" |
9 | UNPACKDIR = "${S}" | ||
10 | 10 | ||
11 | do_install() { | 11 | do_install() { |
12 | install -d ${D}${sysconfdir} | 12 | install -d ${D}${sysconfdir} |
diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.5.bb b/meta/recipes-devtools/dmidecode/dmidecode_3.6.bb index 3e2bb6e30b..e5b4e27687 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode_3.5.bb +++ b/meta/recipes-devtools/dmidecode/dmidecode_3.6.bb | |||
@@ -18,4 +18,4 @@ do_install() { | |||
18 | install | 18 | install |
19 | } | 19 | } |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073" | 21 | SRC_URI[sha256sum] = "e40c65f3ec3dafe31ad8349a4ef1a97122d38f65004ed66575e1a8d575dd8bae" |
diff --git a/meta/recipes-devtools/dnf/dnf_4.19.2.bb b/meta/recipes-devtools/dnf/dnf_4.20.0.bb index cc91dbe400..4757346cbf 100644 --- a/meta/recipes-devtools/dnf/dnf_4.19.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.20.0.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc | |||
20 | 20 | ||
21 | SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" | 21 | SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" |
22 | 22 | ||
23 | SRCREV = "9b2b2e8ddab99caba4bc8059cab4263163172e81" | 23 | SRCREV = "e3cb438c0fd08c79676c0f3276aa7d75cd8557c6" |
24 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 24 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index bbd574e287..5229a0366c 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | |||
@@ -41,7 +41,8 @@ SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd791 | |||
41 | 41 | ||
42 | UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)).zip" | 42 | UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)).zip" |
43 | 43 | ||
44 | S = "${WORKDIR}" | 44 | S = "${WORKDIR}/sources" |
45 | UNPACKDIR = "${S}" | ||
45 | 46 | ||
46 | do_configure (){ | 47 | do_configure (){ |
47 | : | 48 | : |
diff --git a/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb b/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb index c596497b8e..8e42b12b77 100644 --- a/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb +++ b/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb | |||
@@ -1,19 +1,22 @@ | |||
1 | SUMMARY = "A small utility for printing debug source file locations embedded in binaries" | 1 | SUMMARY = "A small utility for printing debug source file locations embedded in binaries" |
2 | DESCRIPTION = "${SUMMARY}" | 2 | DESCRIPTION = "${SUMMARY}" |
3 | LICENSE = "GPL-2.0-or-later" | 3 | LICENSE = "GPL-2.0-or-later" |
4 | LIC_FILES_CHKSUM = "file://../dwarfsrcfiles.c;md5=31483894e453a77acbb67847565f1b5c;beginline=1;endline=8" | 4 | LIC_FILES_CHKSUM = "file://dwarfsrcfiles.c;md5=31483894e453a77acbb67847565f1b5c;beginline=1;endline=8" |
5 | 5 | ||
6 | SRC_URI = "file://dwarfsrcfiles.c" | 6 | SRC_URI = "file://dwarfsrcfiles.c" |
7 | BBCLASSEXTEND = "native" | 7 | BBCLASSEXTEND = "native" |
8 | DEPENDS = "elfutils" | 8 | DEPENDS = "elfutils" |
9 | DEPENDS:append:libc-musl = " argp-standalone" | 9 | DEPENDS:append:libc-musl = " argp-standalone" |
10 | 10 | ||
11 | S = "${WORKDIR}/sources" | ||
12 | UNPACKDIR = "${S}" | ||
13 | |||
11 | do_compile () { | 14 | do_compile () { |
12 | ${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ../dwarfsrcfiles.c -lelf -ldw | 15 | ${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ${S}/dwarfsrcfiles.c -lelf -ldw |
13 | } | 16 | } |
14 | 17 | ||
15 | do_compile:libc-musl () { | 18 | do_compile:libc-musl () { |
16 | ${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ../dwarfsrcfiles.c -lelf -ldw -largp | 19 | ${CC} ${CFLAGS} ${LDFLAGS} -o dwarfsrcfiles ${S}/dwarfsrcfiles.c -lelf -ldw -largp |
17 | } | 20 | } |
18 | 21 | ||
19 | do_install () { | 22 | do_install () { |
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.191.bb b/meta/recipes-devtools/elfutils/elfutils_0.191.bb index c4d872430b..76bd2b3a99 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.191.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.191.bb | |||
@@ -15,7 +15,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ | |||
15 | file://0001-dso-link-change.patch \ | 15 | file://0001-dso-link-change.patch \ |
16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ | 16 | file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ |
17 | file://0003-fixheadercheck.patch \ | 17 | file://0003-fixheadercheck.patch \ |
18 | file://0006-Fix-build-on-aarch64-musl.patch \ | ||
19 | file://0001-libasm-may-link-with-libbz2-if-found.patch \ | 18 | file://0001-libasm-may-link-with-libbz2-if-found.patch \ |
20 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ | 19 | file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ |
21 | file://0001-skip-the-test-when-gcc-not-deployed.patch \ | 20 | file://0001-skip-the-test-when-gcc-not-deployed.patch \ |
diff --git a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch deleted file mode 100644 index 149e0e6a7b..0000000000 --- a/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From 4409f128c81a9d76b9360b002a1d76043c77b53e Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 17:27:30 +0800 | ||
4 | Subject: [PATCH] Fix build on aarch64/musl | ||
5 | |||
6 | Errors | ||
7 | |||
8 | invalid operands to binary & (have 'long double' and 'unsigned int') | ||
9 | |||
10 | error: redefinition | ||
11 | of 'struct iovec' | ||
12 | struct iovec { void *iov_base; size_t iov_len; }; | ||
13 | ^ | ||
14 | Upstream-Status: Pending | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | Rebase to 0.170 | ||
18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
19 | --- | ||
20 | backends/aarch64_initreg.c | 4 ++-- | ||
21 | backends/arm_initreg.c | 2 +- | ||
22 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
23 | |||
24 | diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c | ||
25 | index daf6f37..6445276 100644 | ||
26 | --- a/backends/aarch64_initreg.c | ||
27 | +++ b/backends/aarch64_initreg.c | ||
28 | @@ -33,7 +33,7 @@ | ||
29 | #include "system.h" | ||
30 | #include <assert.h> | ||
31 | #if defined(__aarch64__) && defined(__linux__) | ||
32 | -# include <linux/uio.h> | ||
33 | +# include <sys/uio.h> | ||
34 | # include <sys/user.h> | ||
35 | # include <sys/ptrace.h> | ||
36 | /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ | ||
37 | @@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), | ||
38 | |||
39 | Dwarf_Word dwarf_fregs[32]; | ||
40 | for (int r = 0; r < 32; r++) | ||
41 | - dwarf_fregs[r] = fregs.vregs[r] & 0xFFFFFFFF; | ||
42 | + dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0xFFFFFFFF; | ||
43 | |||
44 | if (! setfunc (64, 32, dwarf_fregs, arg)) | ||
45 | return false; | ||
46 | diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c | ||
47 | index efcabaf..062bb9e 100644 | ||
48 | --- a/backends/arm_initreg.c | ||
49 | +++ b/backends/arm_initreg.c | ||
50 | @@ -38,7 +38,7 @@ | ||
51 | #endif | ||
52 | |||
53 | #ifdef __aarch64__ | ||
54 | -# include <linux/uio.h> | ||
55 | +# include <sys/uio.h> | ||
56 | # include <sys/user.h> | ||
57 | # include <sys/ptrace.h> | ||
58 | /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ | ||
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 7b610b1ff2..18904ebc10 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb | |||
@@ -81,3 +81,7 @@ FILES:${PN} += "${libdir}/libexpect${PV}.so \ | |||
81 | " | 81 | " |
82 | 82 | ||
83 | BBCLASSEXTEND = "native nativesdk" | 83 | BBCLASSEXTEND = "native nativesdk" |
84 | |||
85 | # http://errors.yoctoproject.org/Errors/Details/766950/ | ||
86 | # expect5.45.4/exp_chan.c:62:5: error: initialization of 'struct Tcl_ChannelTypeVersion_ *' from incompatible pointer type 'int (*)(void *, int)' [-Wincompatible-pointer-types] | ||
87 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-devtools/gcc/gcc-13.2.inc b/meta/recipes-devtools/gcc/gcc-14.1.inc index 603377a49a..c639cb51f4 100644 --- a/meta/recipes-devtools/gcc/gcc-13.2.inc +++ b/meta/recipes-devtools/gcc/gcc-14.1.inc | |||
@@ -2,11 +2,11 @@ require gcc-common.inc | |||
2 | 2 | ||
3 | # Third digit in PV should be incremented after a minor release | 3 | # Third digit in PV should be incremented after a minor release |
4 | 4 | ||
5 | PV = "13.2.0" | 5 | PV = "14.1.0" |
6 | 6 | ||
7 | # BINV should be incremented to a revision after a minor gcc release | 7 | # BINV should be incremented to a revision after a minor gcc release |
8 | 8 | ||
9 | BINV = "13.2.0" | 9 | BINV = "14.1.0" |
10 | 10 | ||
11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" | 11 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:" |
12 | 12 | ||
@@ -28,16 +28,19 @@ LIC_FILES_CHKSUM = "\ | |||
28 | #SOURCEDIR = "gcc-${RELEASE}" | 28 | #SOURCEDIR = "gcc-${RELEASE}" |
29 | #BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz" | 29 | #BASEURI ?= "https://repo.or.cz/official-gcc.git/snapshot/${RELEASE}.tar.gz;downloadfilename=gcc-${PV}-${RELEASE}.tar.gz" |
30 | #SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}" | 30 | #SOURCEDIR ?= "official-gcc-${@'${RELEASE}'[0:7]}" |
31 | #SRC_URI[sha256sum] = "41bf7be5dc029112a9df625266e7de030ffc36ff3638f270b180ae8c91fe6449" | ||
31 | 32 | ||
32 | # from snapshot | 33 | # from snapshot |
33 | #RELEASE ?= "13-20230520" | 34 | #RELEASE ?= "14-20240504" |
34 | #SOURCEDIR ?= "gcc-${RELEASE}" | ||
35 | #BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" | 35 | #BASEURI ?= "https://gcc.gnu.org/pub/gcc/snapshots/${RELEASE}/gcc-${RELEASE}.tar.xz" |
36 | #SOURCEDIR ?= "gcc-${RELEASE}" | ||
37 | #SRC_URI[sha256sum] = "34ac232bbf31e0cd5752fd344c2cf55719aaaad2ca0096593e01c97a3d5e274e" | ||
36 | 38 | ||
37 | # official release | 39 | # official release |
38 | RELEASE ?= "${PV}" | 40 | RELEASE ?= "${PV}" |
39 | BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" | 41 | BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz" |
40 | SOURCEDIR ?= "gcc-${PV}" | 42 | SOURCEDIR ?= "gcc-${PV}" |
43 | SRC_URI[sha256sum] = "e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840" | ||
41 | 44 | ||
42 | SRC_URI = "${BASEURI} \ | 45 | SRC_URI = "${BASEURI} \ |
43 | file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ | 46 | file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ |
@@ -65,11 +68,7 @@ SRC_URI = "${BASEURI} \ | |||
65 | file://0023-Fix-install-path-of-linux64.h.patch \ | 68 | file://0023-Fix-install-path-of-linux64.h.patch \ |
66 | file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ | 69 | file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \ |
67 | file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \ | 70 | file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \ |
68 | file://CVE-2023-4039.patch \ | ||
69 | file://0026-aarch64-Fix-loose-ldpstp-check-PR111411.patch \ | ||
70 | file://0027-Fix-gcc-vect-module-testcases.patch \ | ||
71 | " | 71 | " |
72 | SRC_URI[sha256sum] = "e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da" | ||
73 | 72 | ||
74 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" | 73 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}" |
75 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 74 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" |
@@ -116,4 +115,3 @@ EXTRA_OECONF_PATHS = "\ | |||
116 | " | 115 | " |
117 | 116 | ||
118 | CVE_STATUS[CVE-2021-37322] = "cpe-incorrect: Is a binutils 2.26 issue, not gcc" | 117 | CVE_STATUS[CVE-2021-37322] = "cpe-incorrect: Is a binutils 2.26 issue, not gcc" |
119 | CVE_STATUS[CVE-2023-4039] = "fixed-version: Fixed via CVE-2023-4039.patch included here. Set the status explictly to deal with all recipes that share the gcc-source" | ||
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_13.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_14.1.bb index bf53c5cd78..bf53c5cd78 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-cross_13.2.bb b/meta/recipes-devtools/gcc/gcc-cross_14.1.bb index b43cca0c52..b43cca0c52 100644 --- a/meta/recipes-devtools/gcc/gcc-cross_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc-cross_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_13.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_14.1.bb index 40a6c4feff..40a6c4feff 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc-crosssdk_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index dbc9141000..89b0bebcfb 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc | |||
@@ -92,7 +92,7 @@ do_install () { | |||
92 | mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include | 92 | mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include |
93 | rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include | 93 | rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include |
94 | fi | 94 | fi |
95 | rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir | 95 | rm -rf ${D}${infodir}/libgomp.info* ${D}${infodir}/dir |
96 | rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir | 96 | rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir |
97 | rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir | 97 | rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir |
98 | if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then | 98 | if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then |
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_14.1.bb index dd430b57eb..dd430b57eb 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc-runtime_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_13.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_14.1.bb index 8bda2ccad6..8bda2ccad6 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc-sanitizers_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc-source_13.2.bb b/meta/recipes-devtools/gcc/gcc-source_14.1.bb index b890fa33ea..b890fa33ea 100644 --- a/meta/recipes-devtools/gcc/gcc-source_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc-source_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch index 5c75698eda..0b7c0af86f 100644 --- a/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch +++ b/meta/recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 553564bdcabdcc5d4cc4de73c7eb94c505ef51f5 Mon Sep 17 00:00:00 2001 | 1 | From 76ef337260aadeb475fd380ff9aca31ea1731345 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 08:37:11 +0400 | 3 | Date: Fri, 29 Mar 2013 08:37:11 +0400 |
4 | Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET | 4 | Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET |
@@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [embedded specific] | |||
12 | 2 files changed, 2 insertions(+), 2 deletions(-) | 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
13 | 13 | ||
14 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
15 | index 117a7ef23f2..535265253fd 100755 | 15 | index 02b435c1163..85a82fad302 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -10195,7 +10195,7 @@ fi | 18 | @@ -10387,7 +10387,7 @@ fi |
19 | # for target_alias and gcc doesn't manage it consistently. | 19 | # for target_alias and gcc doesn't manage it consistently. |
20 | target_configargs="--cache-file=./config.cache ${target_configargs}" | 20 | target_configargs="--cache-file=./config.cache ${target_configargs}" |
21 | 21 | ||
@@ -25,10 +25,10 @@ index 117a7ef23f2..535265253fd 100755 | |||
25 | *" newlib "*) | 25 | *" newlib "*) |
26 | case " $target_configargs " in | 26 | case " $target_configargs " in |
27 | diff --git a/configure.ac b/configure.ac | 27 | diff --git a/configure.ac b/configure.ac |
28 | index b3e9bbd2aa5..5ac8d6490f6 100644 | 28 | index 1a19c07a27b..bc8e1b8c4ef 100644 |
29 | --- a/configure.ac | 29 | --- a/configure.ac |
30 | +++ b/configure.ac | 30 | +++ b/configure.ac |
31 | @@ -3351,7 +3351,7 @@ fi | 31 | @@ -3509,7 +3509,7 @@ fi |
32 | # for target_alias and gcc doesn't manage it consistently. | 32 | # for target_alias and gcc doesn't manage it consistently. |
33 | target_configargs="--cache-file=./config.cache ${target_configargs}" | 33 | target_configargs="--cache-file=./config.cache ${target_configargs}" |
34 | 34 | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch index 492300047d..76aa69c26e 100644 --- a/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 52676b5934ba127c3af39fc484c8236c8fa60b96 Mon Sep 17 00:00:00 2001 | 1 | From 05be69910c99d739ce9246a3bb9426fa6d9f19d4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 8 Mar 2021 16:04:20 -0800 | 3 | Date: Mon, 8 Mar 2021 16:04:20 -0800 |
4 | Subject: [PATCH] gcc: poison-system-directories | 4 | Subject: [PATCH] gcc: poison-system-directories |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 7 files changed, 86 insertions(+), 2 deletions(-) | 25 | 7 files changed, 86 insertions(+), 2 deletions(-) |
26 | 26 | ||
27 | diff --git a/gcc/common.opt b/gcc/common.opt | 27 | diff --git a/gcc/common.opt b/gcc/common.opt |
28 | index 862c474d3c8..64c4277c991 100644 | 28 | index ad348844775..df3992b420d 100644 |
29 | --- a/gcc/common.opt | 29 | --- a/gcc/common.opt |
30 | +++ b/gcc/common.opt | 30 | +++ b/gcc/common.opt |
31 | @@ -711,6 +711,10 @@ Wreturn-local-addr | 31 | @@ -715,6 +715,10 @@ Wreturn-local-addr |
32 | Common Var(warn_return_local_addr) Init(1) Warning | 32 | Common Var(warn_return_local_addr) Init(1) Warning |
33 | Warn about returning a pointer/reference to a local or temporary variable. | 33 | Warn about returning a pointer/reference to a local or temporary variable. |
34 | 34 | ||
@@ -40,10 +40,10 @@ index 862c474d3c8..64c4277c991 100644 | |||
40 | Common Var(warn_shadow) Warning | 40 | Common Var(warn_shadow) Warning |
41 | Warn when one variable shadows another. Same as -Wshadow=global. | 41 | Warn when one variable shadows another. Same as -Wshadow=global. |
42 | diff --git a/gcc/config.in b/gcc/config.in | 42 | diff --git a/gcc/config.in b/gcc/config.in |
43 | index 4cad077bfbe..80e832fdb84 100644 | 43 | index f3de4ba6776..3ce3113510b 100644 |
44 | --- a/gcc/config.in | 44 | --- a/gcc/config.in |
45 | +++ b/gcc/config.in | 45 | +++ b/gcc/config.in |
46 | @@ -236,6 +236,16 @@ | 46 | @@ -249,6 +249,16 @@ |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | 49 | ||
@@ -61,18 +61,18 @@ index 4cad077bfbe..80e832fdb84 100644 | |||
61 | optimizer and back end) to be checked for dynamic type safety at runtime. | 61 | optimizer and back end) to be checked for dynamic type safety at runtime. |
62 | This is quite expensive. */ | 62 | This is quite expensive. */ |
63 | diff --git a/gcc/configure b/gcc/configure | 63 | diff --git a/gcc/configure b/gcc/configure |
64 | index c7b26d1927d..3508be7b439 100755 | 64 | index 266ab8f84b2..3c346acbce0 100755 |
65 | --- a/gcc/configure | 65 | --- a/gcc/configure |
66 | +++ b/gcc/configure | 66 | +++ b/gcc/configure |
67 | @@ -1026,6 +1026,7 @@ enable_maintainer_mode | 67 | @@ -1050,6 +1050,7 @@ enable_maintainer_mode |
68 | enable_link_mutex | 68 | enable_link_mutex |
69 | enable_link_serialization | 69 | enable_link_serialization |
70 | enable_version_specific_runtime_libs | 70 | enable_version_specific_runtime_libs |
71 | +enable_poison_system_directories | 71 | +enable_poison_system_directories |
72 | enable_plugin | 72 | enable_plugin |
73 | enable_host_shared | 73 | enable_host_shared |
74 | enable_libquadmath_support | 74 | enable_host_pie |
75 | @@ -1788,6 +1789,8 @@ Optional Features: | 75 | @@ -1823,6 +1824,8 @@ Optional Features: |
76 | --enable-version-specific-runtime-libs | 76 | --enable-version-specific-runtime-libs |
77 | specify that runtime libraries should be installed | 77 | specify that runtime libraries should be installed |
78 | in a compiler-specific directory | 78 | in a compiler-specific directory |
@@ -80,8 +80,8 @@ index c7b26d1927d..3508be7b439 100755 | |||
80 | + warn for use of native system header directories | 80 | + warn for use of native system header directories |
81 | --enable-plugin enable plugin support | 81 | --enable-plugin enable plugin support |
82 | --enable-host-shared build host code as shared libraries | 82 | --enable-host-shared build host code as shared libraries |
83 | --disable-libquadmath-support | 83 | --enable-host-pie build host code as PIE |
84 | @@ -31753,6 +31756,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : | 84 | @@ -34020,6 +34023,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : |
85 | fi | 85 | fi |
86 | 86 | ||
87 | 87 | ||
@@ -105,10 +105,10 @@ index c7b26d1927d..3508be7b439 100755 | |||
105 | 105 | ||
106 | 106 | ||
107 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 107 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
108 | index 09082e8ccae..6cd01a8966b 100644 | 108 | index a5aec1bc967..4d8123085b8 100644 |
109 | --- a/gcc/configure.ac | 109 | --- a/gcc/configure.ac |
110 | +++ b/gcc/configure.ac | 110 | +++ b/gcc/configure.ac |
111 | @@ -7292,6 +7292,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, | 111 | @@ -7518,6 +7518,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs, |
112 | [specify that runtime libraries should be | 112 | [specify that runtime libraries should be |
113 | installed in a compiler-specific directory])]) | 113 | installed in a compiler-specific directory])]) |
114 | 114 | ||
@@ -132,10 +132,10 @@ index 09082e8ccae..6cd01a8966b 100644 | |||
132 | AC_SUBST(subdirs) | 132 | AC_SUBST(subdirs) |
133 | AC_SUBST(srcdir) | 133 | AC_SUBST(srcdir) |
134 | diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi | 134 | diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi |
135 | index de40f62e219..d6f203c8b71 100644 | 135 | index 1006510fc6a..389155f8ed5 100644 |
136 | --- a/gcc/doc/invoke.texi | 136 | --- a/gcc/doc/invoke.texi |
137 | +++ b/gcc/doc/invoke.texi | 137 | +++ b/gcc/doc/invoke.texi |
138 | @@ -384,6 +384,7 @@ Objective-C and Objective-C++ Dialects}. | 138 | @@ -391,6 +391,7 @@ Objective-C and Objective-C++ Dialects}. |
139 | -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded | 139 | -Wpacked -Wno-packed-bitfield-compat -Wpacked-not-aligned -Wpadded |
140 | -Wparentheses -Wno-pedantic-ms-format | 140 | -Wparentheses -Wno-pedantic-ms-format |
141 | -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast | 141 | -Wpointer-arith -Wno-pointer-compare -Wno-pointer-to-int-cast |
@@ -143,7 +143,7 @@ index de40f62e219..d6f203c8b71 100644 | |||
143 | -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls | 143 | -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls |
144 | -Wrestrict -Wno-return-local-addr -Wreturn-type | 144 | -Wrestrict -Wno-return-local-addr -Wreturn-type |
145 | -Wno-scalar-storage-order -Wsequence-point | 145 | -Wno-scalar-storage-order -Wsequence-point |
146 | @@ -8426,6 +8427,14 @@ made up of data only and thus requires no special treatment. But, for | 146 | @@ -8860,6 +8861,14 @@ made up of data only and thus requires no special treatment. But, for |
147 | most targets, it is made up of code and thus requires the stack to be | 147 | most targets, it is made up of code and thus requires the stack to be |
148 | made executable in order for the program to work properly. | 148 | made executable in order for the program to work properly. |
149 | 149 | ||
@@ -159,19 +159,19 @@ index de40f62e219..d6f203c8b71 100644 | |||
159 | @opindex Wno-float-equal | 159 | @opindex Wno-float-equal |
160 | @item -Wfloat-equal | 160 | @item -Wfloat-equal |
161 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 161 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
162 | index 16bb07f2cdc..5feae021545 100644 | 162 | index 728332b8153..343e4915097 100644 |
163 | --- a/gcc/gcc.cc | 163 | --- a/gcc/gcc.cc |
164 | +++ b/gcc/gcc.cc | 164 | +++ b/gcc/gcc.cc |
165 | @@ -1146,6 +1146,8 @@ proper position among the other output files. */ | 165 | @@ -1159,6 +1159,8 @@ proper position among the other output files. */ |
166 | "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ | 166 | "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ |
167 | "%X %{o*} %{e*} %{N} %{n} %{r}\ | 167 | "%X %{o*} %{e*} %{N} %{n} %{r}\ |
168 | %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ | 168 | %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \ |
169 | + %{Wno-poison-system-directories:--no-poison-system-directories} \ | 169 | + %{Wno-poison-system-directories:--no-poison-system-directories} \ |
170 | + %{Werror=poison-system-directories:--error-poison-system-directories} \ | 170 | + %{Werror=poison-system-directories:--error-poison-system-directories} \ |
171 | %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \ | 171 | %{static|no-pie|static-pie:} %@{L*} %(link_libgcc) " \ |
172 | VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ | 172 | VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \ |
173 | %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ | 173 | %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\ |
174 | @@ -1241,8 +1243,11 @@ static const char *cpp_unique_options = | 174 | @@ -1260,8 +1262,11 @@ static const char *cpp_unique_options = |
175 | static const char *cpp_options = | 175 | static const char *cpp_options = |
176 | "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ | 176 | "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ |
177 | %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ | 177 | %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\ |
@@ -186,7 +186,7 @@ index 16bb07f2cdc..5feae021545 100644 | |||
186 | /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. | 186 | /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al. |
187 | 187 | ||
188 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc | 188 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc |
189 | index 4d44321183f..46c0d543205 100644 | 189 | index 64cdd2f4a1b..e572d98ab17 100644 |
190 | --- a/gcc/incpath.cc | 190 | --- a/gcc/incpath.cc |
191 | +++ b/gcc/incpath.cc | 191 | +++ b/gcc/incpath.cc |
192 | @@ -26,6 +26,7 @@ | 192 | @@ -26,6 +26,7 @@ |
diff --git a/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch index 69e7fa0ba9..dfd370aba9 100644 --- a/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From febfac59d0e8a864370d0b4018b4e497ceec156d Mon Sep 17 00:00:00 2001 | 1 | From 25bc008191c9b518f30e3ed87e204e25bdafb854 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 | 3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 |
4 | Subject: [PATCH] 64-bit multilib hack | 4 | Subject: [PATCH] 64-bit multilib hack |
@@ -28,19 +28,17 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
29 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> | 29 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> |
30 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 30 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
31 | Signed-off-by: Zang Ruochen <zangruochen@loongson.cn> | ||
32 | --- | 31 | --- |
33 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- | 32 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- |
34 | gcc/config/arc/t-multilib-linux | 4 ++-- | 33 | gcc/config/arc/t-multilib-linux | 4 ++-- |
35 | gcc/config/i386/t-linux64 | 6 ++---- | 34 | gcc/config/i386/t-linux64 | 6 ++---- |
36 | gcc/config/mips/t-linux64 | 28 ++-------------------------- | 35 | gcc/config/mips/t-linux64 | 28 ++-------------------------- |
37 | gcc/config/riscv/t-linux | 4 ++-- | 36 | gcc/config/riscv/t-linux | 6 +++--- |
38 | gcc/config/rs6000/t-linux64 | 5 ++--- | 37 | gcc/config/rs6000/t-linux64 | 5 ++--- |
39 | gcc/config/loongarch/t-linux | 34 ++++++++++++++++++---------------- | 38 | 6 files changed, 15 insertions(+), 42 deletions(-) |
40 | 7 files changed, 32 insertions(+), 57 deletions(-) | ||
41 | 39 | ||
42 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux | 40 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux |
43 | index 57bf4100fcd..aaef5da8059 100644 | 41 | index 3f7b786ecbb..a6c1c92fc7f 100644 |
44 | --- a/gcc/config/aarch64/t-aarch64-linux | 42 | --- a/gcc/config/aarch64/t-aarch64-linux |
45 | +++ b/gcc/config/aarch64/t-aarch64-linux | 43 | +++ b/gcc/config/aarch64/t-aarch64-linux |
46 | @@ -21,8 +21,8 @@ | 44 | @@ -21,8 +21,8 @@ |
@@ -57,7 +55,7 @@ index 57bf4100fcd..aaef5da8059 100644 | |||
57 | -MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) | 55 | -MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
58 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) | 56 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
59 | diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux | 57 | diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux |
60 | index a839e4ea67c..f92664573a9 100644 | 58 | index 07bc77ba34a..f7e2e3919cf 100644 |
61 | --- a/gcc/config/arc/t-multilib-linux | 59 | --- a/gcc/config/arc/t-multilib-linux |
62 | +++ b/gcc/config/arc/t-multilib-linux | 60 | +++ b/gcc/config/arc/t-multilib-linux |
63 | @@ -16,9 +16,9 @@ | 61 | @@ -16,9 +16,9 @@ |
@@ -73,7 +71,7 @@ index a839e4ea67c..f92664573a9 100644 | |||
73 | # Aliases: | 71 | # Aliases: |
74 | MULTILIB_MATCHES += mcpu?arc700=mA7 | 72 | MULTILIB_MATCHES += mcpu?arc700=mA7 |
75 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 | 73 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 |
76 | index 138956b0962..d6e0cdc4342 100644 | 74 | index f9edc289e57..047d8e4aff9 100644 |
77 | --- a/gcc/config/i386/t-linux64 | 75 | --- a/gcc/config/i386/t-linux64 |
78 | +++ b/gcc/config/i386/t-linux64 | 76 | +++ b/gcc/config/i386/t-linux64 |
79 | @@ -32,7 +32,5 @@ | 77 | @@ -32,7 +32,5 @@ |
@@ -87,7 +85,7 @@ index 138956b0962..d6e0cdc4342 100644 | |||
87 | +MULTILIB_DIRNAMES = . . | 85 | +MULTILIB_DIRNAMES = . . |
88 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 86 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
89 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 | 87 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 |
90 | index 176091cabb6..8258ef40559 100644 | 88 | index e4e2f5eaedb..c503974de37 100644 |
91 | --- a/gcc/config/mips/t-linux64 | 89 | --- a/gcc/config/mips/t-linux64 |
92 | +++ b/gcc/config/mips/t-linux64 | 90 | +++ b/gcc/config/mips/t-linux64 |
93 | @@ -17,29 +17,5 @@ | 91 | @@ -17,29 +17,5 @@ |
@@ -123,17 +121,20 @@ index 176091cabb6..8258ef40559 100644 | |||
123 | +MULTILIB_DIRNAMES = . . . | 121 | +MULTILIB_DIRNAMES = . . . |
124 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 122 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
125 | diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux | 123 | diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux |
126 | index 216d2776a18..e3c520f4bf6 100644 | 124 | index a6f64f88d25..0e21db58f7d 100644 |
127 | --- a/gcc/config/riscv/t-linux | 125 | --- a/gcc/config/riscv/t-linux |
128 | +++ b/gcc/config/riscv/t-linux | 126 | +++ b/gcc/config/riscv/t-linux |
129 | @@ -1,3 +1,3 @@ | 127 | @@ -1,5 +1,5 @@ |
130 | # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ | 128 | # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/ |
131 | -MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) | 129 | -MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) |
132 | -MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) | 130 | -MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) |
133 | +#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) | 131 | +#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES))) |
134 | +#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) | 132 | +#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) |
133 | |||
134 | -MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu) | ||
135 | +#MULTIARCH_DIRNAME := $(call if_multiarch,$(firstword $(subst -, ,$(target)))-linux-gnu) | ||
135 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 | 136 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 |
136 | index 01a94242308..1429eceaebf 100644 | 137 | index 248b5891e36..379689561a7 100644 |
137 | --- a/gcc/config/rs6000/t-linux64 | 138 | --- a/gcc/config/rs6000/t-linux64 |
138 | +++ b/gcc/config/rs6000/t-linux64 | 139 | +++ b/gcc/config/rs6000/t-linux64 |
139 | @@ -26,10 +26,9 @@ | 140 | @@ -26,10 +26,9 @@ |
@@ -149,53 +150,3 @@ index 01a94242308..1429eceaebf 100644 | |||
149 | 150 | ||
150 | rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc | 151 | rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc |
151 | $(COMPILE) $< | 152 | $(COMPILE) $< |
152 | diff --git a/gcc/config/loongarch/t-linux b/gcc/config/loongarch/t-linux | ||
153 | index e40da1792..0c7ec9f8a 100644 | ||
154 | --- a/gcc/config/loongarch/t-linux | ||
155 | +++ b/gcc/config/loongarch/t-linux | ||
156 | @@ -18,7 +18,9 @@ | ||
157 | |||
158 | # Multilib | ||
159 | MULTILIB_OPTIONS = mabi=lp64d/mabi=lp64f/mabi=lp64s | ||
160 | -MULTILIB_DIRNAMES = base/lp64d base/lp64f base/lp64s | ||
161 | +#MULTILIB_DIRNAMES = base/lp64d base/lp64f base/lp64s | ||
162 | +MULTILIB_DIRNAMES = . . . | ||
163 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
164 | |||
165 | # The GCC driver always gets all abi-related options on the command line. | ||
166 | # (see loongarch-driver.c:driver_get_normalized_m_opts) | ||
167 | @@ -36,18 +38,18 @@ else | ||
168 | endif | ||
169 | |||
170 | # Don't define MULTILIB_OSDIRNAMES if multilib is disabled. | ||
171 | -ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),) | ||
172 | - | ||
173 | - MULTILIB_OSDIRNAMES = \ | ||
174 | - mabi.lp64d=../lib64$\ | ||
175 | - $(call if_multiarch,:loongarch64-linux-gnu) | ||
176 | - | ||
177 | - MULTILIB_OSDIRNAMES += \ | ||
178 | - mabi.lp64f=../lib64/f32$\ | ||
179 | - $(call if_multiarch,:loongarch64-linux-gnuf32) | ||
180 | - | ||
181 | - MULTILIB_OSDIRNAMES += \ | ||
182 | - mabi.lp64s=../lib64/sf$\ | ||
183 | - $(call if_multiarch,:loongarch64-linux-gnusf) | ||
184 | - | ||
185 | -endif | ||
186 | +#ifeq ($(filter LA_DISABLE_MULTILIB,$(tm_defines)),) | ||
187 | +# | ||
188 | +# MULTILIB_OSDIRNAMES = \ | ||
189 | +# mabi.lp64d=../lib64$\ | ||
190 | +# $(call if_multiarch,:loongarch64-linux-gnu) | ||
191 | +# | ||
192 | +# MULTILIB_OSDIRNAMES += \ | ||
193 | +# mabi.lp64f=../lib64/f32$\ | ||
194 | +# $(call if_multiarch,:loongarch64-linux-gnuf32) | ||
195 | +# | ||
196 | +# MULTILIB_OSDIRNAMES += \ | ||
197 | +# mabi.lp64s=../lib64/sf$\ | ||
198 | +# $(call if_multiarch,:loongarch64-linux-gnusf) | ||
199 | +# | ||
200 | +#endif | ||
201 | |||
diff --git a/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch b/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch index 7e33bf17b0..35e92a6a9e 100644 --- a/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch +++ b/meta/recipes-devtools/gcc/gcc/0004-Pass-CXXFLAGS_FOR_BUILD-in-a-couple-of-places-to-avo.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6fbf920ccde6efc2d0caafde996d9e5738a1ba37 Mon Sep 17 00:00:00 2001 | 1 | From 5bef09b829ab8042acc045474cf10f4c4fb15dd5 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Thu, 28 Oct 2021 11:33:40 +0100 | 3 | Date: Thu, 28 Oct 2021 11:33:40 +0100 |
4 | Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these | 4 | Subject: [PATCH] Pass CXXFLAGS_FOR_BUILD in a couple of places to avoid these |
@@ -23,10 +23,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | 2 files changed, 4 insertions(+) | 23 | 2 files changed, 4 insertions(+) |
24 | 24 | ||
25 | diff --git a/Makefile.in b/Makefile.in | 25 | diff --git a/Makefile.in b/Makefile.in |
26 | index 06a9398e172..4b0069b257c 100644 | 26 | index db4fa6c6260..dee862be8a5 100644 |
27 | --- a/Makefile.in | 27 | --- a/Makefile.in |
28 | +++ b/Makefile.in | 28 | +++ b/Makefile.in |
29 | @@ -178,6 +178,7 @@ BUILD_EXPORTS = \ | 29 | @@ -179,6 +179,7 @@ BUILD_EXPORTS = \ |
30 | # built for the build system to override those in BASE_FLAGS_TO_PASS. | 30 | # built for the build system to override those in BASE_FLAGS_TO_PASS. |
31 | EXTRA_BUILD_FLAGS = \ | 31 | EXTRA_BUILD_FLAGS = \ |
32 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ | 32 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
@@ -34,7 +34,7 @@ index 06a9398e172..4b0069b257c 100644 | |||
34 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" | 34 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
35 | 35 | ||
36 | # This is the list of directories to built for the host system. | 36 | # This is the list of directories to built for the host system. |
37 | @@ -210,6 +211,7 @@ HOST_EXPORTS = \ | 37 | @@ -211,6 +212,7 @@ HOST_EXPORTS = \ |
38 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ | 38 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
39 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ | 39 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
40 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ | 40 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
@@ -43,10 +43,10 @@ index 06a9398e172..4b0069b257c 100644 | |||
43 | DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ | 43 | DSYMUTIL="$(DSYMUTIL)"; export DSYMUTIL; \ |
44 | LD="$(LD)"; export LD; \ | 44 | LD="$(LD)"; export LD; \ |
45 | diff --git a/Makefile.tpl b/Makefile.tpl | 45 | diff --git a/Makefile.tpl b/Makefile.tpl |
46 | index dfbd74b68f8..419b332953b 100644 | 46 | index 1d5813cd569..ff0fae53b0c 100644 |
47 | --- a/Makefile.tpl | 47 | --- a/Makefile.tpl |
48 | +++ b/Makefile.tpl | 48 | +++ b/Makefile.tpl |
49 | @@ -181,6 +181,7 @@ BUILD_EXPORTS = \ | 49 | @@ -182,6 +182,7 @@ BUILD_EXPORTS = \ |
50 | # built for the build system to override those in BASE_FLAGS_TO_PASS. | 50 | # built for the build system to override those in BASE_FLAGS_TO_PASS. |
51 | EXTRA_BUILD_FLAGS = \ | 51 | EXTRA_BUILD_FLAGS = \ |
52 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ | 52 | CFLAGS="$(CFLAGS_FOR_BUILD)" \ |
@@ -54,7 +54,7 @@ index dfbd74b68f8..419b332953b 100644 | |||
54 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" | 54 | LDFLAGS="$(LDFLAGS_FOR_BUILD)" |
55 | 55 | ||
56 | # This is the list of directories to built for the host system. | 56 | # This is the list of directories to built for the host system. |
57 | @@ -213,6 +214,7 @@ HOST_EXPORTS = \ | 57 | @@ -214,6 +215,7 @@ HOST_EXPORTS = \ |
58 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ | 58 | CPP_FOR_BUILD="$(CPP_FOR_BUILD)"; export CPP_FOR_BUILD; \ |
59 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ | 59 | CPPFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS_FOR_BUILD; \ |
60 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ | 60 | CXX_FOR_BUILD="$(CXX_FOR_BUILD)"; export CXX_FOR_BUILD; \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch index db2fea3d16..8c6ae38e95 100644 --- a/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ b/meta/recipes-devtools/gcc/gcc/0005-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2cedf13819c0cc929660072d8a972f5e422f9701 Mon Sep 17 00:00:00 2001 | 1 | From fd3f513fa7e4f63a2b28b31ed5a4ddf8f5c543c0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:17:25 +0400 | 3 | Date: Fri, 29 Mar 2013 09:17:25 +0400 |
4 | Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} | 4 | Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} |
@@ -26,10 +26,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
26 | 4 files changed, 7 insertions(+), 7 deletions(-) | 26 | 4 files changed, 7 insertions(+), 7 deletions(-) |
27 | 27 | ||
28 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 28 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
29 | index 775aaa1b3c4..04f28984b34 100644 | 29 | index a74761b7ab3..956437df95b 100644 |
30 | --- a/gcc/Makefile.in | 30 | --- a/gcc/Makefile.in |
31 | +++ b/gcc/Makefile.in | 31 | +++ b/gcc/Makefile.in |
32 | @@ -561,7 +561,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ | 32 | @@ -590,7 +590,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ |
33 | TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ | 33 | TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ |
34 | 34 | ||
35 | xmake_file=@xmake_file@ | 35 | xmake_file=@xmake_file@ |
@@ -39,10 +39,10 @@ index 775aaa1b3c4..04f28984b34 100644 | |||
39 | TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ | 39 | TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ |
40 | TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ | 40 | TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ |
41 | diff --git a/gcc/configure b/gcc/configure | 41 | diff --git a/gcc/configure b/gcc/configure |
42 | index 3508be7b439..cf773a8b854 100755 | 42 | index 3c346acbce0..3870d6e9b6d 100755 |
43 | --- a/gcc/configure | 43 | --- a/gcc/configure |
44 | +++ b/gcc/configure | 44 | +++ b/gcc/configure |
45 | @@ -13507,8 +13507,8 @@ for f in $tm_file; do | 45 | @@ -15155,8 +15155,8 @@ for f in $tm_file; do |
46 | tm_include_list="${tm_include_list} $f" | 46 | tm_include_list="${tm_include_list} $f" |
47 | ;; | 47 | ;; |
48 | defaults.h ) | 48 | defaults.h ) |
@@ -54,10 +54,10 @@ index 3508be7b439..cf773a8b854 100755 | |||
54 | * ) | 54 | * ) |
55 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" | 55 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" |
56 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 56 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
57 | index 6cd01a8966b..22591478b72 100644 | 57 | index 4d8123085b8..15670de1706 100644 |
58 | --- a/gcc/configure.ac | 58 | --- a/gcc/configure.ac |
59 | +++ b/gcc/configure.ac | 59 | +++ b/gcc/configure.ac |
60 | @@ -2357,8 +2357,8 @@ for f in $tm_file; do | 60 | @@ -2383,8 +2383,8 @@ for f in $tm_file; do |
61 | tm_include_list="${tm_include_list} $f" | 61 | tm_include_list="${tm_include_list} $f" |
62 | ;; | 62 | ;; |
63 | defaults.h ) | 63 | defaults.h ) |
@@ -69,7 +69,7 @@ index 6cd01a8966b..22591478b72 100644 | |||
69 | * ) | 69 | * ) |
70 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" | 70 | tm_file_list="${tm_file_list} \$(srcdir)/config/$f" |
71 | diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh | 71 | diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh |
72 | index 054ede89647..3b2c2b9df37 100644 | 72 | index 1b015b70b38..145af56745e 100644 |
73 | --- a/gcc/mkconfig.sh | 73 | --- a/gcc/mkconfig.sh |
74 | +++ b/gcc/mkconfig.sh | 74 | +++ b/gcc/mkconfig.sh |
75 | @@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then | 75 | @@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then |
diff --git a/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch index 704c44cb72..e0d6aea46b 100644 --- a/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch +++ b/meta/recipes-devtools/gcc/gcc/0006-cpp-honor-sysroot.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f0b4d02a3a3dca1d67fd7add15ed63c2cd572bb9 Mon Sep 17 00:00:00 2001 | 1 | From 970960876045c99011658836f385c6f4d6d78fa6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:22:00 +0400 | 3 | Date: Fri, 29 Mar 2013 09:22:00 +0400 |
4 | Subject: [PATCH] cpp: honor sysroot. | 4 | Subject: [PATCH] cpp: honor sysroot. |
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
26 | 2 files changed, 2 insertions(+), 2 deletions(-) | 26 | 2 files changed, 2 insertions(+), 2 deletions(-) |
27 | 27 | ||
28 | diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h | 28 | diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h |
29 | index c591d155cc1..61927869fe1 100644 | 29 | index 7a7f5ff0ab5..fb3d88cdb11 100644 |
30 | --- a/gcc/cp/lang-specs.h | 30 | --- a/gcc/cp/lang-specs.h |
31 | +++ b/gcc/cp/lang-specs.h | 31 | +++ b/gcc/cp/lang-specs.h |
32 | @@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see | 32 | @@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -39,11 +39,11 @@ index c591d155cc1..61927869fe1 100644 | |||
39 | " %{fmodule-only:%{!S:-o %g.s%V}}" | 39 | " %{fmodule-only:%{!S:-o %g.s%V}}" |
40 | " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" | 40 | " %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}" |
41 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 41 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
42 | index 5feae021545..8af0c814c33 100644 | 42 | index 343e4915097..e3e9374d1cc 100644 |
43 | --- a/gcc/gcc.cc | 43 | --- a/gcc/gcc.cc |
44 | +++ b/gcc/gcc.cc | 44 | +++ b/gcc/gcc.cc |
45 | @@ -1468,7 +1468,7 @@ static const struct compiler default_compilers[] = | 45 | @@ -1487,7 +1487,7 @@ static const struct compiler default_compilers[] = |
46 | %W{o*:--output-pch %*}}%V}}}}}}}", 0, 0, 0}, | 46 | %W{o*:--output-pch %w%*}}%{!S:%V}}}}}}}}", 0, 0, 0}, |
47 | {".i", "@cpp-output", 0, 0, 0}, | 47 | {".i", "@cpp-output", 0, 0, 0}, |
48 | {"@cpp-output", | 48 | {"@cpp-output", |
49 | - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, | 49 | - "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, |
diff --git a/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 079142c540..eacdbd1dbe 100644 --- a/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From aacfd6e14dd583b1fdc65691def61c5e1bc89708 Mon Sep 17 00:00:00 2001 | 1 | From bce0b7e2e130a069a93c839b856aa19b64d5ca54 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 | 3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 |
4 | Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER | 4 | Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER |
@@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
36 | 18 files changed, 53 insertions(+), 58 deletions(-) | 36 | 18 files changed, 53 insertions(+), 58 deletions(-) |
37 | 37 | ||
38 | diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h | 38 | diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h |
39 | index 4277f03da2a..e4c92c03291 100644 | 39 | index 8e51c8202cc..732e4f4a477 100644 |
40 | --- a/gcc/config/aarch64/aarch64-linux.h | 40 | --- a/gcc/config/aarch64/aarch64-linux.h |
41 | +++ b/gcc/config/aarch64/aarch64-linux.h | 41 | +++ b/gcc/config/aarch64/aarch64-linux.h |
42 | @@ -21,10 +21,10 @@ | 42 | @@ -21,10 +21,10 @@ |
@@ -53,7 +53,7 @@ index 4277f03da2a..e4c92c03291 100644 | |||
53 | #undef ASAN_CC1_SPEC | 53 | #undef ASAN_CC1_SPEC |
54 | #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" | 54 | #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" |
55 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h | 55 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h |
56 | index 03f783f2ad1..4fa02668aa7 100644 | 56 | index 40ccf0bd9b4..ab5c59655fc 100644 |
57 | --- a/gcc/config/alpha/linux-elf.h | 57 | --- a/gcc/config/alpha/linux-elf.h |
58 | +++ b/gcc/config/alpha/linux-elf.h | 58 | +++ b/gcc/config/alpha/linux-elf.h |
59 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see | 59 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see |
@@ -68,7 +68,7 @@ index 03f783f2ad1..4fa02668aa7 100644 | |||
68 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | 68 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
69 | #elif DEFAULT_LIBC == LIBC_GLIBC | 69 | #elif DEFAULT_LIBC == LIBC_GLIBC |
70 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h | 70 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h |
71 | index a119875599d..dce7f59eeea 100644 | 71 | index eef791f6a02..335cb4c3607 100644 |
72 | --- a/gcc/config/arm/linux-eabi.h | 72 | --- a/gcc/config/arm/linux-eabi.h |
73 | +++ b/gcc/config/arm/linux-eabi.h | 73 | +++ b/gcc/config/arm/linux-eabi.h |
74 | @@ -62,8 +62,8 @@ | 74 | @@ -62,8 +62,8 @@ |
@@ -92,7 +92,7 @@ index a119875599d..dce7f59eeea 100644 | |||
92 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to | 92 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to |
93 | use the GNU/Linux version, not the generic BPABI version. */ | 93 | use the GNU/Linux version, not the generic BPABI version. */ |
94 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h | 94 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h |
95 | index 7b7b7cbbe14..98ef2267117 100644 | 95 | index ccae8abf6f6..ea421d03891 100644 |
96 | --- a/gcc/config/arm/linux-elf.h | 96 | --- a/gcc/config/arm/linux-elf.h |
97 | +++ b/gcc/config/arm/linux-elf.h | 97 | +++ b/gcc/config/arm/linux-elf.h |
98 | @@ -60,7 +60,7 @@ | 98 | @@ -60,7 +60,7 @@ |
@@ -105,7 +105,7 @@ index 7b7b7cbbe14..98ef2267117 100644 | |||
105 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ | 105 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ |
106 | %{static:-Bstatic} \ | 106 | %{static:-Bstatic} \ |
107 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h | 107 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h |
108 | index bbb7cc7115e..7d9272040ee 100644 | 108 | index 20a96d56e65..7a7a4f873e4 100644 |
109 | --- a/gcc/config/i386/linux.h | 109 | --- a/gcc/config/i386/linux.h |
110 | +++ b/gcc/config/i386/linux.h | 110 | +++ b/gcc/config/i386/linux.h |
111 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see | 111 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -119,7 +119,7 @@ index bbb7cc7115e..7d9272040ee 100644 | |||
119 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | 119 | -#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" |
120 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" | 120 | +#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1" |
121 | diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h | 121 | diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h |
122 | index 2bd9f48e271..dbbe7ca5440 100644 | 122 | index 3dd23eef5e5..960cd7c0450 100644 |
123 | --- a/gcc/config/i386/linux64.h | 123 | --- a/gcc/config/i386/linux64.h |
124 | +++ b/gcc/config/i386/linux64.h | 124 | +++ b/gcc/config/i386/linux64.h |
125 | @@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 125 | @@ -27,13 +27,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -143,7 +143,7 @@ index 2bd9f48e271..dbbe7ca5440 100644 | |||
143 | -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" | 143 | -#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" |
144 | +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" | 144 | +#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1" |
145 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 145 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
146 | index e3aca79cccc..6491c6b84f5 100644 | 146 | index a7248ac90d0..e36f32bf59e 100644 |
147 | --- a/gcc/config/linux.h | 147 | --- a/gcc/config/linux.h |
148 | +++ b/gcc/config/linux.h | 148 | +++ b/gcc/config/linux.h |
149 | @@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 149 | @@ -86,10 +86,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -162,25 +162,29 @@ index e3aca79cccc..6491c6b84f5 100644 | |||
162 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" | 162 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" |
163 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" | 163 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" |
164 | diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h | 164 | diff --git a/gcc/config/loongarch/gnu-user.h b/gcc/config/loongarch/gnu-user.h |
165 | index aecaa02a199..62f88f7f9a2 100644 | 165 | index e5d84e180e3..98cb49c189f 100644 |
166 | --- a/gcc/config/loongarch/gnu-user.h | 166 | --- a/gcc/config/loongarch/gnu-user.h |
167 | +++ b/gcc/config/loongarch/gnu-user.h | 167 | +++ b/gcc/config/loongarch/gnu-user.h |
168 | @@ -31,11 +31,11 @@ along with GCC; see the file COPYING3. If not see | 168 | @@ -31,7 +31,7 @@ along with GCC; see the file COPYING3. If not see |
169 | 169 | ||
170 | #undef GLIBC_DYNAMIC_LINKER | 170 | #undef GLIBC_DYNAMIC_LINKER |
171 | #define GLIBC_DYNAMIC_LINKER \ | 171 | #define GLIBC_DYNAMIC_LINKER \ |
172 | - "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1" | 172 | - "/lib" ABI_GRLEN_SPEC "/ld-linux-loongarch-" ABI_SPEC ".so.1" |
173 | + SYSTEMLIBS_DIR "ld-linux-loongarch-" ABI_SPEC ".so.1" | 173 | + SYSTEMLIBS_DIR "ld-linux-loongarch-" ABI_SPEC ".so.1" |
174 | 174 | ||
175 | #define MUSL_ABI_SPEC \ | ||
176 | "%{mabi=lp64d:}" \ | ||
177 | @@ -40,7 +40,7 @@ along with GCC; see the file COPYING3. If not see | ||
178 | |||
175 | #undef MUSL_DYNAMIC_LINKER | 179 | #undef MUSL_DYNAMIC_LINKER |
176 | #define MUSL_DYNAMIC_LINKER \ | 180 | #define MUSL_DYNAMIC_LINKER \ |
177 | - "/lib" ABI_GRLEN_SPEC "/ld-musl-loongarch-" ABI_SPEC ".so.1" | 181 | - "/lib/ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1" |
178 | + SYSTEMLIBS_DIR "ld-musl-loongarch-" ABI_SPEC ".so.1" | 182 | + SYSTEMLIBS_DIR "ld-musl-loongarch" ABI_GRLEN_SPEC MUSL_ABI_SPEC ".so.1" |
179 | 183 | ||
180 | #undef GNU_USER_TARGET_LINK_SPEC | 184 | #undef GNU_USER_TARGET_LINK_SPEC |
181 | #define GNU_USER_TARGET_LINK_SPEC \ | 185 | #define GNU_USER_TARGET_LINK_SPEC \ |
182 | diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h | 186 | diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h |
183 | index e2e2c421c52..6f26480e3b5 100644 | 187 | index 5ed8ee518be..5553e7cac21 100644 |
184 | --- a/gcc/config/microblaze/linux.h | 188 | --- a/gcc/config/microblaze/linux.h |
185 | +++ b/gcc/config/microblaze/linux.h | 189 | +++ b/gcc/config/microblaze/linux.h |
186 | @@ -28,7 +28,7 @@ | 190 | @@ -28,7 +28,7 @@ |
@@ -202,7 +206,7 @@ index e2e2c421c52..6f26480e3b5 100644 | |||
202 | #undef SUBTARGET_EXTRA_SPECS | 206 | #undef SUBTARGET_EXTRA_SPECS |
203 | #define SUBTARGET_EXTRA_SPECS \ | 207 | #define SUBTARGET_EXTRA_SPECS \ |
204 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h | 208 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h |
205 | index 5add34ea134..34692b433b8 100644 | 209 | index 8d098dd2f44..1c5ebbd26d5 100644 |
206 | --- a/gcc/config/mips/linux.h | 210 | --- a/gcc/config/mips/linux.h |
207 | +++ b/gcc/config/mips/linux.h | 211 | +++ b/gcc/config/mips/linux.h |
208 | @@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see | 212 | @@ -22,29 +22,29 @@ along with GCC; see the file COPYING3. If not see |
@@ -245,7 +249,7 @@ index 5add34ea134..34692b433b8 100644 | |||
245 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | 249 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" |
246 | #define GNU_USER_DYNAMIC_LINKERN32 \ | 250 | #define GNU_USER_DYNAMIC_LINKERN32 \ |
247 | diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h | 251 | diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h |
248 | index 2ce097ebbce..1d45d7b4962 100644 | 252 | index 06c442e85f4..b21a3c076c9 100644 |
249 | --- a/gcc/config/nios2/linux.h | 253 | --- a/gcc/config/nios2/linux.h |
250 | +++ b/gcc/config/nios2/linux.h | 254 | +++ b/gcc/config/nios2/linux.h |
251 | @@ -29,10 +29,10 @@ | 255 | @@ -29,10 +29,10 @@ |
@@ -262,7 +266,7 @@ index 2ce097ebbce..1d45d7b4962 100644 | |||
262 | #undef LINK_SPEC | 266 | #undef LINK_SPEC |
263 | #define LINK_SPEC LINK_SPEC_ENDIAN \ | 267 | #define LINK_SPEC LINK_SPEC_ENDIAN \ |
264 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h | 268 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h |
265 | index 3e625e0f867..dc3afc97e27 100644 | 269 | index 15851f653bc..d8aaab9631f 100644 |
266 | --- a/gcc/config/riscv/linux.h | 270 | --- a/gcc/config/riscv/linux.h |
267 | +++ b/gcc/config/riscv/linux.h | 271 | +++ b/gcc/config/riscv/linux.h |
268 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see | 272 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see |
@@ -284,10 +288,10 @@ index 3e625e0f867..dc3afc97e27 100644 | |||
284 | #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" | 288 | #define ICACHE_FLUSH_FUNC "__riscv_flush_icache" |
285 | 289 | ||
286 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | 290 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
287 | index 9e457033d11..2ddab7c99c1 100644 | 291 | index 655d1054d76..a11ae7643b7 100644 |
288 | --- a/gcc/config/rs6000/linux64.h | 292 | --- a/gcc/config/rs6000/linux64.h |
289 | +++ b/gcc/config/rs6000/linux64.h | 293 | +++ b/gcc/config/rs6000/linux64.h |
290 | @@ -339,24 +339,19 @@ extern int dot_symbols; | 294 | @@ -340,24 +340,19 @@ extern int dot_symbols; |
291 | #undef LINK_OS_DEFAULT_SPEC | 295 | #undef LINK_OS_DEFAULT_SPEC |
292 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" | 296 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
293 | 297 | ||
@@ -318,7 +322,7 @@ index 9e457033d11..2ddab7c99c1 100644 | |||
318 | #undef DEFAULT_ASM_ENDIAN | 322 | #undef DEFAULT_ASM_ENDIAN |
319 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) | 323 | #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) |
320 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 324 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
321 | index ae932fc22f0..26db003cb3a 100644 | 325 | index bcafa9d0cf4..8fda952e69c 100644 |
322 | --- a/gcc/config/rs6000/sysv4.h | 326 | --- a/gcc/config/rs6000/sysv4.h |
323 | +++ b/gcc/config/rs6000/sysv4.h | 327 | +++ b/gcc/config/rs6000/sysv4.h |
324 | @@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC | 328 | @@ -771,10 +771,10 @@ GNU_USER_TARGET_CC1_SPEC |
@@ -335,7 +339,7 @@ index ae932fc22f0..26db003cb3a 100644 | |||
335 | #ifndef GNU_USER_DYNAMIC_LINKER | 339 | #ifndef GNU_USER_DYNAMIC_LINKER |
336 | #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER | 340 | #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER |
337 | diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h | 341 | diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h |
338 | index 02aa1edaff8..fab268d61f4 100644 | 342 | index 83ea2f669a0..bc7cffbad3f 100644 |
339 | --- a/gcc/config/s390/linux.h | 343 | --- a/gcc/config/s390/linux.h |
340 | +++ b/gcc/config/s390/linux.h | 344 | +++ b/gcc/config/s390/linux.h |
341 | @@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see | 345 | @@ -72,13 +72,13 @@ along with GCC; see the file COPYING3. If not see |
@@ -357,7 +361,7 @@ index 02aa1edaff8..fab268d61f4 100644 | |||
357 | #undef LINK_SPEC | 361 | #undef LINK_SPEC |
358 | #define LINK_SPEC \ | 362 | #define LINK_SPEC \ |
359 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h | 363 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h |
360 | index 29f5902b98b..83d1e53e6e2 100644 | 364 | index 34cbbed633f..14000d3394c 100644 |
361 | --- a/gcc/config/sh/linux.h | 365 | --- a/gcc/config/sh/linux.h |
362 | +++ b/gcc/config/sh/linux.h | 366 | +++ b/gcc/config/sh/linux.h |
363 | @@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see | 367 | @@ -61,10 +61,10 @@ along with GCC; see the file COPYING3. If not see |
@@ -374,7 +378,7 @@ index 29f5902b98b..83d1e53e6e2 100644 | |||
374 | #undef SUBTARGET_LINK_EMUL_SUFFIX | 378 | #undef SUBTARGET_LINK_EMUL_SUFFIX |
375 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" | 379 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" |
376 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h | 380 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h |
377 | index 0e33b3cac2c..84f29adbb35 100644 | 381 | index 9646fa9c41e..396fb047fac 100644 |
378 | --- a/gcc/config/sparc/linux.h | 382 | --- a/gcc/config/sparc/linux.h |
379 | +++ b/gcc/config/sparc/linux.h | 383 | +++ b/gcc/config/sparc/linux.h |
380 | @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); | 384 | @@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); |
@@ -387,7 +391,7 @@ index 0e33b3cac2c..84f29adbb35 100644 | |||
387 | #undef LINK_SPEC | 391 | #undef LINK_SPEC |
388 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ | 392 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
389 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h | 393 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h |
390 | index f1cc0a19e49..94bc2032803 100644 | 394 | index 1e2e4aef2ad..25fcc37eca2 100644 |
391 | --- a/gcc/config/sparc/linux64.h | 395 | --- a/gcc/config/sparc/linux64.h |
392 | +++ b/gcc/config/sparc/linux64.h | 396 | +++ b/gcc/config/sparc/linux64.h |
393 | @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see | 397 | @@ -78,8 +78,8 @@ along with GCC; see the file COPYING3. If not see |
diff --git a/meta/recipes-devtools/gcc/gcc/0008-libtool.patch b/meta/recipes-devtools/gcc/gcc/0008-libtool.patch index 5b44dc809e..9b78377493 100644 --- a/meta/recipes-devtools/gcc/gcc/0008-libtool.patch +++ b/meta/recipes-devtools/gcc/gcc/0008-libtool.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7608e93ab97e8c33e3b14323d0cabc651926e403 Mon Sep 17 00:00:00 2001 | 1 | From 869295f6f1095b6334c1ea34f8d11a676c67e256 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:29:11 +0400 | 3 | Date: Fri, 29 Mar 2013 09:29:11 +0400 |
4 | Subject: [PATCH] libtool | 4 | Subject: [PATCH] libtool |
diff --git a/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch index 86542bd146..3e24e53d7b 100644 --- a/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ b/meta/recipes-devtools/gcc/gcc/0009-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4b0efc18e0d91967a3db11d9ef0595a5a76ad67a Mon Sep 17 00:00:00 2001 | 1 | From 19279e08417124b4567fafdf9300b779ce1a1e1c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:30:32 +0400 | 3 | Date: Fri, 29 Mar 2013 09:30:32 +0400 |
4 | Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. | 4 | Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI. |
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | 1 file changed, 5 insertions(+), 1 deletion(-) | 18 | 1 file changed, 5 insertions(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h | 20 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h |
21 | index dce7f59eeea..27402c629c6 100644 | 21 | index 335cb4c3607..1d5235075cb 100644 |
22 | --- a/gcc/config/arm/linux-eabi.h | 22 | --- a/gcc/config/arm/linux-eabi.h |
23 | +++ b/gcc/config/arm/linux-eabi.h | 23 | +++ b/gcc/config/arm/linux-eabi.h |
24 | @@ -88,10 +88,14 @@ | 24 | @@ -88,10 +88,14 @@ |
diff --git a/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch index bc3943087c..c3484360ee 100644 --- a/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ b/meta/recipes-devtools/gcc/gcc/0010-Use-the-multilib-config-files-from-B-instead-of-usin.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b015460586e2ea8a35a11d1a607728707bdf6509 Mon Sep 17 00:00:00 2001 | 1 | From 7e5706e74643d8bf78b117620849e546a31295c5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:33:04 +0400 | 3 | Date: Fri, 29 Mar 2013 09:33:04 +0400 |
4 | Subject: [PATCH] Use the multilib config files from ${B} instead of using the | 4 | Subject: [PATCH] Use the multilib config files from ${B} instead of using the |
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration] | |||
18 | 2 files changed, 36 insertions(+), 8 deletions(-) | 18 | 2 files changed, 36 insertions(+), 8 deletions(-) |
19 | 19 | ||
20 | diff --git a/gcc/configure b/gcc/configure | 20 | diff --git a/gcc/configure b/gcc/configure |
21 | index cf773a8b854..448a1ec093e 100755 | 21 | index 3870d6e9b6d..07a0b8571d2 100755 |
22 | --- a/gcc/configure | 22 | --- a/gcc/configure |
23 | +++ b/gcc/configure | 23 | +++ b/gcc/configure |
24 | @@ -13487,10 +13487,20 @@ done | 24 | @@ -15135,10 +15135,20 @@ done |
25 | tmake_file_= | 25 | tmake_file_= |
26 | for f in ${tmake_file} | 26 | for f in ${tmake_file} |
27 | do | 27 | do |
@@ -46,7 +46,7 @@ index cf773a8b854..448a1ec093e 100755 | |||
46 | done | 46 | done |
47 | tmake_file="${tmake_file_}${omp_device_property_tmake_file}" | 47 | tmake_file="${tmake_file_}${omp_device_property_tmake_file}" |
48 | 48 | ||
49 | @@ -13501,6 +13511,10 @@ tm_file_list="options.h" | 49 | @@ -15149,6 +15159,10 @@ tm_file_list="options.h" |
50 | tm_include_list="options.h insn-constants.h" | 50 | tm_include_list="options.h insn-constants.h" |
51 | for f in $tm_file; do | 51 | for f in $tm_file; do |
52 | case $f in | 52 | case $f in |
@@ -58,10 +58,10 @@ index cf773a8b854..448a1ec093e 100755 | |||
58 | f=`echo $f | sed 's/^..//'` | 58 | f=`echo $f | sed 's/^..//'` |
59 | tm_file_list="${tm_file_list} $f" | 59 | tm_file_list="${tm_file_list} $f" |
60 | diff --git a/gcc/configure.ac b/gcc/configure.ac | 60 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
61 | index 22591478b72..b6e7f5149a7 100644 | 61 | index 15670de1706..fd96dd7ba49 100644 |
62 | --- a/gcc/configure.ac | 62 | --- a/gcc/configure.ac |
63 | +++ b/gcc/configure.ac | 63 | +++ b/gcc/configure.ac |
64 | @@ -2337,10 +2337,20 @@ done | 64 | @@ -2363,10 +2363,20 @@ done |
65 | tmake_file_= | 65 | tmake_file_= |
66 | for f in ${tmake_file} | 66 | for f in ${tmake_file} |
67 | do | 67 | do |
@@ -86,7 +86,7 @@ index 22591478b72..b6e7f5149a7 100644 | |||
86 | done | 86 | done |
87 | tmake_file="${tmake_file_}${omp_device_property_tmake_file}" | 87 | tmake_file="${tmake_file_}${omp_device_property_tmake_file}" |
88 | 88 | ||
89 | @@ -2351,6 +2361,10 @@ tm_file_list="options.h" | 89 | @@ -2377,6 +2387,10 @@ tm_file_list="options.h" |
90 | tm_include_list="options.h insn-constants.h" | 90 | tm_include_list="options.h insn-constants.h" |
91 | for f in $tm_file; do | 91 | for f in $tm_file; do |
92 | case $f in | 92 | case $f in |
diff --git a/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch b/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch index 974aca5ee4..8633f7c436 100644 --- a/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch +++ b/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b7ce05b2d969b311c6061bda32c3117c76bf7e0c Mon Sep 17 00:00:00 2001 | 1 | From 0671715ae6d411b5d2d4c53fee42a6e9fe2562c2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 31 Jan 2023 22:03:38 -0800 | 3 | Date: Tue, 31 Jan 2023 22:03:38 -0800 |
4 | Subject: [PATCH] aarch64: Fix include paths when S != B | 4 | Subject: [PATCH] aarch64: Fix include paths when S != B |
@@ -24,32 +24,44 @@ Upstream-Status: Pending | |||
24 | 24 | ||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
26 | --- | 26 | --- |
27 | gcc/config/aarch64/aarch64.h | 8 ++++---- | 27 | gcc/config/aarch64/aarch64.h | 14 +++++++------- |
28 | 1 file changed, 4 insertions(+), 4 deletions(-) | 28 | 1 file changed, 7 insertions(+), 7 deletions(-) |
29 | 29 | ||
30 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | 30 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h |
31 | index 73b09e20508..10ea3672f20 100644 | 31 | index 45e901cda64..591062d4b39 100644 |
32 | --- a/gcc/config/aarch64/aarch64.h | 32 | --- a/gcc/config/aarch64/aarch64.h |
33 | +++ b/gcc/config/aarch64/aarch64.h | 33 | +++ b/gcc/config/aarch64/aarch64.h |
34 | @@ -161,8 +161,8 @@ | 34 | @@ -170,9 +170,9 @@ enum class aarch64_feature : unsigned char { |
35 | enum class aarch64_feature : unsigned char { | 35 | #define DEF_AARCH64_ISA_MODE(IDENT) IDENT, |
36 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT, | 36 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT, |
37 | #define AARCH64_ARCH(A, B, IDENT, D, E) IDENT, | 37 | #define AARCH64_ARCH(A, B, IDENT, D, E) IDENT, |
38 | -#include "aarch64-isa-modes.def" | ||
38 | -#include "aarch64-option-extensions.def" | 39 | -#include "aarch64-option-extensions.def" |
39 | -#include "aarch64-arches.def" | 40 | -#include "aarch64-arches.def" |
41 | +#include "config/aarch64/aarch64-isa-modes.def" | ||
40 | +#include "config/aarch64/aarch64-option-extensions.def" | 42 | +#include "config/aarch64/aarch64-option-extensions.def" |
41 | +#include "config/aarch64/aarch64-arches.def" | 43 | +#include "config/aarch64/aarch64-arches.def" |
42 | }; | 44 | }; |
43 | 45 | ||
44 | /* Define unique flags for each of the above. */ | 46 | /* Define unique flags for each of the above. */ |
45 | @@ -171,8 +171,8 @@ enum class aarch64_feature : unsigned char { | 47 | @@ -182,16 +182,16 @@ enum class aarch64_feature : unsigned char { |
46 | = aarch64_feature_flags (1) << int (aarch64_feature::IDENT); | 48 | #define DEF_AARCH64_ISA_MODE(IDENT) HANDLE (IDENT) |
47 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT) | 49 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT) |
48 | #define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT) | 50 | #define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT) |
51 | -#include "aarch64-isa-modes.def" | ||
49 | -#include "aarch64-option-extensions.def" | 52 | -#include "aarch64-option-extensions.def" |
50 | -#include "aarch64-arches.def" | 53 | -#include "aarch64-arches.def" |
54 | +#include "config/aarch64/aarch64-isa-modes.def" | ||
51 | +#include "config/aarch64/aarch64-option-extensions.def" | 55 | +#include "config/aarch64/aarch64-option-extensions.def" |
52 | +#include "config/aarch64/aarch64-arches.def" | 56 | +#include "config/aarch64/aarch64-arches.def" |
53 | #undef HANDLE | 57 | #undef HANDLE |
54 | 58 | ||
55 | #endif | 59 | constexpr auto AARCH64_FL_SM_STATE = AARCH64_FL_SM_ON | AARCH64_FL_SM_OFF; |
60 | |||
61 | constexpr unsigned int AARCH64_NUM_ISA_MODES = (0 | ||
62 | #define DEF_AARCH64_ISA_MODE(IDENT) + 1 | ||
63 | -#include "aarch64-isa-modes.def" | ||
64 | +#include "config/aarch64/aarch64-isa-modes.def" | ||
65 | ); | ||
66 | |||
67 | /* The mask of all ISA modes. */ | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch index cf5efcd32d..2f6ecd53bb 100644 --- a/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ b/meta/recipes-devtools/gcc/gcc/0012-Avoid-using-libdir-from-.la-which-usually-points-to-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 39ab6fe76f2788b2c989d29c9016f1fe53cb736e Mon Sep 17 00:00:00 2001 | 1 | From a40108180f552788bb321a853ed4d5f034866a48 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 20 Feb 2015 09:39:38 +0000 | 3 | Date: Fri, 20 Feb 2015 09:39:38 +0000 |
4 | Subject: [PATCH] Avoid using libdir from .la which usually points to a host | 4 | Subject: [PATCH] Avoid using libdir from .la which usually points to a host |
diff --git a/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch index e2343a3c17..eb4f0b3045 100644 --- a/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc/0013-Ensure-target-gcc-headers-can-be-included.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 531b9df680c4380797e8e7705a8e7f8ed17ebe68 Mon Sep 17 00:00:00 2001 | 1 | From 6ad8db533c7d53a85e6280da1ad88ed4077258fb Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 | 3 | Date: Fri, 20 Feb 2015 10:25:11 +0000 |
4 | Subject: [PATCH] Ensure target gcc headers can be included | 4 | Subject: [PATCH] Ensure target gcc headers can be included |
@@ -25,10 +25,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | 4 files changed, 22 insertions(+) | 25 | 4 files changed, 22 insertions(+) |
26 | 26 | ||
27 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 27 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
28 | index 04f28984b34..8ef996c0f4d 100644 | 28 | index 956437df95b..6a009c696e9 100644 |
29 | --- a/gcc/Makefile.in | 29 | --- a/gcc/Makefile.in |
30 | +++ b/gcc/Makefile.in | 30 | +++ b/gcc/Makefile.in |
31 | @@ -640,6 +640,7 @@ libexecdir = @libexecdir@ | 31 | @@ -671,6 +671,7 @@ libexecdir = @libexecdir@ |
32 | 32 | ||
33 | # Directory in which the compiler finds libraries etc. | 33 | # Directory in which the compiler finds libraries etc. |
34 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | 34 | libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
@@ -36,7 +36,7 @@ index 04f28984b34..8ef996c0f4d 100644 | |||
36 | # Directory in which the compiler finds executables | 36 | # Directory in which the compiler finds executables |
37 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) | 37 | libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) |
38 | # Directory in which all plugin resources are installed | 38 | # Directory in which all plugin resources are installed |
39 | @@ -3059,6 +3060,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" | 39 | @@ -3199,6 +3200,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" |
40 | 40 | ||
41 | PREPROCESSOR_DEFINES = \ | 41 | PREPROCESSOR_DEFINES = \ |
42 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ | 42 | -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ |
@@ -45,7 +45,7 @@ index 04f28984b34..8ef996c0f4d 100644 | |||
45 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ | 45 | -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ |
46 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ | 46 | -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ |
47 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 47 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
48 | index 6491c6b84f5..57496ff1f2f 100644 | 48 | index e36f32bf59e..c6aada42eb7 100644 |
49 | --- a/gcc/config/linux.h | 49 | --- a/gcc/config/linux.h |
50 | +++ b/gcc/config/linux.h | 50 | +++ b/gcc/config/linux.h |
51 | @@ -157,6 +157,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 51 | @@ -157,6 +157,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -71,7 +71,7 @@ index 6491c6b84f5..57496ff1f2f 100644 | |||
71 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | 71 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ |
72 | { 0, 0, 0, 0, 0, 0 } \ | 72 | { 0, 0, 0, 0, 0, 0 } \ |
73 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 73 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
74 | index 26db003cb3a..3a443abcf6b 100644 | 74 | index 8fda952e69c..247acec9d8e 100644 |
75 | --- a/gcc/config/rs6000/sysv4.h | 75 | --- a/gcc/config/rs6000/sysv4.h |
76 | +++ b/gcc/config/rs6000/sysv4.h | 76 | +++ b/gcc/config/rs6000/sysv4.h |
77 | @@ -986,6 +986,13 @@ ncrtn.o%s" | 77 | @@ -986,6 +986,13 @@ ncrtn.o%s" |
@@ -97,7 +97,7 @@ index 26db003cb3a..3a443abcf6b 100644 | |||
97 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ | 97 | { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ |
98 | { 0, 0, 0, 0, 0, 0 } \ | 98 | { 0, 0, 0, 0, 0, 0 } \ |
99 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc | 99 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc |
100 | index 141bb4d25f6..734590a7059 100644 | 100 | index f82b4badad7..98bd66f95c6 100644 |
101 | --- a/gcc/cppdefault.cc | 101 | --- a/gcc/cppdefault.cc |
102 | +++ b/gcc/cppdefault.cc | 102 | +++ b/gcc/cppdefault.cc |
103 | @@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] | 103 | @@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[] |
diff --git a/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch index 30224d7485..a9cbc08f1a 100644 --- a/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ b/meta/recipes-devtools/gcc/gcc/0014-Don-t-search-host-directory-during-relink-if-inst_pr.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 793201cebfeb129f6f263e64310b30a0ffa48895 Mon Sep 17 00:00:00 2001 | 1 | From e0d53bf9d59438a1dce0774163fa8c41cf32f306 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 3 Mar 2015 08:21:19 +0000 | 3 | Date: Tue, 3 Mar 2015 08:21:19 +0000 |
4 | Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix | 4 | Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix |
diff --git a/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch index 33c601ac97..8eb00287fc 100644 --- a/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ b/meta/recipes-devtools/gcc/gcc/0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5de63874335c1c673dd132f6aca00dc13f1eac51 Mon Sep 17 00:00:00 2001 | 1 | From c2ea8aaa7b00c519c9c269c23ff840138ae491ac Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Sun, 5 Jul 2015 20:25:18 -0700 | 3 | Date: Sun, 5 Jul 2015 20:25:18 -0700 |
4 | Subject: [PATCH] libcc1: fix libcc1's install path and rpath | 4 | Subject: [PATCH] libcc1: fix libcc1's install path and rpath |
@@ -20,7 +20,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
20 | 2 files changed, 4 insertions(+), 4 deletions(-) | 20 | 2 files changed, 4 insertions(+), 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am | 22 | diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am |
23 | index 921a33fe236..938e6f964cd 100644 | 23 | index b592bc8645f..97e2b615fb7 100644 |
24 | --- a/libcc1/Makefile.am | 24 | --- a/libcc1/Makefile.am |
25 | +++ b/libcc1/Makefile.am | 25 | +++ b/libcc1/Makefile.am |
26 | @@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ | 26 | @@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch index bdffcae7dc..82342b0532 100644 --- a/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/meta/recipes-devtools/gcc/gcc/0016-handle-sysroot-support-for-nativesdk-gcc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bbc75b93bff66891fa7ffb3af5c6ad53df1fff68 Mon Sep 17 00:00:00 2001 | 1 | From 82da570396a6835e7208c8bb508220524b3a07c7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 7 Dec 2015 23:39:54 +0000 | 3 | Date: Mon, 7 Dec 2015 23:39:54 +0000 |
4 | Subject: [PATCH] handle sysroot support for nativesdk-gcc | 4 | Subject: [PATCH] handle sysroot support for nativesdk-gcc |
@@ -46,10 +46,10 @@ Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org> | |||
46 | 8 files changed, 95 insertions(+), 73 deletions(-) | 46 | 8 files changed, 95 insertions(+), 73 deletions(-) |
47 | 47 | ||
48 | diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc | 48 | diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc |
49 | index c68a2a27469..77e9b5eceaa 100644 | 49 | index be3058dca63..0be85374760 100644 |
50 | --- a/gcc/c-family/c-opts.cc | 50 | --- a/gcc/c-family/c-opts.cc |
51 | +++ b/gcc/c-family/c-opts.cc | 51 | +++ b/gcc/c-family/c-opts.cc |
52 | @@ -1458,8 +1458,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) | 52 | @@ -1542,8 +1542,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain) |
53 | size_t prefix_len, suffix_len; | 53 | size_t prefix_len, suffix_len; |
54 | 54 | ||
55 | suffix_len = strlen (suffix); | 55 | suffix_len = strlen (suffix); |
@@ -61,7 +61,7 @@ index c68a2a27469..77e9b5eceaa 100644 | |||
61 | path = (char *) xmalloc (prefix_len + suffix_len + 1); | 61 | path = (char *) xmalloc (prefix_len + suffix_len + 1); |
62 | memcpy (path, prefix, prefix_len); | 62 | memcpy (path, prefix, prefix_len); |
63 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 63 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
64 | index 57496ff1f2f..c921cf6ef63 100644 | 64 | index c6aada42eb7..79ff13184d3 100644 |
65 | --- a/gcc/config/linux.h | 65 | --- a/gcc/config/linux.h |
66 | +++ b/gcc/config/linux.h | 66 | +++ b/gcc/config/linux.h |
67 | @@ -121,53 +121,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 67 | @@ -121,53 +121,53 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -139,7 +139,7 @@ index 57496ff1f2f..c921cf6ef63 100644 | |||
139 | } | 139 | } |
140 | #endif | 140 | #endif |
141 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h | 141 | diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h |
142 | index 3a443abcf6b..ef83a5a432e 100644 | 142 | index 247acec9d8e..5526bf050b8 100644 |
143 | --- a/gcc/config/rs6000/sysv4.h | 143 | --- a/gcc/config/rs6000/sysv4.h |
144 | +++ b/gcc/config/rs6000/sysv4.h | 144 | +++ b/gcc/config/rs6000/sysv4.h |
145 | @@ -950,53 +950,53 @@ ncrtn.o%s" | 145 | @@ -950,53 +950,53 @@ ncrtn.o%s" |
@@ -217,7 +217,7 @@ index 3a443abcf6b..ef83a5a432e 100644 | |||
217 | } | 217 | } |
218 | #endif | 218 | #endif |
219 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc | 219 | diff --git a/gcc/cppdefault.cc b/gcc/cppdefault.cc |
220 | index 734590a7059..b4a8fc29e4a 100644 | 220 | index 98bd66f95c6..742a4e56d5b 100644 |
221 | --- a/gcc/cppdefault.cc | 221 | --- a/gcc/cppdefault.cc |
222 | +++ b/gcc/cppdefault.cc | 222 | +++ b/gcc/cppdefault.cc |
223 | @@ -35,6 +35,30 @@ | 223 | @@ -35,6 +35,30 @@ |
@@ -347,7 +347,7 @@ index 734590a7059..b4a8fc29e4a 100644 | |||
347 | /* This value is set by cpp_relocated at runtime */ | 347 | /* This value is set by cpp_relocated at runtime */ |
348 | const char *gcc_exec_prefix; | 348 | const char *gcc_exec_prefix; |
349 | diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h | 349 | diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h |
350 | index e26b424e99c..c9abb090dcd 100644 | 350 | index e9b9264caff..168144b84b8 100644 |
351 | --- a/gcc/cppdefault.h | 351 | --- a/gcc/cppdefault.h |
352 | +++ b/gcc/cppdefault.h | 352 | +++ b/gcc/cppdefault.h |
353 | @@ -33,7 +33,8 @@ | 353 | @@ -33,7 +33,8 @@ |
@@ -382,10 +382,10 @@ index e26b424e99c..c9abb090dcd 100644 | |||
382 | subdirectory of the actual installation. */ | 382 | subdirectory of the actual installation. */ |
383 | extern const char *gcc_exec_prefix; | 383 | extern const char *gcc_exec_prefix; |
384 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 384 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
385 | index 8af0c814c33..605fe3b8c0d 100644 | 385 | index e3e9374d1cc..b080609341b 100644 |
386 | --- a/gcc/gcc.cc | 386 | --- a/gcc/gcc.cc |
387 | +++ b/gcc/gcc.cc | 387 | +++ b/gcc/gcc.cc |
388 | @@ -255,6 +255,8 @@ FILE *report_times_to_file = NULL; | 388 | @@ -259,6 +259,8 @@ FILE *report_times_to_file = NULL; |
389 | #endif | 389 | #endif |
390 | static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; | 390 | static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; |
391 | 391 | ||
@@ -394,7 +394,7 @@ index 8af0c814c33..605fe3b8c0d 100644 | |||
394 | /* Nonzero means pass the updated target_system_root to the compiler. */ | 394 | /* Nonzero means pass the updated target_system_root to the compiler. */ |
395 | 395 | ||
396 | static int target_system_root_changed; | 396 | static int target_system_root_changed; |
397 | @@ -578,6 +580,7 @@ or with constant text in a single argument. | 397 | @@ -591,6 +593,7 @@ or with constant text in a single argument. |
398 | %G process LIBGCC_SPEC as a spec. | 398 | %G process LIBGCC_SPEC as a spec. |
399 | %R Output the concatenation of target_system_root and | 399 | %R Output the concatenation of target_system_root and |
400 | target_sysroot_suffix. | 400 | target_sysroot_suffix. |
@@ -402,7 +402,7 @@ index 8af0c814c33..605fe3b8c0d 100644 | |||
402 | %S process STARTFILE_SPEC as a spec. A capital S is actually used here. | 402 | %S process STARTFILE_SPEC as a spec. A capital S is actually used here. |
403 | %E process ENDFILE_SPEC as a spec. A capital E is actually used here. | 403 | %E process ENDFILE_SPEC as a spec. A capital E is actually used here. |
404 | %C process CPP_SPEC as a spec. | 404 | %C process CPP_SPEC as a spec. |
405 | @@ -1619,10 +1622,10 @@ static const char *gcc_libexec_prefix; | 405 | @@ -1638,10 +1641,10 @@ static const char *gcc_libexec_prefix; |
406 | gcc_exec_prefix is set because, in that case, we know where the | 406 | gcc_exec_prefix is set because, in that case, we know where the |
407 | compiler has been installed, and use paths relative to that | 407 | compiler has been installed, and use paths relative to that |
408 | location instead. */ | 408 | location instead. */ |
@@ -417,7 +417,7 @@ index 8af0c814c33..605fe3b8c0d 100644 | |||
417 | 417 | ||
418 | /* For native compilers, these are well-known paths containing | 418 | /* For native compilers, these are well-known paths containing |
419 | components that may be provided by the system. For cross | 419 | components that may be provided by the system. For cross |
420 | @@ -1630,9 +1633,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; | 420 | @@ -1649,9 +1652,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; |
421 | static const char *md_exec_prefix = MD_EXEC_PREFIX; | 421 | static const char *md_exec_prefix = MD_EXEC_PREFIX; |
422 | static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; | 422 | static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; |
423 | static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; | 423 | static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; |
@@ -429,7 +429,7 @@ index 8af0c814c33..605fe3b8c0d 100644 | |||
429 | = STANDARD_STARTFILE_PREFIX_2; | 429 | = STANDARD_STARTFILE_PREFIX_2; |
430 | 430 | ||
431 | /* A relative path to be used in finding the location of tools | 431 | /* A relative path to be used in finding the location of tools |
432 | @@ -6652,6 +6655,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) | 432 | @@ -6796,6 +6799,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) |
433 | } | 433 | } |
434 | break; | 434 | break; |
435 | 435 | ||
@@ -442,7 +442,7 @@ index 8af0c814c33..605fe3b8c0d 100644 | |||
442 | value = do_spec_1 (startfile_spec, 0, NULL); | 442 | value = do_spec_1 (startfile_spec, 0, NULL); |
443 | if (value != 0) | 443 | if (value != 0) |
444 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc | 444 | diff --git a/gcc/incpath.cc b/gcc/incpath.cc |
445 | index 46c0d543205..d088dae7b04 100644 | 445 | index e572d98ab17..2cb2b586e4a 100644 |
446 | --- a/gcc/incpath.cc | 446 | --- a/gcc/incpath.cc |
447 | +++ b/gcc/incpath.cc | 447 | +++ b/gcc/incpath.cc |
448 | @@ -135,7 +135,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, | 448 | @@ -135,7 +135,7 @@ add_standard_paths (const char *sysroot, const char *iprefix, |
@@ -489,7 +489,7 @@ index 46c0d543205..d088dae7b04 100644 | |||
489 | str = update_path (ostr, p->component); | 489 | str = update_path (ostr, p->component); |
490 | free (ostr); | 490 | free (ostr); |
491 | diff --git a/gcc/prefix.cc b/gcc/prefix.cc | 491 | diff --git a/gcc/prefix.cc b/gcc/prefix.cc |
492 | index c2a37bde5ea..33944701ced 100644 | 492 | index 6a98e856855..c403b2da7a3 100644 |
493 | --- a/gcc/prefix.cc | 493 | --- a/gcc/prefix.cc |
494 | +++ b/gcc/prefix.cc | 494 | +++ b/gcc/prefix.cc |
495 | @@ -73,7 +73,9 @@ License along with GCC; see the file COPYING3. If not see | 495 | @@ -73,7 +73,9 @@ License along with GCC; see the file COPYING3. If not see |
diff --git a/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch index 8a11049ca3..f87461bcaf 100644 --- a/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ b/meta/recipes-devtools/gcc/gcc/0017-Search-target-sysroot-gcc-version-specific-dirs-with.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7e095089452b6e895ec40981752e9f902f0ad889 Mon Sep 17 00:00:00 2001 | 1 | From cafcdfea0526dda5377a999dd9b1b8c805eafe0a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 7 Dec 2015 23:41:45 +0000 | 3 | Date: Mon, 7 Dec 2015 23:41:45 +0000 |
4 | Subject: [PATCH] Search target sysroot gcc version specific dirs with | 4 | Subject: [PATCH] Search target sysroot gcc version specific dirs with |
@@ -52,10 +52,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
52 | 1 file changed, 28 insertions(+), 1 deletion(-) | 52 | 1 file changed, 28 insertions(+), 1 deletion(-) |
53 | 53 | ||
54 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc | 54 | diff --git a/gcc/gcc.cc b/gcc/gcc.cc |
55 | index 605fe3b8c0d..c3a1dab38c4 100644 | 55 | index b080609341b..1a1ca05064e 100644 |
56 | --- a/gcc/gcc.cc | 56 | --- a/gcc/gcc.cc |
57 | +++ b/gcc/gcc.cc | 57 | +++ b/gcc/gcc.cc |
58 | @@ -2809,7 +2809,7 @@ for_each_path (const struct path_prefix *paths, | 58 | @@ -2823,7 +2823,7 @@ for_each_path (const struct path_prefix *paths, |
59 | if (path == NULL) | 59 | if (path == NULL) |
60 | { | 60 | { |
61 | len = paths->max_len + extra_space + 1; | 61 | len = paths->max_len + extra_space + 1; |
@@ -64,7 +64,7 @@ index 605fe3b8c0d..c3a1dab38c4 100644 | |||
64 | path = XNEWVEC (char, len); | 64 | path = XNEWVEC (char, len); |
65 | } | 65 | } |
66 | 66 | ||
67 | @@ -2821,6 +2821,33 @@ for_each_path (const struct path_prefix *paths, | 67 | @@ -2835,6 +2835,33 @@ for_each_path (const struct path_prefix *paths, |
68 | /* Look first in MACHINE/VERSION subdirectory. */ | 68 | /* Look first in MACHINE/VERSION subdirectory. */ |
69 | if (!skip_multi_dir) | 69 | if (!skip_multi_dir) |
70 | { | 70 | { |
diff --git a/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index 9bc77b485f..71e43e556d 100644 --- a/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/meta/recipes-devtools/gcc/gcc/0018-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf92b290556b7050df0a001cc7ae43cf79990456 Mon Sep 17 00:00:00 2001 | 1 | From f2ad66276fd197cc088d7316662b1d792357ef6c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 27 Jun 2017 18:10:54 -0700 | 3 | Date: Tue, 27 Jun 2017 18:10:54 -0700 |
4 | Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets | 4 | Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets |
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
23 | 3 files changed, 27 insertions(+) | 23 | 3 files changed, 27 insertions(+) |
24 | 24 | ||
25 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h | 25 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
26 | index c921cf6ef63..32e1bc1ae2d 100644 | 26 | index 79ff13184d3..19f552e8c7d 100644 |
27 | --- a/gcc/config/linux.h | 27 | --- a/gcc/config/linux.h |
28 | +++ b/gcc/config/linux.h | 28 | +++ b/gcc/config/linux.h |
29 | @@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see | 29 | @@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
@@ -41,10 +41,10 @@ index c921cf6ef63..32e1bc1ae2d 100644 | |||
41 | 41 | ||
42 | #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ | 42 | #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ |
43 | diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h | 43 | diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h |
44 | index 5d21befe8e4..1248a68e4ca 100644 | 44 | index 5f6cede558a..900993b6da4 100644 |
45 | --- a/gcc/config/rs6000/linux.h | 45 | --- a/gcc/config/rs6000/linux.h |
46 | +++ b/gcc/config/rs6000/linux.h | 46 | +++ b/gcc/config/rs6000/linux.h |
47 | @@ -99,6 +99,16 @@ | 47 | @@ -102,6 +102,16 @@ |
48 | " -m elf32ppclinux") | 48 | " -m elf32ppclinux") |
49 | #endif | 49 | #endif |
50 | 50 | ||
@@ -62,10 +62,10 @@ index 5d21befe8e4..1248a68e4ca 100644 | |||
62 | #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ | 62 | #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \ |
63 | %{!static-pie: \ | 63 | %{!static-pie: \ |
64 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h | 64 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
65 | index 2ddab7c99c1..9641580fc83 100644 | 65 | index a11ae7643b7..2abde270813 100644 |
66 | --- a/gcc/config/rs6000/linux64.h | 66 | --- a/gcc/config/rs6000/linux64.h |
67 | +++ b/gcc/config/rs6000/linux64.h | 67 | +++ b/gcc/config/rs6000/linux64.h |
68 | @@ -372,6 +372,16 @@ extern int dot_symbols; | 68 | @@ -373,6 +373,16 @@ extern int dot_symbols; |
69 | " -m elf64ppc") | 69 | " -m elf64ppc") |
70 | #endif | 70 | #endif |
71 | 71 | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch index f785688661..7f92dea0c6 100644 --- a/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch +++ b/meta/recipes-devtools/gcc/gcc/0019-Re-introduce-spe-commandline-options.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 587ac4a59ea56da18a9989c31a75124e974cb37c Mon Sep 17 00:00:00 2001 | 1 | From 65baa3804819fbcd540be48f4c4611be5cba43c4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 6 Jun 2018 12:10:22 -0700 | 3 | Date: Wed, 6 Jun 2018 12:10:22 -0700 |
4 | Subject: [PATCH] Re-introduce spe commandline options | 4 | Subject: [PATCH] Re-introduce spe commandline options |
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 13 insertions(+) | 14 | 1 file changed, 13 insertions(+) |
15 | 15 | ||
16 | diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt | 16 | diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt |
17 | index bde6d3ff664..5af9640825c 100644 | 17 | index 83197681b66..04bea50b894 100644 |
18 | --- a/gcc/config/rs6000/rs6000.opt | 18 | --- a/gcc/config/rs6000/rs6000.opt |
19 | +++ b/gcc/config/rs6000/rs6000.opt | 19 | +++ b/gcc/config/rs6000/rs6000.opt |
20 | @@ -344,6 +344,19 @@ mdebug= | 20 | @@ -344,6 +344,19 @@ mdebug= |
diff --git a/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch index b86edab5d5..c5f43f5ba4 100644 --- a/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ b/meta/recipes-devtools/gcc/gcc/0020-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8c4c59521720f8c1b1e38e38896b47fcb1bf00ac Mon Sep 17 00:00:00 2001 | 1 | From 18b0057e4e2c5cf6fc6541670418f43f0381db3e Mon Sep 17 00:00:00 2001 |
2 | From: Szabolcs Nagy <nsz@port70.net> | 2 | From: Szabolcs Nagy <nsz@port70.net> |
3 | Date: Sat, 24 Oct 2015 20:09:53 +0000 | 3 | Date: Sat, 24 Oct 2015 20:09:53 +0000 |
4 | Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of | 4 | Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of |
@@ -39,10 +39,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
39 | 3 files changed, 6 insertions(+), 6 deletions(-) | 39 | 3 files changed, 6 insertions(+), 6 deletions(-) |
40 | 40 | ||
41 | diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc | 41 | diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc |
42 | index 0d817fc3f3b..8d34d19d3f9 100644 | 42 | index 8bb8f21e686..bcf976aa1b9 100644 |
43 | --- a/gcc/config/i386/i386-expand.cc | 43 | --- a/gcc/config/i386/i386-expand.cc |
44 | +++ b/gcc/config/i386/i386-expand.cc | 44 | +++ b/gcc/config/i386/i386-expand.cc |
45 | @@ -12691,10 +12691,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, | 45 | @@ -13087,10 +13087,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, |
46 | { | 46 | { |
47 | case IX86_BUILTIN_CPU_INIT: | 47 | case IX86_BUILTIN_CPU_INIT: |
48 | { | 48 | { |
@@ -56,7 +56,7 @@ index 0d817fc3f3b..8d34d19d3f9 100644 | |||
56 | return expand_expr (call_expr, target, mode, EXPAND_NORMAL); | 56 | return expand_expr (call_expr, target, mode, EXPAND_NORMAL); |
57 | } | 57 | } |
58 | diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c | 58 | diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c |
59 | index 50b6d8248a2..724ced402a1 100644 | 59 | index 0bd6dffe17e..ef4acb175a4 100644 |
60 | --- a/libgcc/config/i386/cpuinfo.c | 60 | --- a/libgcc/config/i386/cpuinfo.c |
61 | +++ b/libgcc/config/i386/cpuinfo.c | 61 | +++ b/libgcc/config/i386/cpuinfo.c |
62 | @@ -63,7 +63,7 @@ __cpu_indicator_init (void) | 62 | @@ -63,7 +63,7 @@ __cpu_indicator_init (void) |
diff --git a/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch b/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index b6707592dc..dce2c047d0 100644 --- a/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch +++ b/meta/recipes-devtools/gcc/gcc/0021-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f15b19d8e058c983c49c4566c1879fdaf5b1ab54 Mon Sep 17 00:00:00 2001 | 1 | From a9bb04b7cf02b2f2d16f68733488f9e48fc7e7a9 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 10 Mar 2020 08:26:53 -0700 | 3 | Date: Tue, 10 Mar 2020 08:26:53 -0700 |
4 | Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining | 4 | Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining |
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 2 files changed, 19 insertions(+), 19 deletions(-) | 17 | 2 files changed, 19 insertions(+), 19 deletions(-) |
18 | 18 | ||
19 | diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc | 19 | diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc |
20 | index 7763f40e9ab..4f0c1eb1508 100644 | 20 | index c0ecbe8558b..9f8ab7146c0 100644 |
21 | --- a/gcc/gengtype.cc | 21 | --- a/gcc/gengtype.cc |
22 | +++ b/gcc/gengtype.cc | 22 | +++ b/gcc/gengtype.cc |
23 | @@ -1005,7 +1005,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, | 23 | @@ -1005,7 +1005,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, |
@@ -38,7 +38,7 @@ index 7763f40e9ab..4f0c1eb1508 100644 | |||
38 | 38 | ||
39 | /* Reverse a linked list of 'struct pair's in place. */ | 39 | /* Reverse a linked list of 'struct pair's in place. */ |
40 | pair_p | 40 | pair_p |
41 | @@ -5223,7 +5223,7 @@ main (int argc, char **argv) | 41 | @@ -5232,7 +5232,7 @@ main (int argc, char **argv) |
42 | /* These types are set up with #define or else outside of where | 42 | /* These types are set up with #define or else outside of where |
43 | we can see them. We should initialize them before calling | 43 | we can see them. We should initialize them before calling |
44 | read_input_list. */ | 44 | read_input_list. */ |
@@ -48,7 +48,7 @@ index 7763f40e9ab..4f0c1eb1508 100644 | |||
48 | POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); | 48 | POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); |
49 | POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); | 49 | POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); |
50 | diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc | 50 | diff --git a/gcc/genmodes.cc b/gcc/genmodes.cc |
51 | index 715787b8f48..302adff28d5 100644 | 51 | index eb3f9e2f0c1..5425635cb22 100644 |
52 | --- a/gcc/genmodes.cc | 52 | --- a/gcc/genmodes.cc |
53 | +++ b/gcc/genmodes.cc | 53 | +++ b/gcc/genmodes.cc |
54 | @@ -441,7 +441,7 @@ complete_all_modes (void) | 54 | @@ -441,7 +441,7 @@ complete_all_modes (void) |
diff --git a/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch b/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch index 0ea8aac543..d710b50594 100644 --- a/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch +++ b/meta/recipes-devtools/gcc/gcc/0022-libatomic-Do-not-enforce-march-on-aarch64.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 939a899b862f7a25e52b74d1587fc75fc65779c0 Mon Sep 17 00:00:00 2001 | 1 | From db4380eac3cd9baa2f31bcd2fb936ed51f27b415 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 13 May 2020 15:10:38 -0700 | 3 | Date: Wed, 13 May 2020 15:10:38 -0700 |
4 | Subject: [PATCH] libatomic: Do not enforce march on aarch64 | 4 | Subject: [PATCH] libatomic: Do not enforce march on aarch64 |
@@ -17,25 +17,25 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 2 files changed, 2 deletions(-) | 17 | 2 files changed, 2 deletions(-) |
18 | 18 | ||
19 | diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am | 19 | diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am |
20 | index c6c8d81c56a..d959a5d040e 100644 | 20 | index 980677f3533..26188917946 100644 |
21 | --- a/libatomic/Makefile.am | 21 | --- a/libatomic/Makefile.am |
22 | +++ b/libatomic/Makefile.am | 22 | +++ b/libatomic/Makefile.am |
23 | @@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS))) | 23 | @@ -130,7 +130,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS))) |
24 | ## On a target-specific basis, include alternates to be selected by IFUNC. | 24 | ## On a target-specific basis, include alternates to be selected by IFUNC. |
25 | if HAVE_IFUNC | 25 | if HAVE_IFUNC |
26 | if ARCH_AARCH64_LINUX | 26 | if ARCH_AARCH64_LINUX |
27 | -IFUNC_OPTIONS = -march=armv8-a+lse | 27 | -IFUNC_OPTIONS = -march=armv8-a+lse |
28 | libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) | 28 | libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) |
29 | libatomic_la_SOURCES += atomic_16.S | ||
30 | 29 | ||
30 | endif | ||
31 | diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in | 31 | diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in |
32 | index a0fa3dfc8cc..e70d389874a 100644 | 32 | index d9d529bc502..47dacef9e01 100644 |
33 | --- a/libatomic/Makefile.in | 33 | --- a/libatomic/Makefile.in |
34 | +++ b/libatomic/Makefile.in | 34 | +++ b/libatomic/Makefile.in |
35 | @@ -447,7 +447,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) | 35 | @@ -452,7 +452,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files))) |
36 | libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ | 36 | libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \ |
37 | _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_3) \ | 37 | _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ |
38 | $(am__append_4) $(am__append_5) | 38 | $(am__append_3) $(am__append_4) |
39 | -@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse | 39 | -@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse |
40 | @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 | 40 | @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 |
41 | @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 | 41 | @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 |
diff --git a/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch b/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch index cd962d82bd..7f1cd0b3d8 100644 --- a/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch +++ b/meta/recipes-devtools/gcc/gcc/0023-Fix-install-path-of-linux64.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 696d696381dd99ec2bddb1170f96f98da36eb418 Mon Sep 17 00:00:00 2001 | 1 | From 92a77026cc64f5eab4cb6b35e4a7c59e6ab8aa20 Mon Sep 17 00:00:00 2001 |
2 | From: Andrei Gherzan <andrei.gherzan@huawei.com> | 2 | From: Andrei Gherzan <andrei.gherzan@huawei.com> |
3 | Date: Wed, 22 Dec 2021 12:49:25 +0100 | 3 | Date: Wed, 22 Dec 2021 12:49:25 +0100 |
4 | Subject: [PATCH] Fix install path of linux64.h | 4 | Subject: [PATCH] Fix install path of linux64.h |
@@ -17,11 +17,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 1 file changed, 2 insertions(+) | 17 | 1 file changed, 2 insertions(+) |
18 | 18 | ||
19 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in | 19 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
20 | index 8ef996c0f4d..21daf380e34 100644 | 20 | index 6a009c696e9..da54dd42adf 100644 |
21 | --- a/gcc/Makefile.in | 21 | --- a/gcc/Makefile.in |
22 | +++ b/gcc/Makefile.in | 22 | +++ b/gcc/Makefile.in |
23 | @@ -3731,6 +3731,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype | 23 | @@ -3900,6 +3900,8 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype |
24 | "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ | 24 | | "$(srcdir)"/config/* | "$(srcdir)"/common/config/* \ |
25 | | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ | 25 | | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ |
26 | base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ | 26 | base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ |
27 | + */linux64.h ) \ | 27 | + */linux64.h ) \ |
diff --git a/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch b/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch index 04d940ae0b..a34e6afdb4 100644 --- a/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch +++ b/meta/recipes-devtools/gcc/gcc/0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9487b1d6136ea09cce4792d59d0170c712575550 Mon Sep 17 00:00:00 2001 | 1 | From c6fc577e9e89dc16d3e971aa165602746232de4c Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Sat, 20 Aug 2022 09:04:14 -0700 | 3 | Date: Sat, 20 Aug 2022 09:04:14 -0700 |
4 | Subject: [PATCH] Avoid hardcoded build paths into ppc libgcc | 4 | Subject: [PATCH] Avoid hardcoded build paths into ppc libgcc |
diff --git a/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch b/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch index e4d57c27ef..454d05d473 100644 --- a/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch +++ b/meta/recipes-devtools/gcc/gcc/0025-gcc-testsuite-tweaks-for-mips-OE.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From f12acc6a383546d48da3bdfb2f25ca2adb7976d7 Mon Sep 17 00:00:00 2001 | 1 | From 8845248c81c0695ccc65311017deef824fa538fa Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Sun, 13 Aug 2023 10:24:05 +0100 | 3 | Date: Thu, 17 Aug 2023 09:01:40 -0700 |
4 | Subject: [PATCH] gcc testsuite tweaks for mips/OE | 4 | Subject: [PATCH] gcc testsuite tweaks for mips/OE |
5 | 5 | ||
6 | Disable loongson-mmi runtine, qemu doesn't appear to fully support them even if some | 6 | Disable loongson-mmi runtine, qemu doesn't appear to fully support them even if some |
@@ -26,10 +26,12 @@ Also, for gcc.target tests, add checks on wheter loongson or msa code can | |||
26 | be run before trying that, allowing downgrading of tests there to work too. | 26 | be run before trying that, allowing downgrading of tests there to work too. |
27 | 27 | ||
28 | Upstream-Status: Pending | 28 | Upstream-Status: Pending |
29 | |||
29 | [Parts of the patch may be able to be split off and acceptable to upstream with | 30 | [Parts of the patch may be able to be split off and acceptable to upstream with |
30 | discussion. Need to investigate why qemu-user passes the 'bad' instructions'] | 31 | discussion. Need to investigate why qemu-user passes the 'bad' instructions'] |
31 | 32 | ||
32 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 33 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
34 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
33 | --- | 35 | --- |
34 | gcc/testsuite/gcc.target/mips/mips.exp | 16 +++++++++ | 36 | gcc/testsuite/gcc.target/mips/mips.exp | 16 +++++++++ |
35 | gcc/testsuite/lib/gcc-dg.exp | 11 +++++++ | 37 | gcc/testsuite/lib/gcc-dg.exp | 11 +++++++ |
@@ -37,10 +39,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
37 | 3 files changed, 41 insertions(+), 31 deletions(-) | 39 | 3 files changed, 41 insertions(+), 31 deletions(-) |
38 | 40 | ||
39 | diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp | 41 | diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp |
40 | index 15d574202d3..2cef9709774 100644 | 42 | index e028bc93b40..b54a40d6509 100644 |
41 | --- a/gcc/testsuite/gcc.target/mips/mips.exp | 43 | --- a/gcc/testsuite/gcc.target/mips/mips.exp |
42 | +++ b/gcc/testsuite/gcc.target/mips/mips.exp | 44 | +++ b/gcc/testsuite/gcc.target/mips/mips.exp |
43 | @@ -709,7 +709,23 @@ proc mips_first_unsupported_option { upstatus } { | 45 | @@ -711,7 +711,23 @@ proc mips_first_unsupported_option { upstatus } { |
44 | global mips_option_tests | 46 | global mips_option_tests |
45 | upvar $upstatus status | 47 | upvar $upstatus status |
46 | 48 | ||
@@ -65,10 +67,10 @@ index 15d574202d3..2cef9709774 100644 | |||
65 | regsub -all "\n" $code "\\n\\\n" asm | 67 | regsub -all "\n" $code "\\n\\\n" asm |
66 | # Use check_runtime from target-supports.exp, which caches | 68 | # Use check_runtime from target-supports.exp, which caches |
67 | diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp | 69 | diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp |
68 | index 9d79b9402e9..e0e5cbb1af8 100644 | 70 | index 228c21d1207..d3b88e0419e 100644 |
69 | --- a/gcc/testsuite/lib/gcc-dg.exp | 71 | --- a/gcc/testsuite/lib/gcc-dg.exp |
70 | +++ b/gcc/testsuite/lib/gcc-dg.exp | 72 | +++ b/gcc/testsuite/lib/gcc-dg.exp |
71 | @@ -240,9 +240,20 @@ proc schedule-cleanups { opts } { | 73 | @@ -232,9 +232,20 @@ proc schedule-cleanups { opts } { |
72 | 74 | ||
73 | proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } { | 75 | proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } { |
74 | # Set up the compiler flags, based on what we're going to do. | 76 | # Set up the compiler flags, based on what we're going to do. |
@@ -77,23 +79,23 @@ index 9d79b9402e9..e0e5cbb1af8 100644 | |||
77 | set options [list] | 79 | set options [list] |
78 | 80 | ||
79 | + if [info exists do-what-limit] then { | 81 | + if [info exists do-what-limit] then { |
80 | + # Demote run tests to $do-what-limit if set | 82 | + # Demote run tests to $do-what-limit if set |
81 | + switch $do_what { | 83 | + switch $do_what { |
82 | + run { | 84 | + run { |
83 | + set do_what ${do-what-limit} | 85 | + set do_what ${do-what-limit} |
84 | + set dg-do-what ${do-what-limit} | 86 | + set dg-do-what ${do-what-limit} |
85 | + } | 87 | + } |
86 | + } | 88 | + } |
87 | + } | 89 | + } |
88 | + | 90 | + |
89 | switch $do_what { | 91 | switch $do_what { |
90 | "preprocess" { | 92 | "preprocess" { |
91 | set compile_type "preprocess" | 93 | set compile_type "preprocess" |
92 | diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp | 94 | diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp |
93 | index 40f71e9ed8b..10e267fa16d 100644 | 95 | index 45435586de2..04942540d8b 100644 |
94 | --- a/gcc/testsuite/lib/target-supports.exp | 96 | --- a/gcc/testsuite/lib/target-supports.exp |
95 | +++ b/gcc/testsuite/lib/target-supports.exp | 97 | +++ b/gcc/testsuite/lib/target-supports.exp |
96 | @@ -2155,14 +2155,7 @@ proc check_mips_loongson_mmi_hw_available { } { | 98 | @@ -2483,14 +2483,7 @@ proc check_mips_loongson_mmi_hw_available { } { |
97 | if { !([istarget mips*-*-*]) } { | 99 | if { !([istarget mips*-*-*]) } { |
98 | expr 0 | 100 | expr 0 |
99 | } else { | 101 | } else { |
@@ -109,7 +111,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
109 | } | 111 | } |
110 | }] | 112 | }] |
111 | } | 113 | } |
112 | @@ -2176,29 +2169,7 @@ proc check_mips_msa_hw_available { } { | 114 | @@ -2504,29 +2497,7 @@ proc check_mips_msa_hw_available { } { |
113 | if { !([istarget mips*-*-*]) } { | 115 | if { !([istarget mips*-*-*]) } { |
114 | expr 0 | 116 | expr 0 |
115 | } else { | 117 | } else { |
@@ -140,7 +142,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
140 | } | 142 | } |
141 | }] | 143 | }] |
142 | } | 144 | } |
143 | @@ -9187,6 +9158,7 @@ proc is-effective-target-keyword { arg } { | 145 | @@ -9897,6 +9868,7 @@ proc is-effective-target-keyword { arg } { |
144 | 146 | ||
145 | proc et-dg-runtest { runtest testcases flags default-extra-flags } { | 147 | proc et-dg-runtest { runtest testcases flags default-extra-flags } { |
146 | global dg-do-what-default | 148 | global dg-do-what-default |
@@ -148,7 +150,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
148 | global EFFECTIVE_TARGETS | 150 | global EFFECTIVE_TARGETS |
149 | global et_index | 151 | global et_index |
150 | 152 | ||
151 | @@ -9194,6 +9166,7 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { | 153 | @@ -9904,6 +9876,7 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { |
152 | foreach target $EFFECTIVE_TARGETS { | 154 | foreach target $EFFECTIVE_TARGETS { |
153 | set target_flags $flags | 155 | set target_flags $flags |
154 | set dg-do-what-default compile | 156 | set dg-do-what-default compile |
@@ -156,7 +158,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
156 | set et_index [lsearch -exact $EFFECTIVE_TARGETS $target] | 158 | set et_index [lsearch -exact $EFFECTIVE_TARGETS $target] |
157 | if { [info procs add_options_for_${target}] != [list] } { | 159 | if { [info procs add_options_for_${target}] != [list] } { |
158 | set target_flags [add_options_for_${target} "$flags"] | 160 | set target_flags [add_options_for_${target} "$flags"] |
159 | @@ -9201,8 +9174,10 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { | 161 | @@ -9911,8 +9884,10 @@ proc et-dg-runtest { runtest testcases flags default-extra-flags } { |
160 | if { [info procs check_effective_target_${target}_runtime] | 162 | if { [info procs check_effective_target_${target}_runtime] |
161 | != [list] && [check_effective_target_${target}_runtime] } { | 163 | != [list] && [check_effective_target_${target}_runtime] } { |
162 | set dg-do-what-default run | 164 | set dg-do-what-default run |
@@ -167,7 +169,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
167 | } | 169 | } |
168 | } else { | 170 | } else { |
169 | set et_index 0 | 171 | set et_index 0 |
170 | @@ -10789,6 +10764,7 @@ proc check_effective_target_sigsetjmp {} { | 172 | @@ -11606,6 +11581,7 @@ proc check_effective_target_sigsetjmp {} { |
171 | proc check_vect_support_and_set_flags { } { | 173 | proc check_vect_support_and_set_flags { } { |
172 | global DEFAULT_VECTCFLAGS | 174 | global DEFAULT_VECTCFLAGS |
173 | global dg-do-what-default | 175 | global dg-do-what-default |
@@ -175,7 +177,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
175 | global EFFECTIVE_TARGETS | 177 | global EFFECTIVE_TARGETS |
176 | 178 | ||
177 | if [istarget powerpc-*paired*] { | 179 | if [istarget powerpc-*paired*] { |
178 | @@ -10797,6 +10773,7 @@ proc check_vect_support_and_set_flags { } { | 180 | @@ -11614,6 +11590,7 @@ proc check_vect_support_and_set_flags { } { |
179 | set dg-do-what-default run | 181 | set dg-do-what-default run |
180 | } else { | 182 | } else { |
181 | set dg-do-what-default compile | 183 | set dg-do-what-default compile |
@@ -183,15 +185,15 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
183 | } | 185 | } |
184 | } elseif [istarget powerpc*-*-*] { | 186 | } elseif [istarget powerpc*-*-*] { |
185 | # Skip targets not supporting -maltivec. | 187 | # Skip targets not supporting -maltivec. |
186 | @@ -10821,6 +10798,7 @@ proc check_vect_support_and_set_flags { } { | 188 | @@ -11644,6 +11621,7 @@ proc check_vect_support_and_set_flags { } { |
187 | lappend DEFAULT_VECTCFLAGS "-mcpu=970" | 189 | set DEFAULT_VECTCFLAGS [linsert $DEFAULT_VECTCFLAGS 0 "-mcpu=970"] |
188 | } | 190 | } |
189 | set dg-do-what-default compile | 191 | set dg-do-what-default compile |
190 | + set do-what-limit link | 192 | + set do-what-limit link |
191 | } | 193 | } |
192 | } elseif { [istarget i?86-*-*] || [istarget x86_64-*-*] } { | 194 | } elseif { [istarget i?86-*-*] || [istarget x86_64-*-*] } { |
193 | lappend DEFAULT_VECTCFLAGS "-msse2" | 195 | lappend DEFAULT_VECTCFLAGS "-msse2" |
194 | @@ -10828,6 +10806,7 @@ proc check_vect_support_and_set_flags { } { | 196 | @@ -11651,6 +11629,7 @@ proc check_vect_support_and_set_flags { } { |
195 | set dg-do-what-default run | 197 | set dg-do-what-default run |
196 | } else { | 198 | } else { |
197 | set dg-do-what-default compile | 199 | set dg-do-what-default compile |
@@ -199,7 +201,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
199 | } | 201 | } |
200 | } elseif { [istarget mips*-*-*] | 202 | } elseif { [istarget mips*-*-*] |
201 | && [check_effective_target_nomips16] } { | 203 | && [check_effective_target_nomips16] } { |
202 | @@ -10847,6 +10826,7 @@ proc check_vect_support_and_set_flags { } { | 204 | @@ -11670,6 +11649,7 @@ proc check_vect_support_and_set_flags { } { |
203 | set dg-do-what-default run | 205 | set dg-do-what-default run |
204 | } else { | 206 | } else { |
205 | set dg-do-what-default compile | 207 | set dg-do-what-default compile |
@@ -207,7 +209,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
207 | } | 209 | } |
208 | } elseif [istarget alpha*-*-*] { | 210 | } elseif [istarget alpha*-*-*] { |
209 | # Alpha's vectorization capabilities are extremely limited. | 211 | # Alpha's vectorization capabilities are extremely limited. |
210 | @@ -10860,6 +10840,7 @@ proc check_vect_support_and_set_flags { } { | 212 | @@ -11683,6 +11663,7 @@ proc check_vect_support_and_set_flags { } { |
211 | set dg-do-what-default run | 213 | set dg-do-what-default run |
212 | } else { | 214 | } else { |
213 | set dg-do-what-default compile | 215 | set dg-do-what-default compile |
@@ -215,7 +217,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
215 | } | 217 | } |
216 | } elseif [istarget ia64-*-*] { | 218 | } elseif [istarget ia64-*-*] { |
217 | set dg-do-what-default run | 219 | set dg-do-what-default run |
218 | @@ -10873,6 +10854,7 @@ proc check_vect_support_and_set_flags { } { | 220 | @@ -11696,6 +11677,7 @@ proc check_vect_support_and_set_flags { } { |
219 | set dg-do-what-default run | 221 | set dg-do-what-default run |
220 | } else { | 222 | } else { |
221 | set dg-do-what-default compile | 223 | set dg-do-what-default compile |
@@ -223,7 +225,7 @@ index 40f71e9ed8b..10e267fa16d 100644 | |||
223 | } | 225 | } |
224 | } elseif [istarget aarch64*-*-*] { | 226 | } elseif [istarget aarch64*-*-*] { |
225 | set dg-do-what-default run | 227 | set dg-do-what-default run |
226 | @@ -10897,6 +10879,7 @@ proc check_vect_support_and_set_flags { } { | 228 | @@ -11720,6 +11702,7 @@ proc check_vect_support_and_set_flags { } { |
227 | } else { | 229 | } else { |
228 | lappend DEFAULT_VECTCFLAGS "-march=z14" "-mzarch" | 230 | lappend DEFAULT_VECTCFLAGS "-march=z14" "-mzarch" |
229 | set dg-do-what-default compile | 231 | set dg-do-what-default compile |
diff --git a/meta/recipes-devtools/gcc/gcc/0026-aarch64-Fix-loose-ldpstp-check-PR111411.patch b/meta/recipes-devtools/gcc/gcc/0026-aarch64-Fix-loose-ldpstp-check-PR111411.patch deleted file mode 100644 index a408a98698..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0026-aarch64-Fix-loose-ldpstp-check-PR111411.patch +++ /dev/null | |||
@@ -1,117 +0,0 @@ | |||
1 | From adb60dc78e0da4877747f32347cee339364775be Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
3 | Date: Fri, 15 Sep 2023 09:19:14 +0100 | ||
4 | Subject: [PATCH] aarch64: Fix loose ldpstp check [PR111411] | ||
5 | |||
6 | aarch64_operands_ok_for_ldpstp contained the code: | ||
7 | |||
8 | /* One of the memory accesses must be a mempair operand. | ||
9 | If it is not the first one, they need to be swapped by the | ||
10 | peephole. */ | ||
11 | if (!aarch64_mem_pair_operand (mem_1, GET_MODE (mem_1)) | ||
12 | && !aarch64_mem_pair_operand (mem_2, GET_MODE (mem_2))) | ||
13 | return false; | ||
14 | |||
15 | But the requirement isn't just that one of the accesses must be a | ||
16 | valid mempair operand. It's that the lower access must be, since | ||
17 | that's the access that will be used for the instruction operand. | ||
18 | |||
19 | gcc/ | ||
20 | PR target/111411 | ||
21 | * config/aarch64/aarch64.cc (aarch64_operands_ok_for_ldpstp): Require | ||
22 | the lower memory access to a mem-pair operand. | ||
23 | |||
24 | gcc/testsuite/ | ||
25 | PR target/111411 | ||
26 | * gcc.dg/rtl/aarch64/pr111411.c: New test. | ||
27 | |||
28 | Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2d38f45bcca62ca0c7afef4b579f82c5c2a01610] | ||
29 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
30 | --- | ||
31 | gcc/config/aarch64/aarch64.cc | 8 ++- | ||
32 | gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c | 57 +++++++++++++++++++++ | ||
33 | 2 files changed, 60 insertions(+), 5 deletions(-) | ||
34 | create mode 100644 gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c | ||
35 | |||
36 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
37 | index 6118a3354ac..9b1f791ca8b 100644 | ||
38 | --- a/gcc/config/aarch64/aarch64.cc | ||
39 | +++ b/gcc/config/aarch64/aarch64.cc | ||
40 | @@ -26154,11 +26154,9 @@ aarch64_operands_ok_for_ldpstp (rtx *operands, bool load, | ||
41 | gcc_assert (known_eq (GET_MODE_SIZE (GET_MODE (mem_1)), | ||
42 | GET_MODE_SIZE (GET_MODE (mem_2)))); | ||
43 | |||
44 | - /* One of the memory accesses must be a mempair operand. | ||
45 | - If it is not the first one, they need to be swapped by the | ||
46 | - peephole. */ | ||
47 | - if (!aarch64_mem_pair_operand (mem_1, GET_MODE (mem_1)) | ||
48 | - && !aarch64_mem_pair_operand (mem_2, GET_MODE (mem_2))) | ||
49 | + /* The lower memory access must be a mem-pair operand. */ | ||
50 | + rtx lower_mem = reversed ? mem_2 : mem_1; | ||
51 | + if (!aarch64_mem_pair_operand (lower_mem, GET_MODE (lower_mem))) | ||
52 | return false; | ||
53 | |||
54 | if (REG_P (reg_1) && FP_REGNUM_P (REGNO (reg_1))) | ||
55 | diff --git a/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c b/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c | ||
56 | new file mode 100644 | ||
57 | index 00000000000..ad07e9c6c89 | ||
58 | --- /dev/null | ||
59 | +++ b/gcc/testsuite/gcc.dg/rtl/aarch64/pr111411.c | ||
60 | @@ -0,0 +1,57 @@ | ||
61 | +/* { dg-do compile { target aarch64*-*-* } } */ | ||
62 | +/* { dg-require-effective-target lp64 } */ | ||
63 | +/* { dg-options "-O -fdisable-rtl-postreload -fpeephole2 -fno-schedule-fusion" } */ | ||
64 | + | ||
65 | +extern int data[]; | ||
66 | + | ||
67 | +void __RTL (startwith ("ira")) foo (void *ptr) | ||
68 | +{ | ||
69 | + (function "foo" | ||
70 | + (param "ptr" | ||
71 | + (DECL_RTL (reg/v:DI <0> [ ptr ])) | ||
72 | + (DECL_RTL_INCOMING (reg/v:DI x0 [ ptr ])) | ||
73 | + ) ;; param "ptr" | ||
74 | + (insn-chain | ||
75 | + (block 2 | ||
76 | + (edge-from entry (flags "FALLTHRU")) | ||
77 | + (cnote 3 [bb 2] NOTE_INSN_BASIC_BLOCK) | ||
78 | + (insn 4 (set (reg:DI <0>) (reg:DI x0))) | ||
79 | + (insn 5 (set (reg:DI <1>) | ||
80 | + (plus:DI (reg:DI <0>) (const_int 768)))) | ||
81 | + (insn 6 (set (mem:SI (plus:DI (reg:DI <0>) | ||
82 | + (const_int 508)) [1 &data+508 S4 A4]) | ||
83 | + (const_int 0))) | ||
84 | + (insn 7 (set (mem:SI (plus:DI (reg:DI <1>) | ||
85 | + (const_int -256)) [1 &data+512 S4 A4]) | ||
86 | + (const_int 0))) | ||
87 | + (edge-to exit (flags "FALLTHRU")) | ||
88 | + ) ;; block 2 | ||
89 | + ) ;; insn-chain | ||
90 | + ) ;; function | ||
91 | +} | ||
92 | + | ||
93 | +void __RTL (startwith ("ira")) bar (void *ptr) | ||
94 | +{ | ||
95 | + (function "bar" | ||
96 | + (param "ptr" | ||
97 | + (DECL_RTL (reg/v:DI <0> [ ptr ])) | ||
98 | + (DECL_RTL_INCOMING (reg/v:DI x0 [ ptr ])) | ||
99 | + ) ;; param "ptr" | ||
100 | + (insn-chain | ||
101 | + (block 2 | ||
102 | + (edge-from entry (flags "FALLTHRU")) | ||
103 | + (cnote 3 [bb 2] NOTE_INSN_BASIC_BLOCK) | ||
104 | + (insn 4 (set (reg:DI <0>) (reg:DI x0))) | ||
105 | + (insn 5 (set (reg:DI <1>) | ||
106 | + (plus:DI (reg:DI <0>) (const_int 768)))) | ||
107 | + (insn 6 (set (mem:SI (plus:DI (reg:DI <1>) | ||
108 | + (const_int -256)) [1 &data+512 S4 A4]) | ||
109 | + (const_int 0))) | ||
110 | + (insn 7 (set (mem:SI (plus:DI (reg:DI <0>) | ||
111 | + (const_int 508)) [1 &data+508 S4 A4]) | ||
112 | + (const_int 0))) | ||
113 | + (edge-to exit (flags "FALLTHRU")) | ||
114 | + ) ;; block 2 | ||
115 | + ) ;; insn-chain | ||
116 | + ) ;; function | ||
117 | +} | ||
diff --git a/meta/recipes-devtools/gcc/gcc/0027-Fix-gcc-vect-module-testcases.patch b/meta/recipes-devtools/gcc/gcc/0027-Fix-gcc-vect-module-testcases.patch deleted file mode 100644 index 4b89036814..0000000000 --- a/meta/recipes-devtools/gcc/gcc/0027-Fix-gcc-vect-module-testcases.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=948dbc5ee45f9ffd5f41fd6782704081cc7c8c27] | ||
2 | |||
3 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
4 | |||
5 | diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c | ||
6 | index ed63ff59cc0..009c849b7e7 100644 | ||
7 | --- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c | ||
8 | +++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-10.c | ||
9 | @@ -1,3 +1,5 @@ | ||
10 | +/* Since this uses dg-additional-sources, need to specify `dg-do run` instead of the default. */ | ||
11 | +/* { dg-do run } */ | ||
12 | /* { dg-require-effective-target vect_simd_clones } */ | ||
13 | /* { dg-additional-options "-fopenmp-simd" } */ | ||
14 | /* { dg-additional-options "-mavx" { target avx_runtime } } */ | ||
15 | diff --git a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c | ||
16 | index c44471e35bc..4699a3f3c80 100644 | ||
17 | --- a/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c | ||
18 | +++ b/gcc/testsuite/gcc.dg/vect/vect-simd-clone-12.c | ||
19 | @@ -1,3 +1,5 @@ | ||
20 | +/* Since this uses dg-additional-sources, need to specify `dg-do run` instead of the default. */ | ||
21 | +/* { dg-do run } */ | ||
22 | /* { dg-require-effective-target vect_simd_clones } */ | ||
23 | /* { dg-additional-options "-fopenmp-simd" } */ | ||
24 | /* { dg-additional-options "-mavx" { target avx_runtime } } */ | ||
25 | -- | ||
26 | 2.43.0 | ||
diff --git a/meta/recipes-devtools/gcc/gcc/CVE-2023-4039.patch b/meta/recipes-devtools/gcc/gcc/CVE-2023-4039.patch deleted file mode 100644 index 81b5067c33..0000000000 --- a/meta/recipes-devtools/gcc/gcc/CVE-2023-4039.patch +++ /dev/null | |||
@@ -1,3093 +0,0 @@ | |||
1 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
2 | Subject: [PATCH 00/19] aarch64: Fix -fstack-protector issue | ||
3 | Date: Tue, 12 Sep 2023 16:25:10 +0100 | ||
4 | |||
5 | This series of patches fixes deficiencies in GCC's -fstack-protector | ||
6 | implementation for AArch64 when using dynamically allocated stack space. | ||
7 | This is CVE-2023-4039. See: | ||
8 | |||
9 | https://developer.arm.com/Arm%20Security%20Center/GCC%20Stack%20Protector%20Vulnerability%20AArch64 | ||
10 | https://github.com/metaredteam/external-disclosures/security/advisories/GHSA-x7ch-h5rf-w2mf | ||
11 | |||
12 | for more details. | ||
13 | |||
14 | The fix is to put the saved registers above the locals area when | ||
15 | -fstack-protector is used. | ||
16 | |||
17 | The series also fixes a stack-clash problem that I found while working | ||
18 | on the CVE. In unpatched sources, the stack-clash problem would only | ||
19 | trigger for unrealistic numbers of arguments (8K 64-bit arguments, or an | ||
20 | equivalent). But it would be a more significant issue with the new | ||
21 | -fstack-protector frame layout. It's therefore important that both | ||
22 | problems are fixed together. | ||
23 | |||
24 | Some reorganisation of the code seemed necessary to fix the problems in a | ||
25 | cleanish way. The series is therefore quite long, but only a handful of | ||
26 | patches should have any effect on code generation. | ||
27 | |||
28 | See the individual patches for a detailed description. | ||
29 | |||
30 | Tested on aarch64-linux-gnu. Pushed to trunk and to all active branches. | ||
31 | I've also pushed backports to GCC 7+ to vendors/ARM/heads/CVE-2023-4039. | ||
32 | |||
33 | CVE: CVE-2023-4039 | ||
34 | Upstream-Status: Backport | ||
35 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
36 | |||
37 | |||
38 | From 71a2aa2127283f450c623d3604dbcabe0e14a8d4 Mon Sep 17 00:00:00 2001 | ||
39 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
40 | Date: Tue, 12 Sep 2023 16:07:12 +0100 | ||
41 | Subject: [PATCH 01/19] aarch64: Use local frame vars in shrink-wrapping code | ||
42 | |||
43 | aarch64_layout_frame uses a shorthand for referring to | ||
44 | cfun->machine->frame: | ||
45 | |||
46 | aarch64_frame &frame = cfun->machine->frame; | ||
47 | |||
48 | This patch does the same for some other heavy users of the structure. | ||
49 | No functional change intended. | ||
50 | |||
51 | gcc/ | ||
52 | * config/aarch64/aarch64.cc (aarch64_save_callee_saves): Use | ||
53 | a local shorthand for cfun->machine->frame. | ||
54 | (aarch64_restore_callee_saves, aarch64_get_separate_components): | ||
55 | (aarch64_process_components): Likewise. | ||
56 | (aarch64_allocate_and_probe_stack_space): Likewise. | ||
57 | (aarch64_expand_prologue, aarch64_expand_epilogue): Likewise. | ||
58 | (aarch64_layout_frame): Use existing shorthand for one more case. | ||
59 | --- | ||
60 | gcc/config/aarch64/aarch64.cc | 123 ++++++++++++++++++---------------- | ||
61 | 1 file changed, 64 insertions(+), 59 deletions(-) | ||
62 | |||
63 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
64 | index 822a2b49a46..5d473d161d9 100644 | ||
65 | --- a/gcc/config/aarch64/aarch64.cc | ||
66 | +++ b/gcc/config/aarch64/aarch64.cc | ||
67 | @@ -8612,7 +8612,7 @@ aarch64_layout_frame (void) | ||
68 | frame.is_scs_enabled | ||
69 | = (!crtl->calls_eh_return | ||
70 | && sanitize_flags_p (SANITIZE_SHADOW_CALL_STACK) | ||
71 | - && known_ge (cfun->machine->frame.reg_offset[LR_REGNUM], 0)); | ||
72 | + && known_ge (frame.reg_offset[LR_REGNUM], 0)); | ||
73 | |||
74 | /* When shadow call stack is enabled, the scs_pop in the epilogue will | ||
75 | restore x30, and we don't need to pop x30 again in the traditional | ||
76 | @@ -9078,6 +9078,7 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
77 | unsigned start, unsigned limit, bool skip_wb, | ||
78 | bool hard_fp_valid_p) | ||
79 | { | ||
80 | + aarch64_frame &frame = cfun->machine->frame; | ||
81 | rtx_insn *insn; | ||
82 | unsigned regno; | ||
83 | unsigned regno2; | ||
84 | @@ -9092,8 +9093,8 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
85 | bool frame_related_p = aarch64_emit_cfi_for_reg_p (regno); | ||
86 | |||
87 | if (skip_wb | ||
88 | - && (regno == cfun->machine->frame.wb_push_candidate1 | ||
89 | - || regno == cfun->machine->frame.wb_push_candidate2)) | ||
90 | + && (regno == frame.wb_push_candidate1 | ||
91 | + || regno == frame.wb_push_candidate2)) | ||
92 | continue; | ||
93 | |||
94 | if (cfun->machine->reg_is_wrapped_separately[regno]) | ||
95 | @@ -9101,7 +9102,7 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
96 | |||
97 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
98 | reg = gen_rtx_REG (mode, regno); | ||
99 | - offset = start_offset + cfun->machine->frame.reg_offset[regno]; | ||
100 | + offset = start_offset + frame.reg_offset[regno]; | ||
101 | rtx base_rtx = stack_pointer_rtx; | ||
102 | poly_int64 sp_offset = offset; | ||
103 | |||
104 | @@ -9114,7 +9115,7 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
105 | { | ||
106 | gcc_assert (known_eq (start_offset, 0)); | ||
107 | poly_int64 fp_offset | ||
108 | - = cfun->machine->frame.below_hard_fp_saved_regs_size; | ||
109 | + = frame.below_hard_fp_saved_regs_size; | ||
110 | if (hard_fp_valid_p) | ||
111 | base_rtx = hard_frame_pointer_rtx; | ||
112 | else | ||
113 | @@ -9136,8 +9137,7 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
114 | && (regno2 = aarch64_next_callee_save (regno + 1, limit)) <= limit | ||
115 | && !cfun->machine->reg_is_wrapped_separately[regno2] | ||
116 | && known_eq (GET_MODE_SIZE (mode), | ||
117 | - cfun->machine->frame.reg_offset[regno2] | ||
118 | - - cfun->machine->frame.reg_offset[regno])) | ||
119 | + frame.reg_offset[regno2] - frame.reg_offset[regno])) | ||
120 | { | ||
121 | rtx reg2 = gen_rtx_REG (mode, regno2); | ||
122 | rtx mem2; | ||
123 | @@ -9187,6 +9187,7 @@ static void | ||
124 | aarch64_restore_callee_saves (poly_int64 start_offset, unsigned start, | ||
125 | unsigned limit, bool skip_wb, rtx *cfi_ops) | ||
126 | { | ||
127 | + aarch64_frame &frame = cfun->machine->frame; | ||
128 | unsigned regno; | ||
129 | unsigned regno2; | ||
130 | poly_int64 offset; | ||
131 | @@ -9203,13 +9204,13 @@ aarch64_restore_callee_saves (poly_int64 start_offset, unsigned start, | ||
132 | rtx reg, mem; | ||
133 | |||
134 | if (skip_wb | ||
135 | - && (regno == cfun->machine->frame.wb_pop_candidate1 | ||
136 | - || regno == cfun->machine->frame.wb_pop_candidate2)) | ||
137 | + && (regno == frame.wb_pop_candidate1 | ||
138 | + || regno == frame.wb_pop_candidate2)) | ||
139 | continue; | ||
140 | |||
141 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
142 | reg = gen_rtx_REG (mode, regno); | ||
143 | - offset = start_offset + cfun->machine->frame.reg_offset[regno]; | ||
144 | + offset = start_offset + frame.reg_offset[regno]; | ||
145 | rtx base_rtx = stack_pointer_rtx; | ||
146 | if (mode == VNx2DImode && BYTES_BIG_ENDIAN) | ||
147 | aarch64_adjust_sve_callee_save_base (mode, base_rtx, anchor_reg, | ||
148 | @@ -9220,8 +9221,7 @@ aarch64_restore_callee_saves (poly_int64 start_offset, unsigned start, | ||
149 | && (regno2 = aarch64_next_callee_save (regno + 1, limit)) <= limit | ||
150 | && !cfun->machine->reg_is_wrapped_separately[regno2] | ||
151 | && known_eq (GET_MODE_SIZE (mode), | ||
152 | - cfun->machine->frame.reg_offset[regno2] | ||
153 | - - cfun->machine->frame.reg_offset[regno])) | ||
154 | + frame.reg_offset[regno2] - frame.reg_offset[regno])) | ||
155 | { | ||
156 | rtx reg2 = gen_rtx_REG (mode, regno2); | ||
157 | rtx mem2; | ||
158 | @@ -9326,6 +9326,7 @@ offset_12bit_unsigned_scaled_p (machine_mode mode, poly_int64 offset) | ||
159 | static sbitmap | ||
160 | aarch64_get_separate_components (void) | ||
161 | { | ||
162 | + aarch64_frame &frame = cfun->machine->frame; | ||
163 | sbitmap components = sbitmap_alloc (LAST_SAVED_REGNUM + 1); | ||
164 | bitmap_clear (components); | ||
165 | |||
166 | @@ -9342,18 +9343,18 @@ aarch64_get_separate_components (void) | ||
167 | if (mode == VNx2DImode && BYTES_BIG_ENDIAN) | ||
168 | continue; | ||
169 | |||
170 | - poly_int64 offset = cfun->machine->frame.reg_offset[regno]; | ||
171 | + poly_int64 offset = frame.reg_offset[regno]; | ||
172 | |||
173 | /* If the register is saved in the first SVE save slot, we use | ||
174 | it as a stack probe for -fstack-clash-protection. */ | ||
175 | if (flag_stack_clash_protection | ||
176 | - && maybe_ne (cfun->machine->frame.below_hard_fp_saved_regs_size, 0) | ||
177 | + && maybe_ne (frame.below_hard_fp_saved_regs_size, 0) | ||
178 | && known_eq (offset, 0)) | ||
179 | continue; | ||
180 | |||
181 | /* Get the offset relative to the register we'll use. */ | ||
182 | if (frame_pointer_needed) | ||
183 | - offset -= cfun->machine->frame.below_hard_fp_saved_regs_size; | ||
184 | + offset -= frame.below_hard_fp_saved_regs_size; | ||
185 | else | ||
186 | offset += crtl->outgoing_args_size; | ||
187 | |||
188 | @@ -9372,11 +9373,11 @@ aarch64_get_separate_components (void) | ||
189 | /* If the spare predicate register used by big-endian SVE code | ||
190 | is call-preserved, it must be saved in the main prologue | ||
191 | before any saves that use it. */ | ||
192 | - if (cfun->machine->frame.spare_pred_reg != INVALID_REGNUM) | ||
193 | - bitmap_clear_bit (components, cfun->machine->frame.spare_pred_reg); | ||
194 | + if (frame.spare_pred_reg != INVALID_REGNUM) | ||
195 | + bitmap_clear_bit (components, frame.spare_pred_reg); | ||
196 | |||
197 | - unsigned reg1 = cfun->machine->frame.wb_push_candidate1; | ||
198 | - unsigned reg2 = cfun->machine->frame.wb_push_candidate2; | ||
199 | + unsigned reg1 = frame.wb_push_candidate1; | ||
200 | + unsigned reg2 = frame.wb_push_candidate2; | ||
201 | /* If registers have been chosen to be stored/restored with | ||
202 | writeback don't interfere with them to avoid having to output explicit | ||
203 | stack adjustment instructions. */ | ||
204 | @@ -9485,6 +9486,7 @@ aarch64_get_next_set_bit (sbitmap bmp, unsigned int start) | ||
205 | static void | ||
206 | aarch64_process_components (sbitmap components, bool prologue_p) | ||
207 | { | ||
208 | + aarch64_frame &frame = cfun->machine->frame; | ||
209 | rtx ptr_reg = gen_rtx_REG (Pmode, frame_pointer_needed | ||
210 | ? HARD_FRAME_POINTER_REGNUM | ||
211 | : STACK_POINTER_REGNUM); | ||
212 | @@ -9499,9 +9501,9 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
213 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
214 | |||
215 | rtx reg = gen_rtx_REG (mode, regno); | ||
216 | - poly_int64 offset = cfun->machine->frame.reg_offset[regno]; | ||
217 | + poly_int64 offset = frame.reg_offset[regno]; | ||
218 | if (frame_pointer_needed) | ||
219 | - offset -= cfun->machine->frame.below_hard_fp_saved_regs_size; | ||
220 | + offset -= frame.below_hard_fp_saved_regs_size; | ||
221 | else | ||
222 | offset += crtl->outgoing_args_size; | ||
223 | |||
224 | @@ -9526,14 +9528,14 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
225 | break; | ||
226 | } | ||
227 | |||
228 | - poly_int64 offset2 = cfun->machine->frame.reg_offset[regno2]; | ||
229 | + poly_int64 offset2 = frame.reg_offset[regno2]; | ||
230 | /* The next register is not of the same class or its offset is not | ||
231 | mergeable with the current one into a pair. */ | ||
232 | if (aarch64_sve_mode_p (mode) | ||
233 | || !satisfies_constraint_Ump (mem) | ||
234 | || GP_REGNUM_P (regno) != GP_REGNUM_P (regno2) | ||
235 | || (crtl->abi->id () == ARM_PCS_SIMD && FP_REGNUM_P (regno)) | ||
236 | - || maybe_ne ((offset2 - cfun->machine->frame.reg_offset[regno]), | ||
237 | + || maybe_ne ((offset2 - frame.reg_offset[regno]), | ||
238 | GET_MODE_SIZE (mode))) | ||
239 | { | ||
240 | insn = emit_insn (set); | ||
241 | @@ -9555,7 +9557,7 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
242 | /* REGNO2 can be saved/restored in a pair with REGNO. */ | ||
243 | rtx reg2 = gen_rtx_REG (mode, regno2); | ||
244 | if (frame_pointer_needed) | ||
245 | - offset2 -= cfun->machine->frame.below_hard_fp_saved_regs_size; | ||
246 | + offset2 -= frame.below_hard_fp_saved_regs_size; | ||
247 | else | ||
248 | offset2 += crtl->outgoing_args_size; | ||
249 | rtx addr2 = plus_constant (Pmode, ptr_reg, offset2); | ||
250 | @@ -9650,6 +9652,7 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
251 | bool frame_related_p, | ||
252 | bool final_adjustment_p) | ||
253 | { | ||
254 | + aarch64_frame &frame = cfun->machine->frame; | ||
255 | HOST_WIDE_INT guard_size | ||
256 | = 1 << param_stack_clash_protection_guard_size; | ||
257 | HOST_WIDE_INT guard_used_by_caller = STACK_CLASH_CALLER_GUARD; | ||
258 | @@ -9670,25 +9673,25 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
259 | register as a probe. We can't assume that LR was saved at position 0 | ||
260 | though, so treat any space below it as unprobed. */ | ||
261 | if (final_adjustment_p | ||
262 | - && known_eq (cfun->machine->frame.below_hard_fp_saved_regs_size, 0)) | ||
263 | + && known_eq (frame.below_hard_fp_saved_regs_size, 0)) | ||
264 | { | ||
265 | - poly_int64 lr_offset = cfun->machine->frame.reg_offset[LR_REGNUM]; | ||
266 | + poly_int64 lr_offset = frame.reg_offset[LR_REGNUM]; | ||
267 | if (known_ge (lr_offset, 0)) | ||
268 | min_probe_threshold -= lr_offset.to_constant (); | ||
269 | else | ||
270 | gcc_assert (!flag_stack_clash_protection || known_eq (poly_size, 0)); | ||
271 | } | ||
272 | |||
273 | - poly_int64 frame_size = cfun->machine->frame.frame_size; | ||
274 | + poly_int64 frame_size = frame.frame_size; | ||
275 | |||
276 | /* We should always have a positive probe threshold. */ | ||
277 | gcc_assert (min_probe_threshold > 0); | ||
278 | |||
279 | if (flag_stack_clash_protection && !final_adjustment_p) | ||
280 | { | ||
281 | - poly_int64 initial_adjust = cfun->machine->frame.initial_adjust; | ||
282 | - poly_int64 sve_callee_adjust = cfun->machine->frame.sve_callee_adjust; | ||
283 | - poly_int64 final_adjust = cfun->machine->frame.final_adjust; | ||
284 | + poly_int64 initial_adjust = frame.initial_adjust; | ||
285 | + poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
286 | + poly_int64 final_adjust = frame.final_adjust; | ||
287 | |||
288 | if (known_eq (frame_size, 0)) | ||
289 | { | ||
290 | @@ -9977,17 +9980,18 @@ aarch64_epilogue_uses (int regno) | ||
291 | void | ||
292 | aarch64_expand_prologue (void) | ||
293 | { | ||
294 | - poly_int64 frame_size = cfun->machine->frame.frame_size; | ||
295 | - poly_int64 initial_adjust = cfun->machine->frame.initial_adjust; | ||
296 | - HOST_WIDE_INT callee_adjust = cfun->machine->frame.callee_adjust; | ||
297 | - poly_int64 final_adjust = cfun->machine->frame.final_adjust; | ||
298 | - poly_int64 callee_offset = cfun->machine->frame.callee_offset; | ||
299 | - poly_int64 sve_callee_adjust = cfun->machine->frame.sve_callee_adjust; | ||
300 | + aarch64_frame &frame = cfun->machine->frame; | ||
301 | + poly_int64 frame_size = frame.frame_size; | ||
302 | + poly_int64 initial_adjust = frame.initial_adjust; | ||
303 | + HOST_WIDE_INT callee_adjust = frame.callee_adjust; | ||
304 | + poly_int64 final_adjust = frame.final_adjust; | ||
305 | + poly_int64 callee_offset = frame.callee_offset; | ||
306 | + poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
307 | poly_int64 below_hard_fp_saved_regs_size | ||
308 | - = cfun->machine->frame.below_hard_fp_saved_regs_size; | ||
309 | - unsigned reg1 = cfun->machine->frame.wb_push_candidate1; | ||
310 | - unsigned reg2 = cfun->machine->frame.wb_push_candidate2; | ||
311 | - bool emit_frame_chain = cfun->machine->frame.emit_frame_chain; | ||
312 | + = frame.below_hard_fp_saved_regs_size; | ||
313 | + unsigned reg1 = frame.wb_push_candidate1; | ||
314 | + unsigned reg2 = frame.wb_push_candidate2; | ||
315 | + bool emit_frame_chain = frame.emit_frame_chain; | ||
316 | rtx_insn *insn; | ||
317 | |||
318 | if (flag_stack_clash_protection && known_eq (callee_adjust, 0)) | ||
319 | @@ -10018,7 +10022,7 @@ aarch64_expand_prologue (void) | ||
320 | } | ||
321 | |||
322 | /* Push return address to shadow call stack. */ | ||
323 | - if (cfun->machine->frame.is_scs_enabled) | ||
324 | + if (frame.is_scs_enabled) | ||
325 | emit_insn (gen_scs_push ()); | ||
326 | |||
327 | if (flag_stack_usage_info) | ||
328 | @@ -10057,7 +10061,7 @@ aarch64_expand_prologue (void) | ||
329 | |||
330 | /* The offset of the frame chain record (if any) from the current SP. */ | ||
331 | poly_int64 chain_offset = (initial_adjust + callee_adjust | ||
332 | - - cfun->machine->frame.hard_fp_offset); | ||
333 | + - frame.hard_fp_offset); | ||
334 | gcc_assert (known_ge (chain_offset, 0)); | ||
335 | |||
336 | /* The offset of the bottom of the save area from the current SP. */ | ||
337 | @@ -10160,16 +10164,17 @@ aarch64_use_return_insn_p (void) | ||
338 | void | ||
339 | aarch64_expand_epilogue (bool for_sibcall) | ||
340 | { | ||
341 | - poly_int64 initial_adjust = cfun->machine->frame.initial_adjust; | ||
342 | - HOST_WIDE_INT callee_adjust = cfun->machine->frame.callee_adjust; | ||
343 | - poly_int64 final_adjust = cfun->machine->frame.final_adjust; | ||
344 | - poly_int64 callee_offset = cfun->machine->frame.callee_offset; | ||
345 | - poly_int64 sve_callee_adjust = cfun->machine->frame.sve_callee_adjust; | ||
346 | + aarch64_frame &frame = cfun->machine->frame; | ||
347 | + poly_int64 initial_adjust = frame.initial_adjust; | ||
348 | + HOST_WIDE_INT callee_adjust = frame.callee_adjust; | ||
349 | + poly_int64 final_adjust = frame.final_adjust; | ||
350 | + poly_int64 callee_offset = frame.callee_offset; | ||
351 | + poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
352 | poly_int64 below_hard_fp_saved_regs_size | ||
353 | - = cfun->machine->frame.below_hard_fp_saved_regs_size; | ||
354 | - unsigned reg1 = cfun->machine->frame.wb_pop_candidate1; | ||
355 | - unsigned reg2 = cfun->machine->frame.wb_pop_candidate2; | ||
356 | - unsigned int last_gpr = (cfun->machine->frame.is_scs_enabled | ||
357 | + = frame.below_hard_fp_saved_regs_size; | ||
358 | + unsigned reg1 = frame.wb_pop_candidate1; | ||
359 | + unsigned reg2 = frame.wb_pop_candidate2; | ||
360 | + unsigned int last_gpr = (frame.is_scs_enabled | ||
361 | ? R29_REGNUM : R30_REGNUM); | ||
362 | rtx cfi_ops = NULL; | ||
363 | rtx_insn *insn; | ||
364 | @@ -10203,7 +10208,7 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
365 | /* We need to add memory barrier to prevent read from deallocated stack. */ | ||
366 | bool need_barrier_p | ||
367 | = maybe_ne (get_frame_size () | ||
368 | - + cfun->machine->frame.saved_varargs_size, 0); | ||
369 | + + frame.saved_varargs_size, 0); | ||
370 | |||
371 | /* Emit a barrier to prevent loads from a deallocated stack. */ | ||
372 | if (maybe_gt (final_adjust, crtl->outgoing_args_size) | ||
373 | @@ -10284,7 +10289,7 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
374 | } | ||
375 | |||
376 | /* Pop return address from shadow call stack. */ | ||
377 | - if (cfun->machine->frame.is_scs_enabled) | ||
378 | + if (frame.is_scs_enabled) | ||
379 | { | ||
380 | machine_mode mode = aarch64_reg_save_mode (R30_REGNUM); | ||
381 | rtx reg = gen_rtx_REG (mode, R30_REGNUM); | ||
382 | @@ -12740,24 +12745,24 @@ aarch64_can_eliminate (const int from ATTRIBUTE_UNUSED, const int to) | ||
383 | poly_int64 | ||
384 | aarch64_initial_elimination_offset (unsigned from, unsigned to) | ||
385 | { | ||
386 | + aarch64_frame &frame = cfun->machine->frame; | ||
387 | + | ||
388 | if (to == HARD_FRAME_POINTER_REGNUM) | ||
389 | { | ||
390 | if (from == ARG_POINTER_REGNUM) | ||
391 | - return cfun->machine->frame.hard_fp_offset; | ||
392 | + return frame.hard_fp_offset; | ||
393 | |||
394 | if (from == FRAME_POINTER_REGNUM) | ||
395 | - return cfun->machine->frame.hard_fp_offset | ||
396 | - - cfun->machine->frame.locals_offset; | ||
397 | + return frame.hard_fp_offset - frame.locals_offset; | ||
398 | } | ||
399 | |||
400 | if (to == STACK_POINTER_REGNUM) | ||
401 | { | ||
402 | if (from == FRAME_POINTER_REGNUM) | ||
403 | - return cfun->machine->frame.frame_size | ||
404 | - - cfun->machine->frame.locals_offset; | ||
405 | + return frame.frame_size - frame.locals_offset; | ||
406 | } | ||
407 | |||
408 | - return cfun->machine->frame.frame_size; | ||
409 | + return frame.frame_size; | ||
410 | } | ||
411 | |||
412 | |||
413 | -- | ||
414 | 2.34.1 | ||
415 | |||
416 | |||
417 | From 89a9fa287706c5011f61926eaf65e7b996b963a3 Mon Sep 17 00:00:00 2001 | ||
418 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
419 | Date: Tue, 12 Sep 2023 16:07:12 +0100 | ||
420 | Subject: [PATCH 02/19] aarch64: Avoid a use of callee_offset | ||
421 | |||
422 | When we emit the frame chain, i.e. when we reach Here in this statement | ||
423 | of aarch64_expand_prologue: | ||
424 | |||
425 | if (emit_frame_chain) | ||
426 | { | ||
427 | // Here | ||
428 | ... | ||
429 | } | ||
430 | |||
431 | the stack is in one of two states: | ||
432 | |||
433 | - We've allocated up to the frame chain, but no more. | ||
434 | |||
435 | - We've allocated the whole frame, and the frame chain is within easy | ||
436 | reach of the new SP. | ||
437 | |||
438 | The offset of the frame chain from the current SP is available | ||
439 | in aarch64_frame as callee_offset. It is also available as the | ||
440 | chain_offset local variable, where the latter is calculated from other | ||
441 | data. (However, chain_offset is not always equal to callee_offset when | ||
442 | !emit_frame_chain, so chain_offset isn't redundant.) | ||
443 | |||
444 | In c600df9a4060da3c6121ff4d0b93f179eafd69d1 I switched to using | ||
445 | chain_offset for the initialisation of the hard frame pointer: | ||
446 | |||
447 | aarch64_add_offset (Pmode, hard_frame_pointer_rtx, | ||
448 | - stack_pointer_rtx, callee_offset, | ||
449 | + stack_pointer_rtx, chain_offset, | ||
450 | tmp1_rtx, tmp0_rtx, frame_pointer_needed); | ||
451 | |||
452 | But the later REG_CFA_ADJUST_CFA handling still used callee_offset. | ||
453 | |||
454 | I think the difference is harmless, but it's more logical for the | ||
455 | CFA note to be in sync, and it's more convenient for later patches | ||
456 | if it uses chain_offset. | ||
457 | |||
458 | gcc/ | ||
459 | * config/aarch64/aarch64.cc (aarch64_expand_prologue): Use | ||
460 | chain_offset rather than callee_offset. | ||
461 | --- | ||
462 | gcc/config/aarch64/aarch64.cc | 4 +--- | ||
463 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
464 | |||
465 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
466 | index 5d473d161d9..4f233c95140 100644 | ||
467 | --- a/gcc/config/aarch64/aarch64.cc | ||
468 | +++ b/gcc/config/aarch64/aarch64.cc | ||
469 | @@ -9985,7 +9985,6 @@ aarch64_expand_prologue (void) | ||
470 | poly_int64 initial_adjust = frame.initial_adjust; | ||
471 | HOST_WIDE_INT callee_adjust = frame.callee_adjust; | ||
472 | poly_int64 final_adjust = frame.final_adjust; | ||
473 | - poly_int64 callee_offset = frame.callee_offset; | ||
474 | poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
475 | poly_int64 below_hard_fp_saved_regs_size | ||
476 | = frame.below_hard_fp_saved_regs_size; | ||
477 | @@ -10098,8 +10097,7 @@ aarch64_expand_prologue (void) | ||
478 | implicit. */ | ||
479 | if (!find_reg_note (insn, REG_CFA_ADJUST_CFA, NULL_RTX)) | ||
480 | { | ||
481 | - rtx src = plus_constant (Pmode, stack_pointer_rtx, | ||
482 | - callee_offset); | ||
483 | + rtx src = plus_constant (Pmode, stack_pointer_rtx, chain_offset); | ||
484 | add_reg_note (insn, REG_CFA_ADJUST_CFA, | ||
485 | gen_rtx_SET (hard_frame_pointer_rtx, src)); | ||
486 | } | ||
487 | -- | ||
488 | 2.34.1 | ||
489 | |||
490 | |||
491 | From b36a2a78040722dab6124366c5d6baf8eaf80aef Mon Sep 17 00:00:00 2001 | ||
492 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
493 | Date: Tue, 12 Sep 2023 16:07:13 +0100 | ||
494 | Subject: [PATCH 03/19] aarch64: Explicitly handle frames with no saved | ||
495 | registers | ||
496 | |||
497 | If a frame has no saved registers, it can be allocated in one go. | ||
498 | There is no need to treat the areas below and above the saved | ||
499 | registers as separate. | ||
500 | |||
501 | And if we allocate the frame in one go, it should be allocated | ||
502 | as the initial_adjust rather than the final_adjust. This allows the | ||
503 | frame size to grow to guard_size - guard_used_by_caller before a stack | ||
504 | probe is needed. (A frame with no register saves is necessarily a | ||
505 | leaf frame.) | ||
506 | |||
507 | This is a no-op as thing stand, since a leaf function will have | ||
508 | no outgoing arguments, and so all the frame will be above where | ||
509 | the saved registers normally go. | ||
510 | |||
511 | gcc/ | ||
512 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Explicitly | ||
513 | allocate the frame in one go if there are no saved registers. | ||
514 | --- | ||
515 | gcc/config/aarch64/aarch64.cc | 8 +++++--- | ||
516 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
517 | |||
518 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
519 | index 4f233c95140..37643041ffb 100644 | ||
520 | --- a/gcc/config/aarch64/aarch64.cc | ||
521 | +++ b/gcc/config/aarch64/aarch64.cc | ||
522 | @@ -8639,9 +8639,11 @@ aarch64_layout_frame (void) | ||
523 | |||
524 | HOST_WIDE_INT const_size, const_outgoing_args_size, const_fp_offset; | ||
525 | HOST_WIDE_INT const_saved_regs_size; | ||
526 | - if (frame.frame_size.is_constant (&const_size) | ||
527 | - && const_size < max_push_offset | ||
528 | - && known_eq (frame.hard_fp_offset, const_size)) | ||
529 | + if (known_eq (frame.saved_regs_size, 0)) | ||
530 | + frame.initial_adjust = frame.frame_size; | ||
531 | + else if (frame.frame_size.is_constant (&const_size) | ||
532 | + && const_size < max_push_offset | ||
533 | + && known_eq (frame.hard_fp_offset, const_size)) | ||
534 | { | ||
535 | /* Simple, small frame with no outgoing arguments: | ||
536 | |||
537 | -- | ||
538 | 2.34.1 | ||
539 | |||
540 | |||
541 | From ada2ab0093596be707f23a3466ac82cff59fcffe Mon Sep 17 00:00:00 2001 | ||
542 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
543 | Date: Tue, 12 Sep 2023 16:07:13 +0100 | ||
544 | Subject: [PATCH 04/19] aarch64: Add bytes_below_saved_regs to frame info | ||
545 | |||
546 | The frame layout code currently hard-codes the assumption that | ||
547 | the number of bytes below the saved registers is equal to the | ||
548 | size of the outgoing arguments. This patch abstracts that | ||
549 | value into a new field of aarch64_frame. | ||
550 | |||
551 | gcc/ | ||
552 | * config/aarch64/aarch64.h (aarch64_frame::bytes_below_saved_regs): New | ||
553 | field. | ||
554 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Initialize it, | ||
555 | and use it instead of crtl->outgoing_args_size. | ||
556 | (aarch64_get_separate_components): Use bytes_below_saved_regs instead | ||
557 | of outgoing_args_size. | ||
558 | (aarch64_process_components): Likewise. | ||
559 | --- | ||
560 | gcc/config/aarch64/aarch64.cc | 71 ++++++++++++++++++----------------- | ||
561 | gcc/config/aarch64/aarch64.h | 5 +++ | ||
562 | 2 files changed, 41 insertions(+), 35 deletions(-) | ||
563 | |||
564 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
565 | index 37643041ffb..dacc2b0e4dd 100644 | ||
566 | --- a/gcc/config/aarch64/aarch64.cc | ||
567 | +++ b/gcc/config/aarch64/aarch64.cc | ||
568 | @@ -8478,6 +8478,8 @@ aarch64_layout_frame (void) | ||
569 | gcc_assert (crtl->is_leaf | ||
570 | || maybe_ne (frame.reg_offset[R30_REGNUM], SLOT_NOT_REQUIRED)); | ||
571 | |||
572 | + frame.bytes_below_saved_regs = crtl->outgoing_args_size; | ||
573 | + | ||
574 | /* Now assign stack slots for the registers. Start with the predicate | ||
575 | registers, since predicate LDR and STR have a relatively small | ||
576 | offset range. These saves happen below the hard frame pointer. */ | ||
577 | @@ -8582,18 +8584,18 @@ aarch64_layout_frame (void) | ||
578 | |||
579 | poly_int64 varargs_and_saved_regs_size = offset + frame.saved_varargs_size; | ||
580 | |||
581 | - poly_int64 above_outgoing_args | ||
582 | + poly_int64 saved_regs_and_above | ||
583 | = aligned_upper_bound (varargs_and_saved_regs_size | ||
584 | + get_frame_size (), | ||
585 | STACK_BOUNDARY / BITS_PER_UNIT); | ||
586 | |||
587 | frame.hard_fp_offset | ||
588 | - = above_outgoing_args - frame.below_hard_fp_saved_regs_size; | ||
589 | + = saved_regs_and_above - frame.below_hard_fp_saved_regs_size; | ||
590 | |||
591 | /* Both these values are already aligned. */ | ||
592 | - gcc_assert (multiple_p (crtl->outgoing_args_size, | ||
593 | + gcc_assert (multiple_p (frame.bytes_below_saved_regs, | ||
594 | STACK_BOUNDARY / BITS_PER_UNIT)); | ||
595 | - frame.frame_size = above_outgoing_args + crtl->outgoing_args_size; | ||
596 | + frame.frame_size = saved_regs_and_above + frame.bytes_below_saved_regs; | ||
597 | |||
598 | frame.locals_offset = frame.saved_varargs_size; | ||
599 | |||
600 | @@ -8637,7 +8639,7 @@ aarch64_layout_frame (void) | ||
601 | else if (frame.wb_pop_candidate1 != INVALID_REGNUM) | ||
602 | max_push_offset = 256; | ||
603 | |||
604 | - HOST_WIDE_INT const_size, const_outgoing_args_size, const_fp_offset; | ||
605 | + HOST_WIDE_INT const_size, const_below_saved_regs, const_fp_offset; | ||
606 | HOST_WIDE_INT const_saved_regs_size; | ||
607 | if (known_eq (frame.saved_regs_size, 0)) | ||
608 | frame.initial_adjust = frame.frame_size; | ||
609 | @@ -8645,31 +8647,31 @@ aarch64_layout_frame (void) | ||
610 | && const_size < max_push_offset | ||
611 | && known_eq (frame.hard_fp_offset, const_size)) | ||
612 | { | ||
613 | - /* Simple, small frame with no outgoing arguments: | ||
614 | + /* Simple, small frame with no data below the saved registers. | ||
615 | |||
616 | stp reg1, reg2, [sp, -frame_size]! | ||
617 | stp reg3, reg4, [sp, 16] */ | ||
618 | frame.callee_adjust = const_size; | ||
619 | } | ||
620 | - else if (crtl->outgoing_args_size.is_constant (&const_outgoing_args_size) | ||
621 | + else if (frame.bytes_below_saved_regs.is_constant (&const_below_saved_regs) | ||
622 | && frame.saved_regs_size.is_constant (&const_saved_regs_size) | ||
623 | - && const_outgoing_args_size + const_saved_regs_size < 512 | ||
624 | - /* We could handle this case even with outgoing args, provided | ||
625 | - that the number of args left us with valid offsets for all | ||
626 | - predicate and vector save slots. It's such a rare case that | ||
627 | - it hardly seems worth the effort though. */ | ||
628 | - && (!saves_below_hard_fp_p || const_outgoing_args_size == 0) | ||
629 | + && const_below_saved_regs + const_saved_regs_size < 512 | ||
630 | + /* We could handle this case even with data below the saved | ||
631 | + registers, provided that that data left us with valid offsets | ||
632 | + for all predicate and vector save slots. It's such a rare | ||
633 | + case that it hardly seems worth the effort though. */ | ||
634 | + && (!saves_below_hard_fp_p || const_below_saved_regs == 0) | ||
635 | && !(cfun->calls_alloca | ||
636 | && frame.hard_fp_offset.is_constant (&const_fp_offset) | ||
637 | && const_fp_offset < max_push_offset)) | ||
638 | { | ||
639 | - /* Frame with small outgoing arguments: | ||
640 | + /* Frame with small area below the saved registers: | ||
641 | |||
642 | sub sp, sp, frame_size | ||
643 | - stp reg1, reg2, [sp, outgoing_args_size] | ||
644 | - stp reg3, reg4, [sp, outgoing_args_size + 16] */ | ||
645 | + stp reg1, reg2, [sp, bytes_below_saved_regs] | ||
646 | + stp reg3, reg4, [sp, bytes_below_saved_regs + 16] */ | ||
647 | frame.initial_adjust = frame.frame_size; | ||
648 | - frame.callee_offset = const_outgoing_args_size; | ||
649 | + frame.callee_offset = const_below_saved_regs; | ||
650 | } | ||
651 | else if (saves_below_hard_fp_p | ||
652 | && known_eq (frame.saved_regs_size, | ||
653 | @@ -8679,30 +8681,29 @@ aarch64_layout_frame (void) | ||
654 | |||
655 | sub sp, sp, hard_fp_offset + below_hard_fp_saved_regs_size | ||
656 | save SVE registers relative to SP | ||
657 | - sub sp, sp, outgoing_args_size */ | ||
658 | + sub sp, sp, bytes_below_saved_regs */ | ||
659 | frame.initial_adjust = (frame.hard_fp_offset | ||
660 | + frame.below_hard_fp_saved_regs_size); | ||
661 | - frame.final_adjust = crtl->outgoing_args_size; | ||
662 | + frame.final_adjust = frame.bytes_below_saved_regs; | ||
663 | } | ||
664 | else if (frame.hard_fp_offset.is_constant (&const_fp_offset) | ||
665 | && const_fp_offset < max_push_offset) | ||
666 | { | ||
667 | - /* Frame with large outgoing arguments or SVE saves, but with | ||
668 | - a small local area: | ||
669 | + /* Frame with large area below the saved registers, or with SVE saves, | ||
670 | + but with a small area above: | ||
671 | |||
672 | stp reg1, reg2, [sp, -hard_fp_offset]! | ||
673 | stp reg3, reg4, [sp, 16] | ||
674 | [sub sp, sp, below_hard_fp_saved_regs_size] | ||
675 | [save SVE registers relative to SP] | ||
676 | - sub sp, sp, outgoing_args_size */ | ||
677 | + sub sp, sp, bytes_below_saved_regs */ | ||
678 | frame.callee_adjust = const_fp_offset; | ||
679 | frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; | ||
680 | - frame.final_adjust = crtl->outgoing_args_size; | ||
681 | + frame.final_adjust = frame.bytes_below_saved_regs; | ||
682 | } | ||
683 | else | ||
684 | { | ||
685 | - /* Frame with large local area and outgoing arguments or SVE saves, | ||
686 | - using frame pointer: | ||
687 | + /* General case: | ||
688 | |||
689 | sub sp, sp, hard_fp_offset | ||
690 | stp x29, x30, [sp, 0] | ||
691 | @@ -8710,10 +8711,10 @@ aarch64_layout_frame (void) | ||
692 | stp reg3, reg4, [sp, 16] | ||
693 | [sub sp, sp, below_hard_fp_saved_regs_size] | ||
694 | [save SVE registers relative to SP] | ||
695 | - sub sp, sp, outgoing_args_size */ | ||
696 | + sub sp, sp, bytes_below_saved_regs */ | ||
697 | frame.initial_adjust = frame.hard_fp_offset; | ||
698 | frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; | ||
699 | - frame.final_adjust = crtl->outgoing_args_size; | ||
700 | + frame.final_adjust = frame.bytes_below_saved_regs; | ||
701 | } | ||
702 | |||
703 | /* Make sure the individual adjustments add up to the full frame size. */ | ||
704 | @@ -9358,7 +9359,7 @@ aarch64_get_separate_components (void) | ||
705 | if (frame_pointer_needed) | ||
706 | offset -= frame.below_hard_fp_saved_regs_size; | ||
707 | else | ||
708 | - offset += crtl->outgoing_args_size; | ||
709 | + offset += frame.bytes_below_saved_regs; | ||
710 | |||
711 | /* Check that we can access the stack slot of the register with one | ||
712 | direct load with no adjustments needed. */ | ||
713 | @@ -9507,7 +9508,7 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
714 | if (frame_pointer_needed) | ||
715 | offset -= frame.below_hard_fp_saved_regs_size; | ||
716 | else | ||
717 | - offset += crtl->outgoing_args_size; | ||
718 | + offset += frame.bytes_below_saved_regs; | ||
719 | |||
720 | rtx addr = plus_constant (Pmode, ptr_reg, offset); | ||
721 | rtx mem = gen_frame_mem (mode, addr); | ||
722 | @@ -9561,7 +9562,7 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
723 | if (frame_pointer_needed) | ||
724 | offset2 -= frame.below_hard_fp_saved_regs_size; | ||
725 | else | ||
726 | - offset2 += crtl->outgoing_args_size; | ||
727 | + offset2 += frame.bytes_below_saved_regs; | ||
728 | rtx addr2 = plus_constant (Pmode, ptr_reg, offset2); | ||
729 | rtx mem2 = gen_frame_mem (mode, addr2); | ||
730 | rtx set2 = prologue_p ? gen_rtx_SET (mem2, reg2) | ||
731 | @@ -9635,10 +9636,10 @@ aarch64_stack_clash_protection_alloca_probe_range (void) | ||
732 | registers. If POLY_SIZE is not large enough to require a probe this function | ||
733 | will only adjust the stack. When allocating the stack space | ||
734 | FRAME_RELATED_P is then used to indicate if the allocation is frame related. | ||
735 | - FINAL_ADJUSTMENT_P indicates whether we are allocating the outgoing | ||
736 | - arguments. If we are then we ensure that any allocation larger than the ABI | ||
737 | - defined buffer needs a probe so that the invariant of having a 1KB buffer is | ||
738 | - maintained. | ||
739 | + FINAL_ADJUSTMENT_P indicates whether we are allocating the area below | ||
740 | + the saved registers. If we are then we ensure that any allocation | ||
741 | + larger than the ABI defined buffer needs a probe so that the | ||
742 | + invariant of having a 1KB buffer is maintained. | ||
743 | |||
744 | We emit barriers after each stack adjustment to prevent optimizations from | ||
745 | breaking the invariant that we never drop the stack more than a page. This | ||
746 | @@ -9847,7 +9848,7 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
747 | /* Handle any residuals. Residuals of at least MIN_PROBE_THRESHOLD have to | ||
748 | be probed. This maintains the requirement that each page is probed at | ||
749 | least once. For initial probing we probe only if the allocation is | ||
750 | - more than GUARD_SIZE - buffer, and for the outgoing arguments we probe | ||
751 | + more than GUARD_SIZE - buffer, and below the saved registers we probe | ||
752 | if the amount is larger than buffer. GUARD_SIZE - buffer + buffer == | ||
753 | GUARD_SIZE. This works that for any allocation that is large enough to | ||
754 | trigger a probe here, we'll have at least one, and if they're not large | ||
755 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
756 | index 73b09e20508..0b6faa3ddf1 100644 | ||
757 | --- a/gcc/config/aarch64/aarch64.h | ||
758 | +++ b/gcc/config/aarch64/aarch64.h | ||
759 | @@ -777,6 +777,11 @@ struct GTY (()) aarch64_frame | ||
760 | /* The size of the callee-save registers with a slot in REG_OFFSET. */ | ||
761 | poly_int64 saved_regs_size; | ||
762 | |||
763 | + /* The number of bytes between the bottom of the static frame (the bottom | ||
764 | + of the outgoing arguments) and the bottom of the register save area. | ||
765 | + This value is always a multiple of STACK_BOUNDARY. */ | ||
766 | + poly_int64 bytes_below_saved_regs; | ||
767 | + | ||
768 | /* The size of the callee-save registers with a slot in REG_OFFSET that | ||
769 | are saved below the hard frame pointer. */ | ||
770 | poly_int64 below_hard_fp_saved_regs_size; | ||
771 | -- | ||
772 | 2.34.1 | ||
773 | |||
774 | |||
775 | From 82f6b3e1b596ef0f4e3ac3bb9c6e88fb4458f402 Mon Sep 17 00:00:00 2001 | ||
776 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
777 | Date: Tue, 12 Sep 2023 16:07:14 +0100 | ||
778 | Subject: [PATCH 05/19] aarch64: Add bytes_below_hard_fp to frame info | ||
779 | |||
780 | Following on from the previous bytes_below_saved_regs patch, this one | ||
781 | records the number of bytes that are below the hard frame pointer. | ||
782 | This eventually replaces below_hard_fp_saved_regs_size. | ||
783 | |||
784 | If a frame pointer is not needed, the epilogue adds final_adjust | ||
785 | to the stack pointer before restoring registers: | ||
786 | |||
787 | aarch64_add_sp (tmp1_rtx, tmp0_rtx, final_adjust, true); | ||
788 | |||
789 | Therefore, if the epilogue needs to restore the stack pointer from | ||
790 | the hard frame pointer, the directly corresponding offset is: | ||
791 | |||
792 | -bytes_below_hard_fp + final_adjust | ||
793 | |||
794 | i.e. go from the hard frame pointer to the bottom of the frame, | ||
795 | then add the same amount as if we were using the stack pointer | ||
796 | from the outset. | ||
797 | |||
798 | gcc/ | ||
799 | * config/aarch64/aarch64.h (aarch64_frame::bytes_below_hard_fp): New | ||
800 | field. | ||
801 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Initialize it. | ||
802 | (aarch64_expand_epilogue): Use it instead of | ||
803 | below_hard_fp_saved_regs_size. | ||
804 | --- | ||
805 | gcc/config/aarch64/aarch64.cc | 6 +++--- | ||
806 | gcc/config/aarch64/aarch64.h | 5 +++++ | ||
807 | 2 files changed, 8 insertions(+), 3 deletions(-) | ||
808 | |||
809 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
810 | index dacc2b0e4dd..a3f7aabcc59 100644 | ||
811 | --- a/gcc/config/aarch64/aarch64.cc | ||
812 | +++ b/gcc/config/aarch64/aarch64.cc | ||
813 | @@ -8530,6 +8530,7 @@ aarch64_layout_frame (void) | ||
814 | of the callee save area. */ | ||
815 | bool saves_below_hard_fp_p = maybe_ne (offset, 0); | ||
816 | frame.below_hard_fp_saved_regs_size = offset; | ||
817 | + frame.bytes_below_hard_fp = offset + frame.bytes_below_saved_regs; | ||
818 | if (frame.emit_frame_chain) | ||
819 | { | ||
820 | /* FP and LR are placed in the linkage record. */ | ||
821 | @@ -10171,8 +10172,7 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
822 | poly_int64 final_adjust = frame.final_adjust; | ||
823 | poly_int64 callee_offset = frame.callee_offset; | ||
824 | poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
825 | - poly_int64 below_hard_fp_saved_regs_size | ||
826 | - = frame.below_hard_fp_saved_regs_size; | ||
827 | + poly_int64 bytes_below_hard_fp = frame.bytes_below_hard_fp; | ||
828 | unsigned reg1 = frame.wb_pop_candidate1; | ||
829 | unsigned reg2 = frame.wb_pop_candidate2; | ||
830 | unsigned int last_gpr = (frame.is_scs_enabled | ||
831 | @@ -10230,7 +10230,7 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
832 | is restored on the instruction doing the writeback. */ | ||
833 | aarch64_add_offset (Pmode, stack_pointer_rtx, | ||
834 | hard_frame_pointer_rtx, | ||
835 | - -callee_offset - below_hard_fp_saved_regs_size, | ||
836 | + -bytes_below_hard_fp + final_adjust, | ||
837 | tmp1_rtx, tmp0_rtx, callee_adjust == 0); | ||
838 | else | ||
839 | /* The case where we need to re-use the register here is very rare, so | ||
840 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
841 | index 0b6faa3ddf1..4263d29d29d 100644 | ||
842 | --- a/gcc/config/aarch64/aarch64.h | ||
843 | +++ b/gcc/config/aarch64/aarch64.h | ||
844 | @@ -786,6 +786,11 @@ struct GTY (()) aarch64_frame | ||
845 | are saved below the hard frame pointer. */ | ||
846 | poly_int64 below_hard_fp_saved_regs_size; | ||
847 | |||
848 | + /* The number of bytes between the bottom of the static frame (the bottom | ||
849 | + of the outgoing arguments) and the hard frame pointer. This value is | ||
850 | + always a multiple of STACK_BOUNDARY. */ | ||
851 | + poly_int64 bytes_below_hard_fp; | ||
852 | + | ||
853 | /* Offset from the base of the frame (incomming SP) to the | ||
854 | top of the locals area. This value is always a multiple of | ||
855 | STACK_BOUNDARY. */ | ||
856 | -- | ||
857 | 2.34.1 | ||
858 | |||
859 | |||
860 | From 86fa43e9fe4a8bf954f2919f07cbe3646d1d1df3 Mon Sep 17 00:00:00 2001 | ||
861 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
862 | Date: Tue, 12 Sep 2023 16:07:14 +0100 | ||
863 | Subject: [PATCH 06/19] aarch64: Tweak aarch64_save/restore_callee_saves | ||
864 | |||
865 | aarch64_save_callee_saves and aarch64_restore_callee_saves took | ||
866 | a parameter called start_offset that gives the offset of the | ||
867 | bottom of the saved register area from the current stack pointer. | ||
868 | However, it's more convenient for later patches if we use the | ||
869 | bottom of the entire frame as the reference point, rather than | ||
870 | the bottom of the saved registers. | ||
871 | |||
872 | Doing that removes the need for the callee_offset field. | ||
873 | Other than that, this is not a win on its own. It only really | ||
874 | makes sense in combination with the follow-on patches. | ||
875 | |||
876 | gcc/ | ||
877 | * config/aarch64/aarch64.h (aarch64_frame::callee_offset): Delete. | ||
878 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Remove | ||
879 | callee_offset handling. | ||
880 | (aarch64_save_callee_saves): Replace the start_offset parameter | ||
881 | with a bytes_below_sp parameter. | ||
882 | (aarch64_restore_callee_saves): Likewise. | ||
883 | (aarch64_expand_prologue): Update accordingly. | ||
884 | (aarch64_expand_epilogue): Likewise. | ||
885 | --- | ||
886 | gcc/config/aarch64/aarch64.cc | 56 +++++++++++++++++------------------ | ||
887 | gcc/config/aarch64/aarch64.h | 4 --- | ||
888 | 2 files changed, 28 insertions(+), 32 deletions(-) | ||
889 | |||
890 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
891 | index a3f7aabcc59..46ae5cf7673 100644 | ||
892 | --- a/gcc/config/aarch64/aarch64.cc | ||
893 | +++ b/gcc/config/aarch64/aarch64.cc | ||
894 | @@ -8604,7 +8604,6 @@ aarch64_layout_frame (void) | ||
895 | frame.final_adjust = 0; | ||
896 | frame.callee_adjust = 0; | ||
897 | frame.sve_callee_adjust = 0; | ||
898 | - frame.callee_offset = 0; | ||
899 | |||
900 | frame.wb_pop_candidate1 = frame.wb_push_candidate1; | ||
901 | frame.wb_pop_candidate2 = frame.wb_push_candidate2; | ||
902 | @@ -8672,7 +8671,6 @@ aarch64_layout_frame (void) | ||
903 | stp reg1, reg2, [sp, bytes_below_saved_regs] | ||
904 | stp reg3, reg4, [sp, bytes_below_saved_regs + 16] */ | ||
905 | frame.initial_adjust = frame.frame_size; | ||
906 | - frame.callee_offset = const_below_saved_regs; | ||
907 | } | ||
908 | else if (saves_below_hard_fp_p | ||
909 | && known_eq (frame.saved_regs_size, | ||
910 | @@ -9073,12 +9071,13 @@ aarch64_add_cfa_expression (rtx_insn *insn, rtx reg, | ||
911 | } | ||
912 | |||
913 | /* Emit code to save the callee-saved registers from register number START | ||
914 | - to LIMIT to the stack at the location starting at offset START_OFFSET, | ||
915 | - skipping any write-back candidates if SKIP_WB is true. HARD_FP_VALID_P | ||
916 | - is true if the hard frame pointer has been set up. */ | ||
917 | + to LIMIT to the stack. The stack pointer is currently BYTES_BELOW_SP | ||
918 | + bytes above the bottom of the static frame. Skip any write-back | ||
919 | + candidates if SKIP_WB is true. HARD_FP_VALID_P is true if the hard | ||
920 | + frame pointer has been set up. */ | ||
921 | |||
922 | static void | ||
923 | -aarch64_save_callee_saves (poly_int64 start_offset, | ||
924 | +aarch64_save_callee_saves (poly_int64 bytes_below_sp, | ||
925 | unsigned start, unsigned limit, bool skip_wb, | ||
926 | bool hard_fp_valid_p) | ||
927 | { | ||
928 | @@ -9106,7 +9105,9 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
929 | |||
930 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
931 | reg = gen_rtx_REG (mode, regno); | ||
932 | - offset = start_offset + frame.reg_offset[regno]; | ||
933 | + offset = (frame.reg_offset[regno] | ||
934 | + + frame.bytes_below_saved_regs | ||
935 | + - bytes_below_sp); | ||
936 | rtx base_rtx = stack_pointer_rtx; | ||
937 | poly_int64 sp_offset = offset; | ||
938 | |||
939 | @@ -9117,9 +9118,7 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
940 | else if (GP_REGNUM_P (regno) | ||
941 | && (!offset.is_constant (&const_offset) || const_offset >= 512)) | ||
942 | { | ||
943 | - gcc_assert (known_eq (start_offset, 0)); | ||
944 | - poly_int64 fp_offset | ||
945 | - = frame.below_hard_fp_saved_regs_size; | ||
946 | + poly_int64 fp_offset = frame.bytes_below_hard_fp - bytes_below_sp; | ||
947 | if (hard_fp_valid_p) | ||
948 | base_rtx = hard_frame_pointer_rtx; | ||
949 | else | ||
950 | @@ -9183,12 +9182,13 @@ aarch64_save_callee_saves (poly_int64 start_offset, | ||
951 | } | ||
952 | |||
953 | /* Emit code to restore the callee registers from register number START | ||
954 | - up to and including LIMIT. Restore from the stack offset START_OFFSET, | ||
955 | - skipping any write-back candidates if SKIP_WB is true. Write the | ||
956 | - appropriate REG_CFA_RESTORE notes into CFI_OPS. */ | ||
957 | + up to and including LIMIT. The stack pointer is currently BYTES_BELOW_SP | ||
958 | + bytes above the bottom of the static frame. Skip any write-back | ||
959 | + candidates if SKIP_WB is true. Write the appropriate REG_CFA_RESTORE | ||
960 | + notes into CFI_OPS. */ | ||
961 | |||
962 | static void | ||
963 | -aarch64_restore_callee_saves (poly_int64 start_offset, unsigned start, | ||
964 | +aarch64_restore_callee_saves (poly_int64 bytes_below_sp, unsigned start, | ||
965 | unsigned limit, bool skip_wb, rtx *cfi_ops) | ||
966 | { | ||
967 | aarch64_frame &frame = cfun->machine->frame; | ||
968 | @@ -9214,7 +9214,9 @@ aarch64_restore_callee_saves (poly_int64 start_offset, unsigned start, | ||
969 | |||
970 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
971 | reg = gen_rtx_REG (mode, regno); | ||
972 | - offset = start_offset + frame.reg_offset[regno]; | ||
973 | + offset = (frame.reg_offset[regno] | ||
974 | + + frame.bytes_below_saved_regs | ||
975 | + - bytes_below_sp); | ||
976 | rtx base_rtx = stack_pointer_rtx; | ||
977 | if (mode == VNx2DImode && BYTES_BIG_ENDIAN) | ||
978 | aarch64_adjust_sve_callee_save_base (mode, base_rtx, anchor_reg, | ||
979 | @@ -9990,8 +9992,6 @@ aarch64_expand_prologue (void) | ||
980 | HOST_WIDE_INT callee_adjust = frame.callee_adjust; | ||
981 | poly_int64 final_adjust = frame.final_adjust; | ||
982 | poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
983 | - poly_int64 below_hard_fp_saved_regs_size | ||
984 | - = frame.below_hard_fp_saved_regs_size; | ||
985 | unsigned reg1 = frame.wb_push_candidate1; | ||
986 | unsigned reg2 = frame.wb_push_candidate2; | ||
987 | bool emit_frame_chain = frame.emit_frame_chain; | ||
988 | @@ -10067,8 +10067,8 @@ aarch64_expand_prologue (void) | ||
989 | - frame.hard_fp_offset); | ||
990 | gcc_assert (known_ge (chain_offset, 0)); | ||
991 | |||
992 | - /* The offset of the bottom of the save area from the current SP. */ | ||
993 | - poly_int64 saved_regs_offset = chain_offset - below_hard_fp_saved_regs_size; | ||
994 | + /* The offset of the current SP from the bottom of the static frame. */ | ||
995 | + poly_int64 bytes_below_sp = frame_size - initial_adjust - callee_adjust; | ||
996 | |||
997 | if (emit_frame_chain) | ||
998 | { | ||
999 | @@ -10076,7 +10076,7 @@ aarch64_expand_prologue (void) | ||
1000 | { | ||
1001 | reg1 = R29_REGNUM; | ||
1002 | reg2 = R30_REGNUM; | ||
1003 | - aarch64_save_callee_saves (saved_regs_offset, reg1, reg2, | ||
1004 | + aarch64_save_callee_saves (bytes_below_sp, reg1, reg2, | ||
1005 | false, false); | ||
1006 | } | ||
1007 | else | ||
1008 | @@ -10116,7 +10116,7 @@ aarch64_expand_prologue (void) | ||
1009 | emit_insn (gen_stack_tie (stack_pointer_rtx, hard_frame_pointer_rtx)); | ||
1010 | } | ||
1011 | |||
1012 | - aarch64_save_callee_saves (saved_regs_offset, R0_REGNUM, R30_REGNUM, | ||
1013 | + aarch64_save_callee_saves (bytes_below_sp, R0_REGNUM, R30_REGNUM, | ||
1014 | callee_adjust != 0 || emit_frame_chain, | ||
1015 | emit_frame_chain); | ||
1016 | if (maybe_ne (sve_callee_adjust, 0)) | ||
1017 | @@ -10126,16 +10126,17 @@ aarch64_expand_prologue (void) | ||
1018 | aarch64_allocate_and_probe_stack_space (tmp1_rtx, tmp0_rtx, | ||
1019 | sve_callee_adjust, | ||
1020 | !frame_pointer_needed, false); | ||
1021 | - saved_regs_offset += sve_callee_adjust; | ||
1022 | + bytes_below_sp -= sve_callee_adjust; | ||
1023 | } | ||
1024 | - aarch64_save_callee_saves (saved_regs_offset, P0_REGNUM, P15_REGNUM, | ||
1025 | + aarch64_save_callee_saves (bytes_below_sp, P0_REGNUM, P15_REGNUM, | ||
1026 | false, emit_frame_chain); | ||
1027 | - aarch64_save_callee_saves (saved_regs_offset, V0_REGNUM, V31_REGNUM, | ||
1028 | + aarch64_save_callee_saves (bytes_below_sp, V0_REGNUM, V31_REGNUM, | ||
1029 | callee_adjust != 0 || emit_frame_chain, | ||
1030 | emit_frame_chain); | ||
1031 | |||
1032 | /* We may need to probe the final adjustment if it is larger than the guard | ||
1033 | that is assumed by the called. */ | ||
1034 | + gcc_assert (known_eq (bytes_below_sp, final_adjust)); | ||
1035 | aarch64_allocate_and_probe_stack_space (tmp1_rtx, tmp0_rtx, final_adjust, | ||
1036 | !frame_pointer_needed, true); | ||
1037 | } | ||
1038 | @@ -10170,7 +10171,6 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
1039 | poly_int64 initial_adjust = frame.initial_adjust; | ||
1040 | HOST_WIDE_INT callee_adjust = frame.callee_adjust; | ||
1041 | poly_int64 final_adjust = frame.final_adjust; | ||
1042 | - poly_int64 callee_offset = frame.callee_offset; | ||
1043 | poly_int64 sve_callee_adjust = frame.sve_callee_adjust; | ||
1044 | poly_int64 bytes_below_hard_fp = frame.bytes_below_hard_fp; | ||
1045 | unsigned reg1 = frame.wb_pop_candidate1; | ||
1046 | @@ -10240,9 +10240,9 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
1047 | |||
1048 | /* Restore the vector registers before the predicate registers, | ||
1049 | so that we can use P4 as a temporary for big-endian SVE frames. */ | ||
1050 | - aarch64_restore_callee_saves (callee_offset, V0_REGNUM, V31_REGNUM, | ||
1051 | + aarch64_restore_callee_saves (final_adjust, V0_REGNUM, V31_REGNUM, | ||
1052 | callee_adjust != 0, &cfi_ops); | ||
1053 | - aarch64_restore_callee_saves (callee_offset, P0_REGNUM, P15_REGNUM, | ||
1054 | + aarch64_restore_callee_saves (final_adjust, P0_REGNUM, P15_REGNUM, | ||
1055 | false, &cfi_ops); | ||
1056 | if (maybe_ne (sve_callee_adjust, 0)) | ||
1057 | aarch64_add_sp (NULL_RTX, NULL_RTX, sve_callee_adjust, true); | ||
1058 | @@ -10250,7 +10250,7 @@ aarch64_expand_epilogue (bool for_sibcall) | ||
1059 | /* When shadow call stack is enabled, the scs_pop in the epilogue will | ||
1060 | restore x30, we don't need to restore x30 again in the traditional | ||
1061 | way. */ | ||
1062 | - aarch64_restore_callee_saves (callee_offset - sve_callee_adjust, | ||
1063 | + aarch64_restore_callee_saves (final_adjust + sve_callee_adjust, | ||
1064 | R0_REGNUM, last_gpr, | ||
1065 | callee_adjust != 0, &cfi_ops); | ||
1066 | |||
1067 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
1068 | index 4263d29d29d..fd820b1be4e 100644 | ||
1069 | --- a/gcc/config/aarch64/aarch64.h | ||
1070 | +++ b/gcc/config/aarch64/aarch64.h | ||
1071 | @@ -813,10 +813,6 @@ struct GTY (()) aarch64_frame | ||
1072 | It is zero when no push is used. */ | ||
1073 | HOST_WIDE_INT callee_adjust; | ||
1074 | |||
1075 | - /* The offset from SP to the callee-save registers after initial_adjust. | ||
1076 | - It may be non-zero if no push is used (ie. callee_adjust == 0). */ | ||
1077 | - poly_int64 callee_offset; | ||
1078 | - | ||
1079 | /* The size of the stack adjustment before saving or after restoring | ||
1080 | SVE registers. */ | ||
1081 | poly_int64 sve_callee_adjust; | ||
1082 | -- | ||
1083 | 2.34.1 | ||
1084 | |||
1085 | |||
1086 | From 8ae9181426f2700c2e5a2909487fa630e6fa406b Mon Sep 17 00:00:00 2001 | ||
1087 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1088 | Date: Tue, 12 Sep 2023 16:07:15 +0100 | ||
1089 | Subject: [PATCH 07/19] aarch64: Only calculate chain_offset if there is a | ||
1090 | chain | ||
1091 | |||
1092 | After previous patches, it is no longer necessary to calculate | ||
1093 | a chain_offset in cases where there is no chain record. | ||
1094 | |||
1095 | gcc/ | ||
1096 | * config/aarch64/aarch64.cc (aarch64_expand_prologue): Move the | ||
1097 | calculation of chain_offset into the emit_frame_chain block. | ||
1098 | --- | ||
1099 | gcc/config/aarch64/aarch64.cc | 10 +++++----- | ||
1100 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
1101 | |||
1102 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1103 | index 46ae5cf7673..0e9b9717c08 100644 | ||
1104 | --- a/gcc/config/aarch64/aarch64.cc | ||
1105 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1106 | @@ -10062,16 +10062,16 @@ aarch64_expand_prologue (void) | ||
1107 | if (callee_adjust != 0) | ||
1108 | aarch64_push_regs (reg1, reg2, callee_adjust); | ||
1109 | |||
1110 | - /* The offset of the frame chain record (if any) from the current SP. */ | ||
1111 | - poly_int64 chain_offset = (initial_adjust + callee_adjust | ||
1112 | - - frame.hard_fp_offset); | ||
1113 | - gcc_assert (known_ge (chain_offset, 0)); | ||
1114 | - | ||
1115 | /* The offset of the current SP from the bottom of the static frame. */ | ||
1116 | poly_int64 bytes_below_sp = frame_size - initial_adjust - callee_adjust; | ||
1117 | |||
1118 | if (emit_frame_chain) | ||
1119 | { | ||
1120 | + /* The offset of the frame chain record (if any) from the current SP. */ | ||
1121 | + poly_int64 chain_offset = (initial_adjust + callee_adjust | ||
1122 | + - frame.hard_fp_offset); | ||
1123 | + gcc_assert (known_ge (chain_offset, 0)); | ||
1124 | + | ||
1125 | if (callee_adjust == 0) | ||
1126 | { | ||
1127 | reg1 = R29_REGNUM; | ||
1128 | -- | ||
1129 | 2.34.1 | ||
1130 | |||
1131 | |||
1132 | From 375794feb614cee1f41b710b9cc1b6f25da6c1cb Mon Sep 17 00:00:00 2001 | ||
1133 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1134 | Date: Tue, 12 Sep 2023 16:07:15 +0100 | ||
1135 | Subject: [PATCH 08/19] aarch64: Rename locals_offset to bytes_above_locals | ||
1136 | MIME-Version: 1.0 | ||
1137 | Content-Type: text/plain; charset=UTF-8 | ||
1138 | Content-Transfer-Encoding: 8bit | ||
1139 | |||
1140 | locals_offset was described as: | ||
1141 | |||
1142 | /* Offset from the base of the frame (incomming SP) to the | ||
1143 | top of the locals area. This value is always a multiple of | ||
1144 | STACK_BOUNDARY. */ | ||
1145 | |||
1146 | This is implicitly an “upside down” view of the frame: the incoming | ||
1147 | SP is at offset 0, and anything N bytes below the incoming SP is at | ||
1148 | offset N (rather than -N). | ||
1149 | |||
1150 | However, reg_offset instead uses a “right way up” view; that is, | ||
1151 | it views offsets in address terms. Something above X is at a | ||
1152 | positive offset from X and something below X is at a negative | ||
1153 | offset from X. | ||
1154 | |||
1155 | Also, even on FRAME_GROWS_DOWNWARD targets like AArch64, | ||
1156 | target-independent code views offsets in address terms too: | ||
1157 | locals are allocated at negative offsets to virtual_stack_vars. | ||
1158 | |||
1159 | It seems confusing to have *_offset fields of the same structure | ||
1160 | using different polarities like this. This patch tries to avoid | ||
1161 | that by renaming locals_offset to bytes_above_locals. | ||
1162 | |||
1163 | gcc/ | ||
1164 | * config/aarch64/aarch64.h (aarch64_frame::locals_offset): Rename to... | ||
1165 | (aarch64_frame::bytes_above_locals): ...this. | ||
1166 | * config/aarch64/aarch64.cc (aarch64_layout_frame) | ||
1167 | (aarch64_initial_elimination_offset): Update accordingly. | ||
1168 | --- | ||
1169 | gcc/config/aarch64/aarch64.cc | 6 +++--- | ||
1170 | gcc/config/aarch64/aarch64.h | 6 +++--- | ||
1171 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
1172 | |||
1173 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1174 | index 0e9b9717c08..0a22f91520e 100644 | ||
1175 | --- a/gcc/config/aarch64/aarch64.cc | ||
1176 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1177 | @@ -8598,7 +8598,7 @@ aarch64_layout_frame (void) | ||
1178 | STACK_BOUNDARY / BITS_PER_UNIT)); | ||
1179 | frame.frame_size = saved_regs_and_above + frame.bytes_below_saved_regs; | ||
1180 | |||
1181 | - frame.locals_offset = frame.saved_varargs_size; | ||
1182 | + frame.bytes_above_locals = frame.saved_varargs_size; | ||
1183 | |||
1184 | frame.initial_adjust = 0; | ||
1185 | frame.final_adjust = 0; | ||
1186 | @@ -12754,13 +12754,13 @@ aarch64_initial_elimination_offset (unsigned from, unsigned to) | ||
1187 | return frame.hard_fp_offset; | ||
1188 | |||
1189 | if (from == FRAME_POINTER_REGNUM) | ||
1190 | - return frame.hard_fp_offset - frame.locals_offset; | ||
1191 | + return frame.hard_fp_offset - frame.bytes_above_locals; | ||
1192 | } | ||
1193 | |||
1194 | if (to == STACK_POINTER_REGNUM) | ||
1195 | { | ||
1196 | if (from == FRAME_POINTER_REGNUM) | ||
1197 | - return frame.frame_size - frame.locals_offset; | ||
1198 | + return frame.frame_size - frame.bytes_above_locals; | ||
1199 | } | ||
1200 | |||
1201 | return frame.frame_size; | ||
1202 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
1203 | index fd820b1be4e..7ae12d13e2b 100644 | ||
1204 | --- a/gcc/config/aarch64/aarch64.h | ||
1205 | +++ b/gcc/config/aarch64/aarch64.h | ||
1206 | @@ -791,10 +791,10 @@ struct GTY (()) aarch64_frame | ||
1207 | always a multiple of STACK_BOUNDARY. */ | ||
1208 | poly_int64 bytes_below_hard_fp; | ||
1209 | |||
1210 | - /* Offset from the base of the frame (incomming SP) to the | ||
1211 | - top of the locals area. This value is always a multiple of | ||
1212 | + /* The number of bytes between the top of the locals area and the top | ||
1213 | + of the frame (the incomming SP). This value is always a multiple of | ||
1214 | STACK_BOUNDARY. */ | ||
1215 | - poly_int64 locals_offset; | ||
1216 | + poly_int64 bytes_above_locals; | ||
1217 | |||
1218 | /* Offset from the base of the frame (incomming SP) to the | ||
1219 | hard_frame_pointer. This value is always a multiple of | ||
1220 | -- | ||
1221 | 2.34.1 | ||
1222 | |||
1223 | |||
1224 | From 1a9ea1c45c75615ffbfabe652b3598a1d7be2168 Mon Sep 17 00:00:00 2001 | ||
1225 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1226 | Date: Tue, 12 Sep 2023 16:07:16 +0100 | ||
1227 | Subject: [PATCH 09/19] aarch64: Rename hard_fp_offset to bytes_above_hard_fp | ||
1228 | MIME-Version: 1.0 | ||
1229 | Content-Type: text/plain; charset=UTF-8 | ||
1230 | Content-Transfer-Encoding: 8bit | ||
1231 | |||
1232 | Similarly to the previous locals_offset patch, hard_fp_offset | ||
1233 | was described as: | ||
1234 | |||
1235 | /* Offset from the base of the frame (incomming SP) to the | ||
1236 | hard_frame_pointer. This value is always a multiple of | ||
1237 | STACK_BOUNDARY. */ | ||
1238 | poly_int64 hard_fp_offset; | ||
1239 | |||
1240 | which again took an “upside-down” view: higher offsets meant lower | ||
1241 | addresses. This patch renames the field to bytes_above_hard_fp instead. | ||
1242 | |||
1243 | gcc/ | ||
1244 | * config/aarch64/aarch64.h (aarch64_frame::hard_fp_offset): Rename | ||
1245 | to... | ||
1246 | (aarch64_frame::bytes_above_hard_fp): ...this. | ||
1247 | * config/aarch64/aarch64.cc (aarch64_layout_frame) | ||
1248 | (aarch64_expand_prologue): Update accordingly. | ||
1249 | (aarch64_initial_elimination_offset): Likewise. | ||
1250 | --- | ||
1251 | gcc/config/aarch64/aarch64.cc | 26 +++++++++++++------------- | ||
1252 | gcc/config/aarch64/aarch64.h | 6 +++--- | ||
1253 | 2 files changed, 16 insertions(+), 16 deletions(-) | ||
1254 | |||
1255 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1256 | index 0a22f91520e..95499ae49ba 100644 | ||
1257 | --- a/gcc/config/aarch64/aarch64.cc | ||
1258 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1259 | @@ -8590,7 +8590,7 @@ aarch64_layout_frame (void) | ||
1260 | + get_frame_size (), | ||
1261 | STACK_BOUNDARY / BITS_PER_UNIT); | ||
1262 | |||
1263 | - frame.hard_fp_offset | ||
1264 | + frame.bytes_above_hard_fp | ||
1265 | = saved_regs_and_above - frame.below_hard_fp_saved_regs_size; | ||
1266 | |||
1267 | /* Both these values are already aligned. */ | ||
1268 | @@ -8639,13 +8639,13 @@ aarch64_layout_frame (void) | ||
1269 | else if (frame.wb_pop_candidate1 != INVALID_REGNUM) | ||
1270 | max_push_offset = 256; | ||
1271 | |||
1272 | - HOST_WIDE_INT const_size, const_below_saved_regs, const_fp_offset; | ||
1273 | + HOST_WIDE_INT const_size, const_below_saved_regs, const_above_fp; | ||
1274 | HOST_WIDE_INT const_saved_regs_size; | ||
1275 | if (known_eq (frame.saved_regs_size, 0)) | ||
1276 | frame.initial_adjust = frame.frame_size; | ||
1277 | else if (frame.frame_size.is_constant (&const_size) | ||
1278 | && const_size < max_push_offset | ||
1279 | - && known_eq (frame.hard_fp_offset, const_size)) | ||
1280 | + && known_eq (frame.bytes_above_hard_fp, const_size)) | ||
1281 | { | ||
1282 | /* Simple, small frame with no data below the saved registers. | ||
1283 | |||
1284 | @@ -8662,8 +8662,8 @@ aarch64_layout_frame (void) | ||
1285 | case that it hardly seems worth the effort though. */ | ||
1286 | && (!saves_below_hard_fp_p || const_below_saved_regs == 0) | ||
1287 | && !(cfun->calls_alloca | ||
1288 | - && frame.hard_fp_offset.is_constant (&const_fp_offset) | ||
1289 | - && const_fp_offset < max_push_offset)) | ||
1290 | + && frame.bytes_above_hard_fp.is_constant (&const_above_fp) | ||
1291 | + && const_above_fp < max_push_offset)) | ||
1292 | { | ||
1293 | /* Frame with small area below the saved registers: | ||
1294 | |||
1295 | @@ -8681,12 +8681,12 @@ aarch64_layout_frame (void) | ||
1296 | sub sp, sp, hard_fp_offset + below_hard_fp_saved_regs_size | ||
1297 | save SVE registers relative to SP | ||
1298 | sub sp, sp, bytes_below_saved_regs */ | ||
1299 | - frame.initial_adjust = (frame.hard_fp_offset | ||
1300 | + frame.initial_adjust = (frame.bytes_above_hard_fp | ||
1301 | + frame.below_hard_fp_saved_regs_size); | ||
1302 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
1303 | } | ||
1304 | - else if (frame.hard_fp_offset.is_constant (&const_fp_offset) | ||
1305 | - && const_fp_offset < max_push_offset) | ||
1306 | + else if (frame.bytes_above_hard_fp.is_constant (&const_above_fp) | ||
1307 | + && const_above_fp < max_push_offset) | ||
1308 | { | ||
1309 | /* Frame with large area below the saved registers, or with SVE saves, | ||
1310 | but with a small area above: | ||
1311 | @@ -8696,7 +8696,7 @@ aarch64_layout_frame (void) | ||
1312 | [sub sp, sp, below_hard_fp_saved_regs_size] | ||
1313 | [save SVE registers relative to SP] | ||
1314 | sub sp, sp, bytes_below_saved_regs */ | ||
1315 | - frame.callee_adjust = const_fp_offset; | ||
1316 | + frame.callee_adjust = const_above_fp; | ||
1317 | frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; | ||
1318 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
1319 | } | ||
1320 | @@ -8711,7 +8711,7 @@ aarch64_layout_frame (void) | ||
1321 | [sub sp, sp, below_hard_fp_saved_regs_size] | ||
1322 | [save SVE registers relative to SP] | ||
1323 | sub sp, sp, bytes_below_saved_regs */ | ||
1324 | - frame.initial_adjust = frame.hard_fp_offset; | ||
1325 | + frame.initial_adjust = frame.bytes_above_hard_fp; | ||
1326 | frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; | ||
1327 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
1328 | } | ||
1329 | @@ -10069,7 +10069,7 @@ aarch64_expand_prologue (void) | ||
1330 | { | ||
1331 | /* The offset of the frame chain record (if any) from the current SP. */ | ||
1332 | poly_int64 chain_offset = (initial_adjust + callee_adjust | ||
1333 | - - frame.hard_fp_offset); | ||
1334 | + - frame.bytes_above_hard_fp); | ||
1335 | gcc_assert (known_ge (chain_offset, 0)); | ||
1336 | |||
1337 | if (callee_adjust == 0) | ||
1338 | @@ -12751,10 +12751,10 @@ aarch64_initial_elimination_offset (unsigned from, unsigned to) | ||
1339 | if (to == HARD_FRAME_POINTER_REGNUM) | ||
1340 | { | ||
1341 | if (from == ARG_POINTER_REGNUM) | ||
1342 | - return frame.hard_fp_offset; | ||
1343 | + return frame.bytes_above_hard_fp; | ||
1344 | |||
1345 | if (from == FRAME_POINTER_REGNUM) | ||
1346 | - return frame.hard_fp_offset - frame.bytes_above_locals; | ||
1347 | + return frame.bytes_above_hard_fp - frame.bytes_above_locals; | ||
1348 | } | ||
1349 | |||
1350 | if (to == STACK_POINTER_REGNUM) | ||
1351 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
1352 | index 7ae12d13e2b..3808f49e9ca 100644 | ||
1353 | --- a/gcc/config/aarch64/aarch64.h | ||
1354 | +++ b/gcc/config/aarch64/aarch64.h | ||
1355 | @@ -796,10 +796,10 @@ struct GTY (()) aarch64_frame | ||
1356 | STACK_BOUNDARY. */ | ||
1357 | poly_int64 bytes_above_locals; | ||
1358 | |||
1359 | - /* Offset from the base of the frame (incomming SP) to the | ||
1360 | - hard_frame_pointer. This value is always a multiple of | ||
1361 | + /* The number of bytes between the hard_frame_pointer and the top of | ||
1362 | + the frame (the incomming SP). This value is always a multiple of | ||
1363 | STACK_BOUNDARY. */ | ||
1364 | - poly_int64 hard_fp_offset; | ||
1365 | + poly_int64 bytes_above_hard_fp; | ||
1366 | |||
1367 | /* The size of the frame. This value is the offset from base of the | ||
1368 | frame (incomming SP) to the stack_pointer. This value is always | ||
1369 | -- | ||
1370 | 2.34.1 | ||
1371 | |||
1372 | |||
1373 | From d202ce1ecf60a36a3e1009917dd76109248ce9be Mon Sep 17 00:00:00 2001 | ||
1374 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1375 | Date: Tue, 12 Sep 2023 16:07:16 +0100 | ||
1376 | Subject: [PATCH 10/19] aarch64: Tweak frame_size comment | ||
1377 | MIME-Version: 1.0 | ||
1378 | Content-Type: text/plain; charset=UTF-8 | ||
1379 | Content-Transfer-Encoding: 8bit | ||
1380 | |||
1381 | This patch fixes another case in which a value was described with | ||
1382 | an “upside-down” view. | ||
1383 | |||
1384 | gcc/ | ||
1385 | * config/aarch64/aarch64.h (aarch64_frame::frame_size): Tweak comment. | ||
1386 | --- | ||
1387 | gcc/config/aarch64/aarch64.h | 4 ++-- | ||
1388 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
1389 | |||
1390 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
1391 | index 3808f49e9ca..108a5731b0d 100644 | ||
1392 | --- a/gcc/config/aarch64/aarch64.h | ||
1393 | +++ b/gcc/config/aarch64/aarch64.h | ||
1394 | @@ -801,8 +801,8 @@ struct GTY (()) aarch64_frame | ||
1395 | STACK_BOUNDARY. */ | ||
1396 | poly_int64 bytes_above_hard_fp; | ||
1397 | |||
1398 | - /* The size of the frame. This value is the offset from base of the | ||
1399 | - frame (incomming SP) to the stack_pointer. This value is always | ||
1400 | + /* The size of the frame, i.e. the number of bytes between the bottom | ||
1401 | + of the outgoing arguments and the incoming SP. This value is always | ||
1402 | a multiple of STACK_BOUNDARY. */ | ||
1403 | poly_int64 frame_size; | ||
1404 | |||
1405 | -- | ||
1406 | 2.34.1 | ||
1407 | |||
1408 | |||
1409 | From f2b585375205b0a1802d79c682ba33766ecd1f0f Mon Sep 17 00:00:00 2001 | ||
1410 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1411 | Date: Tue, 12 Sep 2023 16:07:17 +0100 | ||
1412 | Subject: [PATCH 11/19] aarch64: Measure reg_offset from the bottom of the | ||
1413 | frame | ||
1414 | |||
1415 | reg_offset was measured from the bottom of the saved register area. | ||
1416 | This made perfect sense with the original layout, since the bottom | ||
1417 | of the saved register area was also the hard frame pointer address. | ||
1418 | It became slightly less obvious with SVE, since we save SVE | ||
1419 | registers below the hard frame pointer, but it still made sense. | ||
1420 | |||
1421 | However, if we want to allow different frame layouts, it's more | ||
1422 | convenient and obvious to measure reg_offset from the bottom of | ||
1423 | the frame. After previous patches, it's also a slight simplification | ||
1424 | in its own right. | ||
1425 | |||
1426 | gcc/ | ||
1427 | * config/aarch64/aarch64.h (aarch64_frame): Add comment above | ||
1428 | reg_offset. | ||
1429 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Walk offsets | ||
1430 | from the bottom of the frame, rather than the bottom of the saved | ||
1431 | register area. Measure reg_offset from the bottom of the frame | ||
1432 | rather than the bottom of the saved register area. | ||
1433 | (aarch64_save_callee_saves): Update accordingly. | ||
1434 | (aarch64_restore_callee_saves): Likewise. | ||
1435 | (aarch64_get_separate_components): Likewise. | ||
1436 | (aarch64_process_components): Likewise. | ||
1437 | --- | ||
1438 | gcc/config/aarch64/aarch64.cc | 53 ++++++++++++++++------------------- | ||
1439 | gcc/config/aarch64/aarch64.h | 3 ++ | ||
1440 | 2 files changed, 27 insertions(+), 29 deletions(-) | ||
1441 | |||
1442 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1443 | index 95499ae49ba..af99807ef8a 100644 | ||
1444 | --- a/gcc/config/aarch64/aarch64.cc | ||
1445 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1446 | @@ -8400,7 +8400,6 @@ aarch64_needs_frame_chain (void) | ||
1447 | static void | ||
1448 | aarch64_layout_frame (void) | ||
1449 | { | ||
1450 | - poly_int64 offset = 0; | ||
1451 | int regno, last_fp_reg = INVALID_REGNUM; | ||
1452 | machine_mode vector_save_mode = aarch64_reg_save_mode (V8_REGNUM); | ||
1453 | poly_int64 vector_save_size = GET_MODE_SIZE (vector_save_mode); | ||
1454 | @@ -8478,7 +8477,9 @@ aarch64_layout_frame (void) | ||
1455 | gcc_assert (crtl->is_leaf | ||
1456 | || maybe_ne (frame.reg_offset[R30_REGNUM], SLOT_NOT_REQUIRED)); | ||
1457 | |||
1458 | - frame.bytes_below_saved_regs = crtl->outgoing_args_size; | ||
1459 | + poly_int64 offset = crtl->outgoing_args_size; | ||
1460 | + gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT)); | ||
1461 | + frame.bytes_below_saved_regs = offset; | ||
1462 | |||
1463 | /* Now assign stack slots for the registers. Start with the predicate | ||
1464 | registers, since predicate LDR and STR have a relatively small | ||
1465 | @@ -8490,7 +8491,8 @@ aarch64_layout_frame (void) | ||
1466 | offset += BYTES_PER_SVE_PRED; | ||
1467 | } | ||
1468 | |||
1469 | - if (maybe_ne (offset, 0)) | ||
1470 | + poly_int64 saved_prs_size = offset - frame.bytes_below_saved_regs; | ||
1471 | + if (maybe_ne (saved_prs_size, 0)) | ||
1472 | { | ||
1473 | /* If we have any vector registers to save above the predicate registers, | ||
1474 | the offset of the vector register save slots need to be a multiple | ||
1475 | @@ -8508,10 +8510,10 @@ aarch64_layout_frame (void) | ||
1476 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
1477 | else | ||
1478 | { | ||
1479 | - if (known_le (offset, vector_save_size)) | ||
1480 | - offset = vector_save_size; | ||
1481 | - else if (known_le (offset, vector_save_size * 2)) | ||
1482 | - offset = vector_save_size * 2; | ||
1483 | + if (known_le (saved_prs_size, vector_save_size)) | ||
1484 | + offset = frame.bytes_below_saved_regs + vector_save_size; | ||
1485 | + else if (known_le (saved_prs_size, vector_save_size * 2)) | ||
1486 | + offset = frame.bytes_below_saved_regs + vector_save_size * 2; | ||
1487 | else | ||
1488 | gcc_unreachable (); | ||
1489 | } | ||
1490 | @@ -8528,9 +8530,10 @@ aarch64_layout_frame (void) | ||
1491 | |||
1492 | /* OFFSET is now the offset of the hard frame pointer from the bottom | ||
1493 | of the callee save area. */ | ||
1494 | - bool saves_below_hard_fp_p = maybe_ne (offset, 0); | ||
1495 | - frame.below_hard_fp_saved_regs_size = offset; | ||
1496 | - frame.bytes_below_hard_fp = offset + frame.bytes_below_saved_regs; | ||
1497 | + frame.below_hard_fp_saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
1498 | + bool saves_below_hard_fp_p | ||
1499 | + = maybe_ne (frame.below_hard_fp_saved_regs_size, 0); | ||
1500 | + frame.bytes_below_hard_fp = offset; | ||
1501 | if (frame.emit_frame_chain) | ||
1502 | { | ||
1503 | /* FP and LR are placed in the linkage record. */ | ||
1504 | @@ -8581,9 +8584,10 @@ aarch64_layout_frame (void) | ||
1505 | |||
1506 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
1507 | |||
1508 | - frame.saved_regs_size = offset; | ||
1509 | + frame.saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
1510 | |||
1511 | - poly_int64 varargs_and_saved_regs_size = offset + frame.saved_varargs_size; | ||
1512 | + poly_int64 varargs_and_saved_regs_size | ||
1513 | + = frame.saved_regs_size + frame.saved_varargs_size; | ||
1514 | |||
1515 | poly_int64 saved_regs_and_above | ||
1516 | = aligned_upper_bound (varargs_and_saved_regs_size | ||
1517 | @@ -9105,9 +9109,7 @@ aarch64_save_callee_saves (poly_int64 bytes_below_sp, | ||
1518 | |||
1519 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
1520 | reg = gen_rtx_REG (mode, regno); | ||
1521 | - offset = (frame.reg_offset[regno] | ||
1522 | - + frame.bytes_below_saved_regs | ||
1523 | - - bytes_below_sp); | ||
1524 | + offset = frame.reg_offset[regno] - bytes_below_sp; | ||
1525 | rtx base_rtx = stack_pointer_rtx; | ||
1526 | poly_int64 sp_offset = offset; | ||
1527 | |||
1528 | @@ -9214,9 +9216,7 @@ aarch64_restore_callee_saves (poly_int64 bytes_below_sp, unsigned start, | ||
1529 | |||
1530 | machine_mode mode = aarch64_reg_save_mode (regno); | ||
1531 | reg = gen_rtx_REG (mode, regno); | ||
1532 | - offset = (frame.reg_offset[regno] | ||
1533 | - + frame.bytes_below_saved_regs | ||
1534 | - - bytes_below_sp); | ||
1535 | + offset = frame.reg_offset[regno] - bytes_below_sp; | ||
1536 | rtx base_rtx = stack_pointer_rtx; | ||
1537 | if (mode == VNx2DImode && BYTES_BIG_ENDIAN) | ||
1538 | aarch64_adjust_sve_callee_save_base (mode, base_rtx, anchor_reg, | ||
1539 | @@ -9355,14 +9355,12 @@ aarch64_get_separate_components (void) | ||
1540 | it as a stack probe for -fstack-clash-protection. */ | ||
1541 | if (flag_stack_clash_protection | ||
1542 | && maybe_ne (frame.below_hard_fp_saved_regs_size, 0) | ||
1543 | - && known_eq (offset, 0)) | ||
1544 | + && known_eq (offset, frame.bytes_below_saved_regs)) | ||
1545 | continue; | ||
1546 | |||
1547 | /* Get the offset relative to the register we'll use. */ | ||
1548 | if (frame_pointer_needed) | ||
1549 | - offset -= frame.below_hard_fp_saved_regs_size; | ||
1550 | - else | ||
1551 | - offset += frame.bytes_below_saved_regs; | ||
1552 | + offset -= frame.bytes_below_hard_fp; | ||
1553 | |||
1554 | /* Check that we can access the stack slot of the register with one | ||
1555 | direct load with no adjustments needed. */ | ||
1556 | @@ -9509,9 +9507,7 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
1557 | rtx reg = gen_rtx_REG (mode, regno); | ||
1558 | poly_int64 offset = frame.reg_offset[regno]; | ||
1559 | if (frame_pointer_needed) | ||
1560 | - offset -= frame.below_hard_fp_saved_regs_size; | ||
1561 | - else | ||
1562 | - offset += frame.bytes_below_saved_regs; | ||
1563 | + offset -= frame.bytes_below_hard_fp; | ||
1564 | |||
1565 | rtx addr = plus_constant (Pmode, ptr_reg, offset); | ||
1566 | rtx mem = gen_frame_mem (mode, addr); | ||
1567 | @@ -9563,9 +9559,7 @@ aarch64_process_components (sbitmap components, bool prologue_p) | ||
1568 | /* REGNO2 can be saved/restored in a pair with REGNO. */ | ||
1569 | rtx reg2 = gen_rtx_REG (mode, regno2); | ||
1570 | if (frame_pointer_needed) | ||
1571 | - offset2 -= frame.below_hard_fp_saved_regs_size; | ||
1572 | - else | ||
1573 | - offset2 += frame.bytes_below_saved_regs; | ||
1574 | + offset2 -= frame.bytes_below_hard_fp; | ||
1575 | rtx addr2 = plus_constant (Pmode, ptr_reg, offset2); | ||
1576 | rtx mem2 = gen_frame_mem (mode, addr2); | ||
1577 | rtx set2 = prologue_p ? gen_rtx_SET (mem2, reg2) | ||
1578 | @@ -9681,7 +9675,8 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
1579 | if (final_adjustment_p | ||
1580 | && known_eq (frame.below_hard_fp_saved_regs_size, 0)) | ||
1581 | { | ||
1582 | - poly_int64 lr_offset = frame.reg_offset[LR_REGNUM]; | ||
1583 | + poly_int64 lr_offset = (frame.reg_offset[LR_REGNUM] | ||
1584 | + - frame.bytes_below_saved_regs); | ||
1585 | if (known_ge (lr_offset, 0)) | ||
1586 | min_probe_threshold -= lr_offset.to_constant (); | ||
1587 | else | ||
1588 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
1589 | index 108a5731b0d..c8becb098c8 100644 | ||
1590 | --- a/gcc/config/aarch64/aarch64.h | ||
1591 | +++ b/gcc/config/aarch64/aarch64.h | ||
1592 | @@ -766,6 +766,9 @@ extern enum aarch64_processor aarch64_tune; | ||
1593 | #ifdef HAVE_POLY_INT_H | ||
1594 | struct GTY (()) aarch64_frame | ||
1595 | { | ||
1596 | + /* The offset from the bottom of the static frame (the bottom of the | ||
1597 | + outgoing arguments) of each register save slot, or -2 if no save is | ||
1598 | + needed. */ | ||
1599 | poly_int64 reg_offset[LAST_SAVED_REGNUM + 1]; | ||
1600 | |||
1601 | /* The number of extra stack bytes taken up by register varargs. | ||
1602 | -- | ||
1603 | 2.34.1 | ||
1604 | |||
1605 | |||
1606 | From 79faabda181d0d9fd29a3cf5726ba65bdee945b5 Mon Sep 17 00:00:00 2001 | ||
1607 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1608 | Date: Tue, 12 Sep 2023 16:07:17 +0100 | ||
1609 | Subject: [PATCH 12/19] aarch64: Simplify top of frame allocation | ||
1610 | |||
1611 | After previous patches, it no longer really makes sense to allocate | ||
1612 | the top of the frame in terms of varargs_and_saved_regs_size and | ||
1613 | saved_regs_and_above. | ||
1614 | |||
1615 | gcc/ | ||
1616 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Simplify | ||
1617 | the allocation of the top of the frame. | ||
1618 | --- | ||
1619 | gcc/config/aarch64/aarch64.cc | 23 ++++++++--------------- | ||
1620 | 1 file changed, 8 insertions(+), 15 deletions(-) | ||
1621 | |||
1622 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1623 | index af99807ef8a..31b00094c2a 100644 | ||
1624 | --- a/gcc/config/aarch64/aarch64.cc | ||
1625 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1626 | @@ -8586,23 +8586,16 @@ aarch64_layout_frame (void) | ||
1627 | |||
1628 | frame.saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
1629 | |||
1630 | - poly_int64 varargs_and_saved_regs_size | ||
1631 | - = frame.saved_regs_size + frame.saved_varargs_size; | ||
1632 | - | ||
1633 | - poly_int64 saved_regs_and_above | ||
1634 | - = aligned_upper_bound (varargs_and_saved_regs_size | ||
1635 | - + get_frame_size (), | ||
1636 | - STACK_BOUNDARY / BITS_PER_UNIT); | ||
1637 | - | ||
1638 | - frame.bytes_above_hard_fp | ||
1639 | - = saved_regs_and_above - frame.below_hard_fp_saved_regs_size; | ||
1640 | + offset += get_frame_size (); | ||
1641 | + offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
1642 | + auto top_of_locals = offset; | ||
1643 | |||
1644 | - /* Both these values are already aligned. */ | ||
1645 | - gcc_assert (multiple_p (frame.bytes_below_saved_regs, | ||
1646 | - STACK_BOUNDARY / BITS_PER_UNIT)); | ||
1647 | - frame.frame_size = saved_regs_and_above + frame.bytes_below_saved_regs; | ||
1648 | + offset += frame.saved_varargs_size; | ||
1649 | + gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT)); | ||
1650 | + frame.frame_size = offset; | ||
1651 | |||
1652 | - frame.bytes_above_locals = frame.saved_varargs_size; | ||
1653 | + frame.bytes_above_hard_fp = frame.frame_size - frame.bytes_below_hard_fp; | ||
1654 | + frame.bytes_above_locals = frame.frame_size - top_of_locals; | ||
1655 | |||
1656 | frame.initial_adjust = 0; | ||
1657 | frame.final_adjust = 0; | ||
1658 | -- | ||
1659 | 2.34.1 | ||
1660 | |||
1661 | |||
1662 | From 4e62049e403b141e6f916176160dac8cbd65fe47 Mon Sep 17 00:00:00 2001 | ||
1663 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1664 | Date: Tue, 12 Sep 2023 16:07:18 +0100 | ||
1665 | Subject: [PATCH 13/19] aarch64: Minor initial adjustment tweak | ||
1666 | |||
1667 | This patch just changes a calculation of initial_adjust | ||
1668 | to one that makes it slightly more obvious that the total | ||
1669 | adjustment is frame.frame_size. | ||
1670 | |||
1671 | gcc/ | ||
1672 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Tweak | ||
1673 | calculation of initial_adjust for frames in which all saves | ||
1674 | are SVE saves. | ||
1675 | --- | ||
1676 | gcc/config/aarch64/aarch64.cc | 5 ++--- | ||
1677 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
1678 | |||
1679 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1680 | index 31b00094c2a..1aa79da0673 100644 | ||
1681 | --- a/gcc/config/aarch64/aarch64.cc | ||
1682 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1683 | @@ -8675,11 +8675,10 @@ aarch64_layout_frame (void) | ||
1684 | { | ||
1685 | /* Frame in which all saves are SVE saves: | ||
1686 | |||
1687 | - sub sp, sp, hard_fp_offset + below_hard_fp_saved_regs_size | ||
1688 | + sub sp, sp, frame_size - bytes_below_saved_regs | ||
1689 | save SVE registers relative to SP | ||
1690 | sub sp, sp, bytes_below_saved_regs */ | ||
1691 | - frame.initial_adjust = (frame.bytes_above_hard_fp | ||
1692 | - + frame.below_hard_fp_saved_regs_size); | ||
1693 | + frame.initial_adjust = frame.frame_size - frame.bytes_below_saved_regs; | ||
1694 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
1695 | } | ||
1696 | else if (frame.bytes_above_hard_fp.is_constant (&const_above_fp) | ||
1697 | -- | ||
1698 | 2.34.1 | ||
1699 | |||
1700 | |||
1701 | From aaa1a0a5912d9e5d571e5f1c6f09ceac99544ab5 Mon Sep 17 00:00:00 2001 | ||
1702 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1703 | Date: Tue, 12 Sep 2023 16:07:18 +0100 | ||
1704 | Subject: [PATCH 14/19] aarch64: Tweak stack clash boundary condition | ||
1705 | |||
1706 | The AArch64 ABI says that, when stack clash protection is used, | ||
1707 | there can be a maximum of 1KiB of unprobed space at sp on entry | ||
1708 | to a function. Therefore, we need to probe when allocating | ||
1709 | >= guard_size - 1KiB of data (>= rather than >). This is what | ||
1710 | GCC does. | ||
1711 | |||
1712 | If an allocation is exactly guard_size bytes, it is enough to allocate | ||
1713 | those bytes and probe once at offset 1024. It isn't possible to use a | ||
1714 | single probe at any other offset: higher would conmplicate later code, | ||
1715 | by leaving more unprobed space than usual, while lower would risk | ||
1716 | leaving an entire page unprobed. For simplicity, the code probes all | ||
1717 | allocations at offset 1024. | ||
1718 | |||
1719 | Some register saves also act as probes. If we need to allocate | ||
1720 | more space below the last such register save probe, we need to | ||
1721 | probe the allocation if it is > 1KiB. Again, this allocation is | ||
1722 | then sometimes (but not always) probed at offset 1024. This sort of | ||
1723 | allocation is currently only used for outgoing arguments, which are | ||
1724 | rarely this big. | ||
1725 | |||
1726 | However, the code also probed if this final outgoing-arguments | ||
1727 | allocation was == 1KiB, rather than just > 1KiB. This isn't | ||
1728 | necessary, since the register save then probes at offset 1024 | ||
1729 | as required. Continuing to probe allocations of exactly 1KiB | ||
1730 | would complicate later patches. | ||
1731 | |||
1732 | gcc/ | ||
1733 | * config/aarch64/aarch64.cc (aarch64_allocate_and_probe_stack_space): | ||
1734 | Don't probe final allocations that are exactly 1KiB in size (after | ||
1735 | unprobed space above the final allocation has been deducted). | ||
1736 | |||
1737 | gcc/testsuite/ | ||
1738 | * gcc.target/aarch64/stack-check-prologue-17.c: New test. | ||
1739 | --- | ||
1740 | gcc/config/aarch64/aarch64.cc | 4 +- | ||
1741 | .../aarch64/stack-check-prologue-17.c | 55 +++++++++++++++++++ | ||
1742 | 2 files changed, 58 insertions(+), 1 deletion(-) | ||
1743 | create mode 100644 gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | ||
1744 | |||
1745 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1746 | index 1aa79da0673..5cad847977a 100644 | ||
1747 | --- a/gcc/config/aarch64/aarch64.cc | ||
1748 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1749 | @@ -9648,9 +9648,11 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
1750 | HOST_WIDE_INT guard_size | ||
1751 | = 1 << param_stack_clash_protection_guard_size; | ||
1752 | HOST_WIDE_INT guard_used_by_caller = STACK_CLASH_CALLER_GUARD; | ||
1753 | + HOST_WIDE_INT byte_sp_alignment = STACK_BOUNDARY / BITS_PER_UNIT; | ||
1754 | + gcc_assert (multiple_p (poly_size, byte_sp_alignment)); | ||
1755 | HOST_WIDE_INT min_probe_threshold | ||
1756 | = (final_adjustment_p | ||
1757 | - ? guard_used_by_caller | ||
1758 | + ? guard_used_by_caller + byte_sp_alignment | ||
1759 | : guard_size - guard_used_by_caller); | ||
1760 | /* When doing the final adjustment for the outgoing arguments, take into | ||
1761 | account any unprobed space there is above the current SP. There are | ||
1762 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | ||
1763 | new file mode 100644 | ||
1764 | index 00000000000..0d8a25d73a2 | ||
1765 | --- /dev/null | ||
1766 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | ||
1767 | @@ -0,0 +1,55 @@ | ||
1768 | +/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12" } */ | ||
1769 | +/* { dg-final { check-function-bodies "**" "" } } */ | ||
1770 | + | ||
1771 | +void f(int, ...); | ||
1772 | +void g(); | ||
1773 | + | ||
1774 | +/* | ||
1775 | +** test1: | ||
1776 | +** ... | ||
1777 | +** str x30, \[sp\] | ||
1778 | +** sub sp, sp, #1024 | ||
1779 | +** cbnz w0, .* | ||
1780 | +** bl g | ||
1781 | +** ... | ||
1782 | +*/ | ||
1783 | +int test1(int z) { | ||
1784 | + __uint128_t x = 0; | ||
1785 | + int y[0x400]; | ||
1786 | + if (z) | ||
1787 | + { | ||
1788 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
1789 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1790 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1791 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1792 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x); | ||
1793 | + } | ||
1794 | + g(); | ||
1795 | + return 1; | ||
1796 | +} | ||
1797 | + | ||
1798 | +/* | ||
1799 | +** test2: | ||
1800 | +** ... | ||
1801 | +** str x30, \[sp\] | ||
1802 | +** sub sp, sp, #1040 | ||
1803 | +** str xzr, \[sp\] | ||
1804 | +** cbnz w0, .* | ||
1805 | +** bl g | ||
1806 | +** ... | ||
1807 | +*/ | ||
1808 | +int test2(int z) { | ||
1809 | + __uint128_t x = 0; | ||
1810 | + int y[0x400]; | ||
1811 | + if (z) | ||
1812 | + { | ||
1813 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
1814 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1815 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1816 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1817 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
1818 | + x); | ||
1819 | + } | ||
1820 | + g(); | ||
1821 | + return 1; | ||
1822 | +} | ||
1823 | -- | ||
1824 | 2.34.1 | ||
1825 | |||
1826 | |||
1827 | From 8433953434a7b58c0923140d39eb3c5988c1d097 Mon Sep 17 00:00:00 2001 | ||
1828 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
1829 | Date: Tue, 12 Sep 2023 16:07:19 +0100 | ||
1830 | Subject: [PATCH 15/19] aarch64: Put LR save probe in first 16 bytes | ||
1831 | |||
1832 | -fstack-clash-protection uses the save of LR as a probe for the next | ||
1833 | allocation. The next allocation could be: | ||
1834 | |||
1835 | * another part of the static frame, e.g. when allocating SVE save slots | ||
1836 | or outgoing arguments | ||
1837 | |||
1838 | * an alloca in the same function | ||
1839 | |||
1840 | * an allocation made by a callee function | ||
1841 | |||
1842 | However, when -fomit-frame-pointer is used, the LR save slot is placed | ||
1843 | above the other GPR save slots. It could therefore be up to 80 bytes | ||
1844 | above the base of the GPR save area (which is also the hard fp address). | ||
1845 | |||
1846 | aarch64_allocate_and_probe_stack_space took this into account when | ||
1847 | deciding how much subsequent space could be allocated without needing | ||
1848 | a probe. However, it interacted badly with: | ||
1849 | |||
1850 | /* If doing a small final adjustment, we always probe at offset 0. | ||
1851 | This is done to avoid issues when LR is not at position 0 or when | ||
1852 | the final adjustment is smaller than the probing offset. */ | ||
1853 | else if (final_adjustment_p && rounded_size == 0) | ||
1854 | residual_probe_offset = 0; | ||
1855 | |||
1856 | which forces any allocation that is smaller than the guard page size | ||
1857 | to be probed at offset 0 rather than the usual offset 1024. It was | ||
1858 | therefore possible to construct cases in which we had: | ||
1859 | |||
1860 | * a probe using LR at SP + 80 bytes (or some other value >= 16) | ||
1861 | * an allocation of the guard page size - 16 bytes | ||
1862 | * a probe at SP + 0 | ||
1863 | |||
1864 | which allocates guard page size + 64 consecutive unprobed bytes. | ||
1865 | |||
1866 | This patch requires the LR probe to be in the first 16 bytes of the | ||
1867 | save area when stack clash protection is active. Doing it | ||
1868 | unconditionally would cause code-quality regressions. | ||
1869 | |||
1870 | Putting LR before other registers prevents push/pop allocation | ||
1871 | when shadow call stacks are enabled, since LR is restored | ||
1872 | separately from the other callee-saved registers. | ||
1873 | |||
1874 | The new comment doesn't say that the probe register is required | ||
1875 | to be LR, since a later patch removes that restriction. | ||
1876 | |||
1877 | gcc/ | ||
1878 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Ensure that | ||
1879 | the LR save slot is in the first 16 bytes of the register save area. | ||
1880 | Only form STP/LDP push/pop candidates if both registers are valid. | ||
1881 | (aarch64_allocate_and_probe_stack_space): Remove workaround for | ||
1882 | when LR was not in the first 16 bytes. | ||
1883 | |||
1884 | gcc/testsuite/ | ||
1885 | * gcc.target/aarch64/stack-check-prologue-18.c: New test. | ||
1886 | * gcc.target/aarch64/stack-check-prologue-19.c: Likewise. | ||
1887 | * gcc.target/aarch64/stack-check-prologue-20.c: Likewise. | ||
1888 | --- | ||
1889 | gcc/config/aarch64/aarch64.cc | 72 ++++++------- | ||
1890 | .../aarch64/stack-check-prologue-18.c | 100 ++++++++++++++++++ | ||
1891 | .../aarch64/stack-check-prologue-19.c | 100 ++++++++++++++++++ | ||
1892 | .../aarch64/stack-check-prologue-20.c | 3 + | ||
1893 | 4 files changed, 233 insertions(+), 42 deletions(-) | ||
1894 | create mode 100644 gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | ||
1895 | create mode 100644 gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c | ||
1896 | create mode 100644 gcc/testsuite/gcc.target/aarch64/stack-check-prologue-20.c | ||
1897 | |||
1898 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
1899 | index 5cad847977a..a765f92329d 100644 | ||
1900 | --- a/gcc/config/aarch64/aarch64.cc | ||
1901 | +++ b/gcc/config/aarch64/aarch64.cc | ||
1902 | @@ -8534,26 +8534,34 @@ aarch64_layout_frame (void) | ||
1903 | bool saves_below_hard_fp_p | ||
1904 | = maybe_ne (frame.below_hard_fp_saved_regs_size, 0); | ||
1905 | frame.bytes_below_hard_fp = offset; | ||
1906 | + | ||
1907 | + auto allocate_gpr_slot = [&](unsigned int regno) | ||
1908 | + { | ||
1909 | + frame.reg_offset[regno] = offset; | ||
1910 | + if (frame.wb_push_candidate1 == INVALID_REGNUM) | ||
1911 | + frame.wb_push_candidate1 = regno; | ||
1912 | + else if (frame.wb_push_candidate2 == INVALID_REGNUM) | ||
1913 | + frame.wb_push_candidate2 = regno; | ||
1914 | + offset += UNITS_PER_WORD; | ||
1915 | + }; | ||
1916 | + | ||
1917 | if (frame.emit_frame_chain) | ||
1918 | { | ||
1919 | /* FP and LR are placed in the linkage record. */ | ||
1920 | - frame.reg_offset[R29_REGNUM] = offset; | ||
1921 | - frame.wb_push_candidate1 = R29_REGNUM; | ||
1922 | - frame.reg_offset[R30_REGNUM] = offset + UNITS_PER_WORD; | ||
1923 | - frame.wb_push_candidate2 = R30_REGNUM; | ||
1924 | - offset += 2 * UNITS_PER_WORD; | ||
1925 | + allocate_gpr_slot (R29_REGNUM); | ||
1926 | + allocate_gpr_slot (R30_REGNUM); | ||
1927 | } | ||
1928 | + else if (flag_stack_clash_protection | ||
1929 | + && known_eq (frame.reg_offset[R30_REGNUM], SLOT_REQUIRED)) | ||
1930 | + /* Put the LR save slot first, since it makes a good choice of probe | ||
1931 | + for stack clash purposes. The idea is that the link register usually | ||
1932 | + has to be saved before a call anyway, and so we lose little by | ||
1933 | + stopping it from being individually shrink-wrapped. */ | ||
1934 | + allocate_gpr_slot (R30_REGNUM); | ||
1935 | |||
1936 | for (regno = R0_REGNUM; regno <= R30_REGNUM; regno++) | ||
1937 | if (known_eq (frame.reg_offset[regno], SLOT_REQUIRED)) | ||
1938 | - { | ||
1939 | - frame.reg_offset[regno] = offset; | ||
1940 | - if (frame.wb_push_candidate1 == INVALID_REGNUM) | ||
1941 | - frame.wb_push_candidate1 = regno; | ||
1942 | - else if (frame.wb_push_candidate2 == INVALID_REGNUM) | ||
1943 | - frame.wb_push_candidate2 = regno; | ||
1944 | - offset += UNITS_PER_WORD; | ||
1945 | - } | ||
1946 | + allocate_gpr_slot (regno); | ||
1947 | |||
1948 | poly_int64 max_int_offset = offset; | ||
1949 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
1950 | @@ -8631,10 +8639,13 @@ aarch64_layout_frame (void) | ||
1951 | max_push_offset to 0, because no registers are popped at this time, | ||
1952 | so callee_adjust cannot be adjusted. */ | ||
1953 | HOST_WIDE_INT max_push_offset = 0; | ||
1954 | - if (frame.wb_pop_candidate2 != INVALID_REGNUM) | ||
1955 | - max_push_offset = 512; | ||
1956 | - else if (frame.wb_pop_candidate1 != INVALID_REGNUM) | ||
1957 | - max_push_offset = 256; | ||
1958 | + if (frame.wb_pop_candidate1 != INVALID_REGNUM) | ||
1959 | + { | ||
1960 | + if (frame.wb_pop_candidate2 != INVALID_REGNUM) | ||
1961 | + max_push_offset = 512; | ||
1962 | + else | ||
1963 | + max_push_offset = 256; | ||
1964 | + } | ||
1965 | |||
1966 | HOST_WIDE_INT const_size, const_below_saved_regs, const_above_fp; | ||
1967 | HOST_WIDE_INT const_saved_regs_size; | ||
1968 | @@ -9654,29 +9665,6 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
1969 | = (final_adjustment_p | ||
1970 | ? guard_used_by_caller + byte_sp_alignment | ||
1971 | : guard_size - guard_used_by_caller); | ||
1972 | - /* When doing the final adjustment for the outgoing arguments, take into | ||
1973 | - account any unprobed space there is above the current SP. There are | ||
1974 | - two cases: | ||
1975 | - | ||
1976 | - - When saving SVE registers below the hard frame pointer, we force | ||
1977 | - the lowest save to take place in the prologue before doing the final | ||
1978 | - adjustment (i.e. we don't allow the save to be shrink-wrapped). | ||
1979 | - This acts as a probe at SP, so there is no unprobed space. | ||
1980 | - | ||
1981 | - - When there are no SVE register saves, we use the store of the link | ||
1982 | - register as a probe. We can't assume that LR was saved at position 0 | ||
1983 | - though, so treat any space below it as unprobed. */ | ||
1984 | - if (final_adjustment_p | ||
1985 | - && known_eq (frame.below_hard_fp_saved_regs_size, 0)) | ||
1986 | - { | ||
1987 | - poly_int64 lr_offset = (frame.reg_offset[LR_REGNUM] | ||
1988 | - - frame.bytes_below_saved_regs); | ||
1989 | - if (known_ge (lr_offset, 0)) | ||
1990 | - min_probe_threshold -= lr_offset.to_constant (); | ||
1991 | - else | ||
1992 | - gcc_assert (!flag_stack_clash_protection || known_eq (poly_size, 0)); | ||
1993 | - } | ||
1994 | - | ||
1995 | poly_int64 frame_size = frame.frame_size; | ||
1996 | |||
1997 | /* We should always have a positive probe threshold. */ | ||
1998 | @@ -9856,8 +9844,8 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
1999 | if (final_adjustment_p && rounded_size != 0) | ||
2000 | min_probe_threshold = 0; | ||
2001 | /* If doing a small final adjustment, we always probe at offset 0. | ||
2002 | - This is done to avoid issues when LR is not at position 0 or when | ||
2003 | - the final adjustment is smaller than the probing offset. */ | ||
2004 | + This is done to avoid issues when the final adjustment is smaller | ||
2005 | + than the probing offset. */ | ||
2006 | else if (final_adjustment_p && rounded_size == 0) | ||
2007 | residual_probe_offset = 0; | ||
2008 | |||
2009 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | ||
2010 | new file mode 100644 | ||
2011 | index 00000000000..82447d20fff | ||
2012 | --- /dev/null | ||
2013 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | ||
2014 | @@ -0,0 +1,100 @@ | ||
2015 | +/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12" } */ | ||
2016 | +/* { dg-final { check-function-bodies "**" "" } } */ | ||
2017 | + | ||
2018 | +void f(int, ...); | ||
2019 | +void g(); | ||
2020 | + | ||
2021 | +/* | ||
2022 | +** test1: | ||
2023 | +** ... | ||
2024 | +** str x30, \[sp\] | ||
2025 | +** sub sp, sp, #4064 | ||
2026 | +** str xzr, \[sp\] | ||
2027 | +** cbnz w0, .* | ||
2028 | +** bl g | ||
2029 | +** ... | ||
2030 | +** str x26, \[sp, #?4128\] | ||
2031 | +** ... | ||
2032 | +*/ | ||
2033 | +int test1(int z) { | ||
2034 | + __uint128_t x = 0; | ||
2035 | + int y[0x400]; | ||
2036 | + if (z) | ||
2037 | + { | ||
2038 | + asm volatile ("" ::: | ||
2039 | + "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26"); | ||
2040 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
2041 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2042 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2043 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2044 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2045 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2046 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2047 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2048 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2049 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2050 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2051 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2052 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2053 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2054 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2055 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2056 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x); | ||
2057 | + } | ||
2058 | + g(); | ||
2059 | + return 1; | ||
2060 | +} | ||
2061 | + | ||
2062 | +/* | ||
2063 | +** test2: | ||
2064 | +** ... | ||
2065 | +** str x30, \[sp\] | ||
2066 | +** sub sp, sp, #1040 | ||
2067 | +** str xzr, \[sp\] | ||
2068 | +** cbnz w0, .* | ||
2069 | +** bl g | ||
2070 | +** ... | ||
2071 | +*/ | ||
2072 | +int test2(int z) { | ||
2073 | + __uint128_t x = 0; | ||
2074 | + int y[0x400]; | ||
2075 | + if (z) | ||
2076 | + { | ||
2077 | + asm volatile ("" ::: | ||
2078 | + "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26"); | ||
2079 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
2080 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2081 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2082 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2083 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2084 | + x); | ||
2085 | + } | ||
2086 | + g(); | ||
2087 | + return 1; | ||
2088 | +} | ||
2089 | + | ||
2090 | +/* | ||
2091 | +** test3: | ||
2092 | +** ... | ||
2093 | +** str x30, \[sp\] | ||
2094 | +** sub sp, sp, #1024 | ||
2095 | +** cbnz w0, .* | ||
2096 | +** bl g | ||
2097 | +** ... | ||
2098 | +*/ | ||
2099 | +int test3(int z) { | ||
2100 | + __uint128_t x = 0; | ||
2101 | + int y[0x400]; | ||
2102 | + if (z) | ||
2103 | + { | ||
2104 | + asm volatile ("" ::: | ||
2105 | + "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26"); | ||
2106 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
2107 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2108 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2109 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2110 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x); | ||
2111 | + } | ||
2112 | + g(); | ||
2113 | + return 1; | ||
2114 | +} | ||
2115 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c | ||
2116 | new file mode 100644 | ||
2117 | index 00000000000..73ac3e4e4eb | ||
2118 | --- /dev/null | ||
2119 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c | ||
2120 | @@ -0,0 +1,100 @@ | ||
2121 | +/* { dg-options "-O2 -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12 -fsanitize=shadow-call-stack -ffixed-x18" } */ | ||
2122 | +/* { dg-final { check-function-bodies "**" "" } } */ | ||
2123 | + | ||
2124 | +void f(int, ...); | ||
2125 | +void g(); | ||
2126 | + | ||
2127 | +/* | ||
2128 | +** test1: | ||
2129 | +** ... | ||
2130 | +** str x30, \[sp\] | ||
2131 | +** sub sp, sp, #4064 | ||
2132 | +** str xzr, \[sp\] | ||
2133 | +** cbnz w0, .* | ||
2134 | +** bl g | ||
2135 | +** ... | ||
2136 | +** str x26, \[sp, #?4128\] | ||
2137 | +** ... | ||
2138 | +*/ | ||
2139 | +int test1(int z) { | ||
2140 | + __uint128_t x = 0; | ||
2141 | + int y[0x400]; | ||
2142 | + if (z) | ||
2143 | + { | ||
2144 | + asm volatile ("" ::: | ||
2145 | + "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26"); | ||
2146 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
2147 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2148 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2149 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2150 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2151 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2152 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2153 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2154 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2155 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2156 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2157 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2158 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2159 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2160 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2161 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2162 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x); | ||
2163 | + } | ||
2164 | + g(); | ||
2165 | + return 1; | ||
2166 | +} | ||
2167 | + | ||
2168 | +/* | ||
2169 | +** test2: | ||
2170 | +** ... | ||
2171 | +** str x30, \[sp\] | ||
2172 | +** sub sp, sp, #1040 | ||
2173 | +** str xzr, \[sp\] | ||
2174 | +** cbnz w0, .* | ||
2175 | +** bl g | ||
2176 | +** ... | ||
2177 | +*/ | ||
2178 | +int test2(int z) { | ||
2179 | + __uint128_t x = 0; | ||
2180 | + int y[0x400]; | ||
2181 | + if (z) | ||
2182 | + { | ||
2183 | + asm volatile ("" ::: | ||
2184 | + "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26"); | ||
2185 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
2186 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2187 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2188 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2189 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2190 | + x); | ||
2191 | + } | ||
2192 | + g(); | ||
2193 | + return 1; | ||
2194 | +} | ||
2195 | + | ||
2196 | +/* | ||
2197 | +** test3: | ||
2198 | +** ... | ||
2199 | +** str x30, \[sp\] | ||
2200 | +** sub sp, sp, #1024 | ||
2201 | +** cbnz w0, .* | ||
2202 | +** bl g | ||
2203 | +** ... | ||
2204 | +*/ | ||
2205 | +int test3(int z) { | ||
2206 | + __uint128_t x = 0; | ||
2207 | + int y[0x400]; | ||
2208 | + if (z) | ||
2209 | + { | ||
2210 | + asm volatile ("" ::: | ||
2211 | + "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26"); | ||
2212 | + f(0, 0, 0, 0, 0, 0, 0, &y, | ||
2213 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2214 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2215 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, | ||
2216 | + x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x); | ||
2217 | + } | ||
2218 | + g(); | ||
2219 | + return 1; | ||
2220 | +} | ||
2221 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-20.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-20.c | ||
2222 | new file mode 100644 | ||
2223 | index 00000000000..690aae8dfd5 | ||
2224 | --- /dev/null | ||
2225 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-20.c | ||
2226 | @@ -0,0 +1,3 @@ | ||
2227 | +/* { dg-options "-O2 -fstack-protector-all -fstack-clash-protection -fomit-frame-pointer --param stack-clash-protection-guard-size=12 -fsanitize=shadow-call-stack -ffixed-x18" } */ | ||
2228 | + | ||
2229 | +#include "stack-check-prologue-19.c" | ||
2230 | -- | ||
2231 | 2.34.1 | ||
2232 | |||
2233 | |||
2234 | From eea1759073e09dd1aefbc9a881601ab1eebfdd18 Mon Sep 17 00:00:00 2001 | ||
2235 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
2236 | Date: Tue, 12 Sep 2023 16:07:19 +0100 | ||
2237 | Subject: [PATCH 16/19] aarch64: Simplify probe of final frame allocation | ||
2238 | |||
2239 | Previous patches ensured that the final frame allocation only needs | ||
2240 | a probe when the size is strictly greater than 1KiB. It's therefore | ||
2241 | safe to use the normal 1024 probe offset in all cases. | ||
2242 | |||
2243 | The main motivation for doing this is to simplify the code and | ||
2244 | remove the number of special cases. | ||
2245 | |||
2246 | gcc/ | ||
2247 | * config/aarch64/aarch64.cc (aarch64_allocate_and_probe_stack_space): | ||
2248 | Always probe the residual allocation at offset 1024, asserting | ||
2249 | that that is in range. | ||
2250 | |||
2251 | gcc/testsuite/ | ||
2252 | * gcc.target/aarch64/stack-check-prologue-17.c: Expect the probe | ||
2253 | to be at offset 1024 rather than offset 0. | ||
2254 | * gcc.target/aarch64/stack-check-prologue-18.c: Likewise. | ||
2255 | * gcc.target/aarch64/stack-check-prologue-19.c: Likewise. | ||
2256 | --- | ||
2257 | gcc/config/aarch64/aarch64.cc | 12 ++++-------- | ||
2258 | .../gcc.target/aarch64/stack-check-prologue-17.c | 2 +- | ||
2259 | .../gcc.target/aarch64/stack-check-prologue-18.c | 4 ++-- | ||
2260 | .../gcc.target/aarch64/stack-check-prologue-19.c | 4 ++-- | ||
2261 | 4 files changed, 9 insertions(+), 13 deletions(-) | ||
2262 | |||
2263 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
2264 | index a765f92329d..37809a306f7 100644 | ||
2265 | --- a/gcc/config/aarch64/aarch64.cc | ||
2266 | +++ b/gcc/config/aarch64/aarch64.cc | ||
2267 | @@ -9838,16 +9838,12 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
2268 | are still safe. */ | ||
2269 | if (residual) | ||
2270 | { | ||
2271 | - HOST_WIDE_INT residual_probe_offset = guard_used_by_caller; | ||
2272 | + gcc_assert (guard_used_by_caller + byte_sp_alignment <= size); | ||
2273 | + | ||
2274 | /* If we're doing final adjustments, and we've done any full page | ||
2275 | allocations then any residual needs to be probed. */ | ||
2276 | if (final_adjustment_p && rounded_size != 0) | ||
2277 | min_probe_threshold = 0; | ||
2278 | - /* If doing a small final adjustment, we always probe at offset 0. | ||
2279 | - This is done to avoid issues when the final adjustment is smaller | ||
2280 | - than the probing offset. */ | ||
2281 | - else if (final_adjustment_p && rounded_size == 0) | ||
2282 | - residual_probe_offset = 0; | ||
2283 | |||
2284 | aarch64_sub_sp (temp1, temp2, residual, frame_related_p); | ||
2285 | if (residual >= min_probe_threshold) | ||
2286 | @@ -9858,8 +9854,8 @@ aarch64_allocate_and_probe_stack_space (rtx temp1, rtx temp2, | ||
2287 | HOST_WIDE_INT_PRINT_DEC " bytes, probing will be required." | ||
2288 | "\n", residual); | ||
2289 | |||
2290 | - emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx, | ||
2291 | - residual_probe_offset)); | ||
2292 | + emit_stack_probe (plus_constant (Pmode, stack_pointer_rtx, | ||
2293 | + guard_used_by_caller)); | ||
2294 | emit_insn (gen_blockage ()); | ||
2295 | } | ||
2296 | } | ||
2297 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | ||
2298 | index 0d8a25d73a2..f0ec1389771 100644 | ||
2299 | --- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | ||
2300 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-17.c | ||
2301 | @@ -33,7 +33,7 @@ int test1(int z) { | ||
2302 | ** ... | ||
2303 | ** str x30, \[sp\] | ||
2304 | ** sub sp, sp, #1040 | ||
2305 | -** str xzr, \[sp\] | ||
2306 | +** str xzr, \[sp, #?1024\] | ||
2307 | ** cbnz w0, .* | ||
2308 | ** bl g | ||
2309 | ** ... | ||
2310 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | ||
2311 | index 82447d20fff..6383bec5ebc 100644 | ||
2312 | --- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | ||
2313 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-18.c | ||
2314 | @@ -9,7 +9,7 @@ void g(); | ||
2315 | ** ... | ||
2316 | ** str x30, \[sp\] | ||
2317 | ** sub sp, sp, #4064 | ||
2318 | -** str xzr, \[sp\] | ||
2319 | +** str xzr, \[sp, #?1024\] | ||
2320 | ** cbnz w0, .* | ||
2321 | ** bl g | ||
2322 | ** ... | ||
2323 | @@ -50,7 +50,7 @@ int test1(int z) { | ||
2324 | ** ... | ||
2325 | ** str x30, \[sp\] | ||
2326 | ** sub sp, sp, #1040 | ||
2327 | -** str xzr, \[sp\] | ||
2328 | +** str xzr, \[sp, #?1024\] | ||
2329 | ** cbnz w0, .* | ||
2330 | ** bl g | ||
2331 | ** ... | ||
2332 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c | ||
2333 | index 73ac3e4e4eb..562039b5e9b 100644 | ||
2334 | --- a/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c | ||
2335 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-check-prologue-19.c | ||
2336 | @@ -9,7 +9,7 @@ void g(); | ||
2337 | ** ... | ||
2338 | ** str x30, \[sp\] | ||
2339 | ** sub sp, sp, #4064 | ||
2340 | -** str xzr, \[sp\] | ||
2341 | +** str xzr, \[sp, #?1024\] | ||
2342 | ** cbnz w0, .* | ||
2343 | ** bl g | ||
2344 | ** ... | ||
2345 | @@ -50,7 +50,7 @@ int test1(int z) { | ||
2346 | ** ... | ||
2347 | ** str x30, \[sp\] | ||
2348 | ** sub sp, sp, #1040 | ||
2349 | -** str xzr, \[sp\] | ||
2350 | +** str xzr, \[sp, #?1024\] | ||
2351 | ** cbnz w0, .* | ||
2352 | ** bl g | ||
2353 | ** ... | ||
2354 | -- | ||
2355 | 2.34.1 | ||
2356 | |||
2357 | |||
2358 | From 96d85187c3b9c9a7efc2fd698c3d452e80d8aa47 Mon Sep 17 00:00:00 2001 | ||
2359 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
2360 | Date: Tue, 12 Sep 2023 16:07:20 +0100 | ||
2361 | Subject: [PATCH 17/19] aarch64: Explicitly record probe registers in frame | ||
2362 | info | ||
2363 | |||
2364 | The stack frame is currently divided into three areas: | ||
2365 | |||
2366 | A: the area above the hard frame pointer | ||
2367 | B: the SVE saves below the hard frame pointer | ||
2368 | C: the outgoing arguments | ||
2369 | |||
2370 | If the stack frame is allocated in one chunk, the allocation needs a | ||
2371 | probe if the frame size is >= guard_size - 1KiB. In addition, if the | ||
2372 | function is not a leaf function, it must probe an address no more than | ||
2373 | 1KiB above the outgoing SP. We ensured the second condition by | ||
2374 | |||
2375 | (1) using single-chunk allocations for non-leaf functions only if | ||
2376 | the link register save slot is within 512 bytes of the bottom | ||
2377 | of the frame; and | ||
2378 | |||
2379 | (2) using the link register save as a probe (meaning, for instance, | ||
2380 | that it can't be individually shrink wrapped) | ||
2381 | |||
2382 | If instead the stack is allocated in multiple chunks, then: | ||
2383 | |||
2384 | * an allocation involving only the outgoing arguments (C above) requires | ||
2385 | a probe if the allocation size is > 1KiB | ||
2386 | |||
2387 | * any other allocation requires a probe if the allocation size | ||
2388 | is >= guard_size - 1KiB | ||
2389 | |||
2390 | * second and subsequent allocations require the previous allocation | ||
2391 | to probe at the bottom of the allocated area, regardless of the size | ||
2392 | of that previous allocation | ||
2393 | |||
2394 | The final point means that, unlike for single allocations, | ||
2395 | it can be necessary to have both a non-SVE register probe and | ||
2396 | an SVE register probe. For example: | ||
2397 | |||
2398 | * allocate A, probe using a non-SVE register save | ||
2399 | * allocate B, probe using an SVE register save | ||
2400 | * allocate C | ||
2401 | |||
2402 | The non-SVE register used in this case was again the link register. | ||
2403 | It was previously used even if the link register save slot was some | ||
2404 | bytes above the bottom of the non-SVE register saves, but an earlier | ||
2405 | patch avoided that by putting the link register save slot first. | ||
2406 | |||
2407 | As a belt-and-braces fix, this patch explicitly records which | ||
2408 | probe registers we're using and allows the non-SVE probe to be | ||
2409 | whichever register comes first (as for SVE). | ||
2410 | |||
2411 | The patch also avoids unnecessary probes in sve/pcs/stack_clash_3.c. | ||
2412 | |||
2413 | gcc/ | ||
2414 | * config/aarch64/aarch64.h (aarch64_frame::sve_save_and_probe) | ||
2415 | (aarch64_frame::hard_fp_save_and_probe): New fields. | ||
2416 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Initialize them. | ||
2417 | Rather than asserting that a leaf function saves LR, instead assert | ||
2418 | that a leaf function saves something. | ||
2419 | (aarch64_get_separate_components): Prevent the chosen probe | ||
2420 | registers from being individually shrink-wrapped. | ||
2421 | (aarch64_allocate_and_probe_stack_space): Remove workaround for | ||
2422 | probe registers that aren't at the bottom of the previous allocation. | ||
2423 | |||
2424 | gcc/testsuite/ | ||
2425 | * gcc.target/aarch64/sve/pcs/stack_clash_3.c: Avoid redundant probes. | ||
2426 | --- | ||
2427 | gcc/config/aarch64/aarch64.cc | 68 +++++++++++++++---- | ||
2428 | gcc/config/aarch64/aarch64.h | 8 +++ | ||
2429 | .../aarch64/sve/pcs/stack_clash_3.c | 6 +- | ||
2430 | 3 files changed, 64 insertions(+), 18 deletions(-) | ||
2431 | |||
2432 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
2433 | index 37809a306f7..6c59c39a639 100644 | ||
2434 | --- a/gcc/config/aarch64/aarch64.cc | ||
2435 | +++ b/gcc/config/aarch64/aarch64.cc | ||
2436 | @@ -8471,15 +8471,11 @@ aarch64_layout_frame (void) | ||
2437 | && !crtl->abi->clobbers_full_reg_p (regno)) | ||
2438 | frame.reg_offset[regno] = SLOT_REQUIRED; | ||
2439 | |||
2440 | - /* With stack-clash, LR must be saved in non-leaf functions. The saving of | ||
2441 | - LR counts as an implicit probe which allows us to maintain the invariant | ||
2442 | - described in the comment at expand_prologue. */ | ||
2443 | - gcc_assert (crtl->is_leaf | ||
2444 | - || maybe_ne (frame.reg_offset[R30_REGNUM], SLOT_NOT_REQUIRED)); | ||
2445 | |||
2446 | poly_int64 offset = crtl->outgoing_args_size; | ||
2447 | gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT)); | ||
2448 | frame.bytes_below_saved_regs = offset; | ||
2449 | + frame.sve_save_and_probe = INVALID_REGNUM; | ||
2450 | |||
2451 | /* Now assign stack slots for the registers. Start with the predicate | ||
2452 | registers, since predicate LDR and STR have a relatively small | ||
2453 | @@ -8487,6 +8483,8 @@ aarch64_layout_frame (void) | ||
2454 | for (regno = P0_REGNUM; regno <= P15_REGNUM; regno++) | ||
2455 | if (known_eq (frame.reg_offset[regno], SLOT_REQUIRED)) | ||
2456 | { | ||
2457 | + if (frame.sve_save_and_probe == INVALID_REGNUM) | ||
2458 | + frame.sve_save_and_probe = regno; | ||
2459 | frame.reg_offset[regno] = offset; | ||
2460 | offset += BYTES_PER_SVE_PRED; | ||
2461 | } | ||
2462 | @@ -8524,6 +8522,8 @@ aarch64_layout_frame (void) | ||
2463 | for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++) | ||
2464 | if (known_eq (frame.reg_offset[regno], SLOT_REQUIRED)) | ||
2465 | { | ||
2466 | + if (frame.sve_save_and_probe == INVALID_REGNUM) | ||
2467 | + frame.sve_save_and_probe = regno; | ||
2468 | frame.reg_offset[regno] = offset; | ||
2469 | offset += vector_save_size; | ||
2470 | } | ||
2471 | @@ -8533,10 +8533,18 @@ aarch64_layout_frame (void) | ||
2472 | frame.below_hard_fp_saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
2473 | bool saves_below_hard_fp_p | ||
2474 | = maybe_ne (frame.below_hard_fp_saved_regs_size, 0); | ||
2475 | + gcc_assert (!saves_below_hard_fp_p | ||
2476 | + || (frame.sve_save_and_probe != INVALID_REGNUM | ||
2477 | + && known_eq (frame.reg_offset[frame.sve_save_and_probe], | ||
2478 | + frame.bytes_below_saved_regs))); | ||
2479 | + | ||
2480 | frame.bytes_below_hard_fp = offset; | ||
2481 | + frame.hard_fp_save_and_probe = INVALID_REGNUM; | ||
2482 | |||
2483 | auto allocate_gpr_slot = [&](unsigned int regno) | ||
2484 | { | ||
2485 | + if (frame.hard_fp_save_and_probe == INVALID_REGNUM) | ||
2486 | + frame.hard_fp_save_and_probe = regno; | ||
2487 | frame.reg_offset[regno] = offset; | ||
2488 | if (frame.wb_push_candidate1 == INVALID_REGNUM) | ||
2489 | frame.wb_push_candidate1 = regno; | ||
2490 | @@ -8570,6 +8578,8 @@ aarch64_layout_frame (void) | ||
2491 | for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++) | ||
2492 | if (known_eq (frame.reg_offset[regno], SLOT_REQUIRED)) | ||
2493 | { | ||
2494 | + if (frame.hard_fp_save_and_probe == INVALID_REGNUM) | ||
2495 | + frame.hard_fp_save_and_probe = regno; | ||
2496 | /* If there is an alignment gap between integer and fp callee-saves, | ||
2497 | allocate the last fp register to it if possible. */ | ||
2498 | if (regno == last_fp_reg | ||
2499 | @@ -8593,6 +8603,17 @@ aarch64_layout_frame (void) | ||
2500 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2501 | |||
2502 | frame.saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
2503 | + gcc_assert (known_eq (frame.saved_regs_size, | ||
2504 | + frame.below_hard_fp_saved_regs_size) | ||
2505 | + || (frame.hard_fp_save_and_probe != INVALID_REGNUM | ||
2506 | + && known_eq (frame.reg_offset[frame.hard_fp_save_and_probe], | ||
2507 | + frame.bytes_below_hard_fp))); | ||
2508 | + | ||
2509 | + /* With stack-clash, a register must be saved in non-leaf functions. | ||
2510 | + The saving of the bottommost register counts as an implicit probe, | ||
2511 | + which allows us to maintain the invariant described in the comment | ||
2512 | + at expand_prologue. */ | ||
2513 | + gcc_assert (crtl->is_leaf || maybe_ne (frame.saved_regs_size, 0)); | ||
2514 | |||
2515 | offset += get_frame_size (); | ||
2516 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2517 | @@ -8723,6 +8744,25 @@ aarch64_layout_frame (void) | ||
2518 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
2519 | } | ||
2520 | |||
2521 | + /* The frame is allocated in pieces, with each non-final piece | ||
2522 | + including a register save at offset 0 that acts as a probe for | ||
2523 | + the following piece. In addition, the save of the bottommost register | ||
2524 | + acts as a probe for callees and allocas. Roll back any probes that | ||
2525 | + aren't needed. | ||
2526 | + | ||
2527 | + A probe isn't needed if it is associated with the final allocation | ||
2528 | + (including callees and allocas) that happens before the epilogue is | ||
2529 | + executed. */ | ||
2530 | + if (crtl->is_leaf | ||
2531 | + && !cfun->calls_alloca | ||
2532 | + && known_eq (frame.final_adjust, 0)) | ||
2533 | + { | ||
2534 | + if (maybe_ne (frame.sve_callee_adjust, 0)) | ||
2535 | + frame.sve_save_and_probe = INVALID_REGNUM; | ||
2536 | + else | ||
2537 | + frame.hard_fp_save_and_probe = INVALID_REGNUM; | ||
2538 | + } | ||
2539 | + | ||
2540 | /* Make sure the individual adjustments add up to the full frame size. */ | ||
2541 | gcc_assert (known_eq (frame.initial_adjust | ||
2542 | + frame.callee_adjust | ||
2543 | @@ -9354,13 +9394,6 @@ aarch64_get_separate_components (void) | ||
2544 | |||
2545 | poly_int64 offset = frame.reg_offset[regno]; | ||
2546 | |||
2547 | - /* If the register is saved in the first SVE save slot, we use | ||
2548 | - it as a stack probe for -fstack-clash-protection. */ | ||
2549 | - if (flag_stack_clash_protection | ||
2550 | - && maybe_ne (frame.below_hard_fp_saved_regs_size, 0) | ||
2551 | - && known_eq (offset, frame.bytes_below_saved_regs)) | ||
2552 | - continue; | ||
2553 | - | ||
2554 | /* Get the offset relative to the register we'll use. */ | ||
2555 | if (frame_pointer_needed) | ||
2556 | offset -= frame.bytes_below_hard_fp; | ||
2557 | @@ -9395,6 +9428,13 @@ aarch64_get_separate_components (void) | ||
2558 | |||
2559 | bitmap_clear_bit (components, LR_REGNUM); | ||
2560 | bitmap_clear_bit (components, SP_REGNUM); | ||
2561 | + if (flag_stack_clash_protection) | ||
2562 | + { | ||
2563 | + if (frame.sve_save_and_probe != INVALID_REGNUM) | ||
2564 | + bitmap_clear_bit (components, frame.sve_save_and_probe); | ||
2565 | + if (frame.hard_fp_save_and_probe != INVALID_REGNUM) | ||
2566 | + bitmap_clear_bit (components, frame.hard_fp_save_and_probe); | ||
2567 | + } | ||
2568 | |||
2569 | return components; | ||
2570 | } | ||
2571 | @@ -9931,8 +9971,8 @@ aarch64_epilogue_uses (int regno) | ||
2572 | When probing is needed, we emit a probe at the start of the prologue | ||
2573 | and every PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE bytes thereafter. | ||
2574 | |||
2575 | - We have to track how much space has been allocated and the only stores | ||
2576 | - to the stack we track as implicit probes are the FP/LR stores. | ||
2577 | + We can also use register saves as probes. These are stored in | ||
2578 | + sve_save_and_probe and hard_fp_save_and_probe. | ||
2579 | |||
2580 | For outgoing arguments we probe if the size is larger than 1KB, such that | ||
2581 | the ABI specified buffer is maintained for the next callee. | ||
2582 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
2583 | index c8becb098c8..fbfb73545ba 100644 | ||
2584 | --- a/gcc/config/aarch64/aarch64.h | ||
2585 | +++ b/gcc/config/aarch64/aarch64.h | ||
2586 | @@ -863,6 +863,14 @@ struct GTY (()) aarch64_frame | ||
2587 | This is the register they should use. */ | ||
2588 | unsigned spare_pred_reg; | ||
2589 | |||
2590 | + /* An SVE register that is saved below the hard frame pointer and that acts | ||
2591 | + as a probe for later allocations, or INVALID_REGNUM if none. */ | ||
2592 | + unsigned sve_save_and_probe; | ||
2593 | + | ||
2594 | + /* A register that is saved at the hard frame pointer and that acts | ||
2595 | + as a probe for later allocations, or INVALID_REGNUM if none. */ | ||
2596 | + unsigned hard_fp_save_and_probe; | ||
2597 | + | ||
2598 | bool laid_out; | ||
2599 | |||
2600 | /* True if shadow call stack should be enabled for the current function. */ | ||
2601 | diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pcs/stack_clash_3.c b/gcc/testsuite/gcc.target/aarch64/sve/pcs/stack_clash_3.c | ||
2602 | index 3e01ec36c3a..3530a0d504b 100644 | ||
2603 | --- a/gcc/testsuite/gcc.target/aarch64/sve/pcs/stack_clash_3.c | ||
2604 | +++ b/gcc/testsuite/gcc.target/aarch64/sve/pcs/stack_clash_3.c | ||
2605 | @@ -11,11 +11,10 @@ | ||
2606 | ** mov x11, sp | ||
2607 | ** ... | ||
2608 | ** sub sp, sp, x13 | ||
2609 | -** str p4, \[sp\] | ||
2610 | ** cbz w0, [^\n]* | ||
2611 | +** str p4, \[sp\] | ||
2612 | ** ... | ||
2613 | ** ptrue p0\.b, all | ||
2614 | -** ldr p4, \[sp\] | ||
2615 | ** addvl sp, sp, #1 | ||
2616 | ** ldr x24, \[sp\], 32 | ||
2617 | ** ret | ||
2618 | @@ -39,13 +38,12 @@ test_1 (int n) | ||
2619 | ** mov x11, sp | ||
2620 | ** ... | ||
2621 | ** sub sp, sp, x13 | ||
2622 | -** str p4, \[sp\] | ||
2623 | ** cbz w0, [^\n]* | ||
2624 | +** str p4, \[sp\] | ||
2625 | ** str p5, \[sp, #1, mul vl\] | ||
2626 | ** str p6, \[sp, #2, mul vl\] | ||
2627 | ** ... | ||
2628 | ** ptrue p0\.b, all | ||
2629 | -** ldr p4, \[sp\] | ||
2630 | ** addvl sp, sp, #1 | ||
2631 | ** ldr x24, \[sp\], 32 | ||
2632 | ** ret | ||
2633 | -- | ||
2634 | 2.34.1 | ||
2635 | |||
2636 | |||
2637 | From 56df065080950bb30dda9c260f71be54269bdda5 Mon Sep 17 00:00:00 2001 | ||
2638 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
2639 | Date: Tue, 12 Sep 2023 16:07:20 +0100 | ||
2640 | Subject: [PATCH 18/19] aarch64: Remove below_hard_fp_saved_regs_size | ||
2641 | |||
2642 | After previous patches, it's no longer necessary to store | ||
2643 | saved_regs_size and below_hard_fp_saved_regs_size in the frame info. | ||
2644 | All measurements instead use the top or bottom of the frame as | ||
2645 | reference points. | ||
2646 | |||
2647 | gcc/ | ||
2648 | * config/aarch64/aarch64.h (aarch64_frame::saved_regs_size) | ||
2649 | (aarch64_frame::below_hard_fp_saved_regs_size): Delete. | ||
2650 | * config/aarch64/aarch64.cc (aarch64_layout_frame): Update accordingly. | ||
2651 | --- | ||
2652 | gcc/config/aarch64/aarch64.cc | 45 ++++++++++++++++------------------- | ||
2653 | gcc/config/aarch64/aarch64.h | 7 ------ | ||
2654 | 2 files changed, 21 insertions(+), 31 deletions(-) | ||
2655 | |||
2656 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
2657 | index 6c59c39a639..b95e805a8cc 100644 | ||
2658 | --- a/gcc/config/aarch64/aarch64.cc | ||
2659 | +++ b/gcc/config/aarch64/aarch64.cc | ||
2660 | @@ -8530,9 +8530,8 @@ aarch64_layout_frame (void) | ||
2661 | |||
2662 | /* OFFSET is now the offset of the hard frame pointer from the bottom | ||
2663 | of the callee save area. */ | ||
2664 | - frame.below_hard_fp_saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
2665 | - bool saves_below_hard_fp_p | ||
2666 | - = maybe_ne (frame.below_hard_fp_saved_regs_size, 0); | ||
2667 | + auto below_hard_fp_saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
2668 | + bool saves_below_hard_fp_p = maybe_ne (below_hard_fp_saved_regs_size, 0); | ||
2669 | gcc_assert (!saves_below_hard_fp_p | ||
2670 | || (frame.sve_save_and_probe != INVALID_REGNUM | ||
2671 | && known_eq (frame.reg_offset[frame.sve_save_and_probe], | ||
2672 | @@ -8602,9 +8601,8 @@ aarch64_layout_frame (void) | ||
2673 | |||
2674 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2675 | |||
2676 | - frame.saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
2677 | - gcc_assert (known_eq (frame.saved_regs_size, | ||
2678 | - frame.below_hard_fp_saved_regs_size) | ||
2679 | + auto saved_regs_size = offset - frame.bytes_below_saved_regs; | ||
2680 | + gcc_assert (known_eq (saved_regs_size, below_hard_fp_saved_regs_size) | ||
2681 | || (frame.hard_fp_save_and_probe != INVALID_REGNUM | ||
2682 | && known_eq (frame.reg_offset[frame.hard_fp_save_and_probe], | ||
2683 | frame.bytes_below_hard_fp))); | ||
2684 | @@ -8613,7 +8611,7 @@ aarch64_layout_frame (void) | ||
2685 | The saving of the bottommost register counts as an implicit probe, | ||
2686 | which allows us to maintain the invariant described in the comment | ||
2687 | at expand_prologue. */ | ||
2688 | - gcc_assert (crtl->is_leaf || maybe_ne (frame.saved_regs_size, 0)); | ||
2689 | + gcc_assert (crtl->is_leaf || maybe_ne (saved_regs_size, 0)); | ||
2690 | |||
2691 | offset += get_frame_size (); | ||
2692 | offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2693 | @@ -8670,7 +8668,7 @@ aarch64_layout_frame (void) | ||
2694 | |||
2695 | HOST_WIDE_INT const_size, const_below_saved_regs, const_above_fp; | ||
2696 | HOST_WIDE_INT const_saved_regs_size; | ||
2697 | - if (known_eq (frame.saved_regs_size, 0)) | ||
2698 | + if (known_eq (saved_regs_size, 0)) | ||
2699 | frame.initial_adjust = frame.frame_size; | ||
2700 | else if (frame.frame_size.is_constant (&const_size) | ||
2701 | && const_size < max_push_offset | ||
2702 | @@ -8683,7 +8681,7 @@ aarch64_layout_frame (void) | ||
2703 | frame.callee_adjust = const_size; | ||
2704 | } | ||
2705 | else if (frame.bytes_below_saved_regs.is_constant (&const_below_saved_regs) | ||
2706 | - && frame.saved_regs_size.is_constant (&const_saved_regs_size) | ||
2707 | + && saved_regs_size.is_constant (&const_saved_regs_size) | ||
2708 | && const_below_saved_regs + const_saved_regs_size < 512 | ||
2709 | /* We could handle this case even with data below the saved | ||
2710 | registers, provided that that data left us with valid offsets | ||
2711 | @@ -8702,8 +8700,7 @@ aarch64_layout_frame (void) | ||
2712 | frame.initial_adjust = frame.frame_size; | ||
2713 | } | ||
2714 | else if (saves_below_hard_fp_p | ||
2715 | - && known_eq (frame.saved_regs_size, | ||
2716 | - frame.below_hard_fp_saved_regs_size)) | ||
2717 | + && known_eq (saved_regs_size, below_hard_fp_saved_regs_size)) | ||
2718 | { | ||
2719 | /* Frame in which all saves are SVE saves: | ||
2720 | |||
2721 | @@ -8725,7 +8722,7 @@ aarch64_layout_frame (void) | ||
2722 | [save SVE registers relative to SP] | ||
2723 | sub sp, sp, bytes_below_saved_regs */ | ||
2724 | frame.callee_adjust = const_above_fp; | ||
2725 | - frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; | ||
2726 | + frame.sve_callee_adjust = below_hard_fp_saved_regs_size; | ||
2727 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
2728 | } | ||
2729 | else | ||
2730 | @@ -8740,7 +8737,7 @@ aarch64_layout_frame (void) | ||
2731 | [save SVE registers relative to SP] | ||
2732 | sub sp, sp, bytes_below_saved_regs */ | ||
2733 | frame.initial_adjust = frame.bytes_above_hard_fp; | ||
2734 | - frame.sve_callee_adjust = frame.below_hard_fp_saved_regs_size; | ||
2735 | + frame.sve_callee_adjust = below_hard_fp_saved_regs_size; | ||
2736 | frame.final_adjust = frame.bytes_below_saved_regs; | ||
2737 | } | ||
2738 | |||
2739 | @@ -9936,17 +9933,17 @@ aarch64_epilogue_uses (int regno) | ||
2740 | | local variables | <-- frame_pointer_rtx | ||
2741 | | | | ||
2742 | +-------------------------------+ | ||
2743 | - | padding | \ | ||
2744 | - +-------------------------------+ | | ||
2745 | - | callee-saved registers | | frame.saved_regs_size | ||
2746 | - +-------------------------------+ | | ||
2747 | - | LR' | | | ||
2748 | - +-------------------------------+ | | ||
2749 | - | FP' | | | ||
2750 | - +-------------------------------+ |<- hard_frame_pointer_rtx (aligned) | ||
2751 | - | SVE vector registers | | \ | ||
2752 | - +-------------------------------+ | | below_hard_fp_saved_regs_size | ||
2753 | - | SVE predicate registers | / / | ||
2754 | + | padding | | ||
2755 | + +-------------------------------+ | ||
2756 | + | callee-saved registers | | ||
2757 | + +-------------------------------+ | ||
2758 | + | LR' | | ||
2759 | + +-------------------------------+ | ||
2760 | + | FP' | | ||
2761 | + +-------------------------------+ <-- hard_frame_pointer_rtx (aligned) | ||
2762 | + | SVE vector registers | | ||
2763 | + +-------------------------------+ | ||
2764 | + | SVE predicate registers | | ||
2765 | +-------------------------------+ | ||
2766 | | dynamic allocation | | ||
2767 | +-------------------------------+ | ||
2768 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
2769 | index fbfb73545ba..cfeaf4657ab 100644 | ||
2770 | --- a/gcc/config/aarch64/aarch64.h | ||
2771 | +++ b/gcc/config/aarch64/aarch64.h | ||
2772 | @@ -777,18 +777,11 @@ struct GTY (()) aarch64_frame | ||
2773 | STACK_BOUNDARY. */ | ||
2774 | HOST_WIDE_INT saved_varargs_size; | ||
2775 | |||
2776 | - /* The size of the callee-save registers with a slot in REG_OFFSET. */ | ||
2777 | - poly_int64 saved_regs_size; | ||
2778 | - | ||
2779 | /* The number of bytes between the bottom of the static frame (the bottom | ||
2780 | of the outgoing arguments) and the bottom of the register save area. | ||
2781 | This value is always a multiple of STACK_BOUNDARY. */ | ||
2782 | poly_int64 bytes_below_saved_regs; | ||
2783 | |||
2784 | - /* The size of the callee-save registers with a slot in REG_OFFSET that | ||
2785 | - are saved below the hard frame pointer. */ | ||
2786 | - poly_int64 below_hard_fp_saved_regs_size; | ||
2787 | - | ||
2788 | /* The number of bytes between the bottom of the static frame (the bottom | ||
2789 | of the outgoing arguments) and the hard frame pointer. This value is | ||
2790 | always a multiple of STACK_BOUNDARY. */ | ||
2791 | -- | ||
2792 | 2.34.1 | ||
2793 | |||
2794 | |||
2795 | From b96e66fd4ef3e36983969fb8cdd1956f551a074b Mon Sep 17 00:00:00 2001 | ||
2796 | From: Richard Sandiford <richard.sandiford@arm.com> | ||
2797 | Date: Tue, 12 Sep 2023 16:07:21 +0100 | ||
2798 | Subject: [PATCH 19/19] aarch64: Make stack smash canary protect saved | ||
2799 | registers | ||
2800 | |||
2801 | AArch64 normally puts the saved registers near the bottom of the frame, | ||
2802 | immediately above any dynamic allocations. But this means that a | ||
2803 | stack-smash attack on those dynamic allocations could overwrite the | ||
2804 | saved registers without needing to reach as far as the stack smash | ||
2805 | canary. | ||
2806 | |||
2807 | The same thing could also happen for variable-sized arguments that are | ||
2808 | passed by value, since those are allocated before a call and popped on | ||
2809 | return. | ||
2810 | |||
2811 | This patch avoids that by putting the locals (and thus the canary) below | ||
2812 | the saved registers when stack smash protection is active. | ||
2813 | |||
2814 | The patch fixes CVE-2023-4039. | ||
2815 | |||
2816 | gcc/ | ||
2817 | * config/aarch64/aarch64.cc (aarch64_save_regs_above_locals_p): | ||
2818 | New function. | ||
2819 | (aarch64_layout_frame): Use it to decide whether locals should | ||
2820 | go above or below the saved registers. | ||
2821 | (aarch64_expand_prologue): Update stack layout comment. | ||
2822 | Emit a stack tie after the final adjustment. | ||
2823 | |||
2824 | gcc/testsuite/ | ||
2825 | * gcc.target/aarch64/stack-protector-8.c: New test. | ||
2826 | * gcc.target/aarch64/stack-protector-9.c: Likewise. | ||
2827 | --- | ||
2828 | gcc/config/aarch64/aarch64.cc | 46 +++++++-- | ||
2829 | .../gcc.target/aarch64/stack-protector-8.c | 95 +++++++++++++++++++ | ||
2830 | .../gcc.target/aarch64/stack-protector-9.c | 33 +++++++ | ||
2831 | 3 files changed, 168 insertions(+), 6 deletions(-) | ||
2832 | create mode 100644 gcc/testsuite/gcc.target/aarch64/stack-protector-8.c | ||
2833 | create mode 100644 gcc/testsuite/gcc.target/aarch64/stack-protector-9.c | ||
2834 | |||
2835 | diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc | ||
2836 | index b95e805a8cc..389c0e29353 100644 | ||
2837 | --- a/gcc/config/aarch64/aarch64.cc | ||
2838 | +++ b/gcc/config/aarch64/aarch64.cc | ||
2839 | @@ -8394,6 +8394,20 @@ aarch64_needs_frame_chain (void) | ||
2840 | return aarch64_use_frame_pointer; | ||
2841 | } | ||
2842 | |||
2843 | +/* Return true if the current function should save registers above | ||
2844 | + the locals area, rather than below it. */ | ||
2845 | + | ||
2846 | +static bool | ||
2847 | +aarch64_save_regs_above_locals_p () | ||
2848 | +{ | ||
2849 | + /* When using stack smash protection, make sure that the canary slot | ||
2850 | + comes between the locals and the saved registers. Otherwise, | ||
2851 | + it would be possible for a carefully sized smash attack to change | ||
2852 | + the saved registers (particularly LR and FP) without reaching the | ||
2853 | + canary. */ | ||
2854 | + return crtl->stack_protect_guard; | ||
2855 | +} | ||
2856 | + | ||
2857 | /* Mark the registers that need to be saved by the callee and calculate | ||
2858 | the size of the callee-saved registers area and frame record (both FP | ||
2859 | and LR may be omitted). */ | ||
2860 | @@ -8405,6 +8419,7 @@ aarch64_layout_frame (void) | ||
2861 | poly_int64 vector_save_size = GET_MODE_SIZE (vector_save_mode); | ||
2862 | bool frame_related_fp_reg_p = false; | ||
2863 | aarch64_frame &frame = cfun->machine->frame; | ||
2864 | + poly_int64 top_of_locals = -1; | ||
2865 | |||
2866 | frame.emit_frame_chain = aarch64_needs_frame_chain (); | ||
2867 | |||
2868 | @@ -8471,9 +8486,16 @@ aarch64_layout_frame (void) | ||
2869 | && !crtl->abi->clobbers_full_reg_p (regno)) | ||
2870 | frame.reg_offset[regno] = SLOT_REQUIRED; | ||
2871 | |||
2872 | + bool regs_at_top_p = aarch64_save_regs_above_locals_p (); | ||
2873 | |||
2874 | poly_int64 offset = crtl->outgoing_args_size; | ||
2875 | gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT)); | ||
2876 | + if (regs_at_top_p) | ||
2877 | + { | ||
2878 | + offset += get_frame_size (); | ||
2879 | + offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2880 | + top_of_locals = offset; | ||
2881 | + } | ||
2882 | frame.bytes_below_saved_regs = offset; | ||
2883 | frame.sve_save_and_probe = INVALID_REGNUM; | ||
2884 | |||
2885 | @@ -8613,15 +8635,18 @@ aarch64_layout_frame (void) | ||
2886 | at expand_prologue. */ | ||
2887 | gcc_assert (crtl->is_leaf || maybe_ne (saved_regs_size, 0)); | ||
2888 | |||
2889 | - offset += get_frame_size (); | ||
2890 | - offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2891 | - auto top_of_locals = offset; | ||
2892 | - | ||
2893 | + if (!regs_at_top_p) | ||
2894 | + { | ||
2895 | + offset += get_frame_size (); | ||
2896 | + offset = aligned_upper_bound (offset, STACK_BOUNDARY / BITS_PER_UNIT); | ||
2897 | + top_of_locals = offset; | ||
2898 | + } | ||
2899 | offset += frame.saved_varargs_size; | ||
2900 | gcc_assert (multiple_p (offset, STACK_BOUNDARY / BITS_PER_UNIT)); | ||
2901 | frame.frame_size = offset; | ||
2902 | |||
2903 | frame.bytes_above_hard_fp = frame.frame_size - frame.bytes_below_hard_fp; | ||
2904 | + gcc_assert (known_ge (top_of_locals, 0)); | ||
2905 | frame.bytes_above_locals = frame.frame_size - top_of_locals; | ||
2906 | |||
2907 | frame.initial_adjust = 0; | ||
2908 | @@ -9930,10 +9955,10 @@ aarch64_epilogue_uses (int regno) | ||
2909 | | for register varargs | | ||
2910 | | | | ||
2911 | +-------------------------------+ | ||
2912 | - | local variables | <-- frame_pointer_rtx | ||
2913 | + | local variables (1) | <-- frame_pointer_rtx | ||
2914 | | | | ||
2915 | +-------------------------------+ | ||
2916 | - | padding | | ||
2917 | + | padding (1) | | ||
2918 | +-------------------------------+ | ||
2919 | | callee-saved registers | | ||
2920 | +-------------------------------+ | ||
2921 | @@ -9945,6 +9970,10 @@ aarch64_epilogue_uses (int regno) | ||
2922 | +-------------------------------+ | ||
2923 | | SVE predicate registers | | ||
2924 | +-------------------------------+ | ||
2925 | + | local variables (2) | | ||
2926 | + +-------------------------------+ | ||
2927 | + | padding (2) | | ||
2928 | + +-------------------------------+ | ||
2929 | | dynamic allocation | | ||
2930 | +-------------------------------+ | ||
2931 | | padding | | ||
2932 | @@ -9954,6 +9983,9 @@ aarch64_epilogue_uses (int regno) | ||
2933 | +-------------------------------+ | ||
2934 | | | <-- stack_pointer_rtx (aligned) | ||
2935 | |||
2936 | + The regions marked (1) and (2) are mutually exclusive. (2) is used | ||
2937 | + when aarch64_save_regs_above_locals_p is true. | ||
2938 | + | ||
2939 | Dynamic stack allocations via alloca() decrease stack_pointer_rtx | ||
2940 | but leave frame_pointer_rtx and hard_frame_pointer_rtx | ||
2941 | unchanged. | ||
2942 | @@ -10149,6 +10181,8 @@ aarch64_expand_prologue (void) | ||
2943 | gcc_assert (known_eq (bytes_below_sp, final_adjust)); | ||
2944 | aarch64_allocate_and_probe_stack_space (tmp1_rtx, tmp0_rtx, final_adjust, | ||
2945 | !frame_pointer_needed, true); | ||
2946 | + if (emit_frame_chain && maybe_ne (final_adjust, 0)) | ||
2947 | + emit_insn (gen_stack_tie (stack_pointer_rtx, hard_frame_pointer_rtx)); | ||
2948 | } | ||
2949 | |||
2950 | /* Return TRUE if we can use a simple_return insn. | ||
2951 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-protector-8.c b/gcc/testsuite/gcc.target/aarch64/stack-protector-8.c | ||
2952 | new file mode 100644 | ||
2953 | index 00000000000..e71d820e365 | ||
2954 | --- /dev/null | ||
2955 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-protector-8.c | ||
2956 | @@ -0,0 +1,95 @@ | ||
2957 | +/* { dg-options " -O -fstack-protector-strong -mstack-protector-guard=sysreg -mstack-protector-guard-reg=tpidr2_el0 -mstack-protector-guard-offset=16" } */ | ||
2958 | +/* { dg-final { check-function-bodies "**" "" } } */ | ||
2959 | + | ||
2960 | +void g(void *); | ||
2961 | +__SVBool_t *h(void *); | ||
2962 | + | ||
2963 | +/* | ||
2964 | +** test1: | ||
2965 | +** sub sp, sp, #288 | ||
2966 | +** stp x29, x30, \[sp, #?272\] | ||
2967 | +** add x29, sp, #?272 | ||
2968 | +** mrs (x[0-9]+), tpidr2_el0 | ||
2969 | +** ldr (x[0-9]+), \[\1, #?16\] | ||
2970 | +** str \2, \[sp, #?264\] | ||
2971 | +** mov \2, #?0 | ||
2972 | +** add x0, sp, #?8 | ||
2973 | +** bl g | ||
2974 | +** ... | ||
2975 | +** mrs .* | ||
2976 | +** ... | ||
2977 | +** bne .* | ||
2978 | +** ... | ||
2979 | +** ldp x29, x30, \[sp, #?272\] | ||
2980 | +** add sp, sp, #?288 | ||
2981 | +** ret | ||
2982 | +** bl __stack_chk_fail | ||
2983 | +*/ | ||
2984 | +int test1() { | ||
2985 | + int y[0x40]; | ||
2986 | + g(y); | ||
2987 | + return 1; | ||
2988 | +} | ||
2989 | + | ||
2990 | +/* | ||
2991 | +** test2: | ||
2992 | +** stp x29, x30, \[sp, #?-16\]! | ||
2993 | +** mov x29, sp | ||
2994 | +** sub sp, sp, #1040 | ||
2995 | +** mrs (x[0-9]+), tpidr2_el0 | ||
2996 | +** ldr (x[0-9]+), \[\1, #?16\] | ||
2997 | +** str \2, \[sp, #?1032\] | ||
2998 | +** mov \2, #?0 | ||
2999 | +** add x0, sp, #?8 | ||
3000 | +** bl g | ||
3001 | +** ... | ||
3002 | +** mrs .* | ||
3003 | +** ... | ||
3004 | +** bne .* | ||
3005 | +** ... | ||
3006 | +** add sp, sp, #?1040 | ||
3007 | +** ldp x29, x30, \[sp\], #?16 | ||
3008 | +** ret | ||
3009 | +** bl __stack_chk_fail | ||
3010 | +*/ | ||
3011 | +int test2() { | ||
3012 | + int y[0x100]; | ||
3013 | + g(y); | ||
3014 | + return 1; | ||
3015 | +} | ||
3016 | + | ||
3017 | +#pragma GCC target "+sve" | ||
3018 | + | ||
3019 | +/* | ||
3020 | +** test3: | ||
3021 | +** stp x29, x30, \[sp, #?-16\]! | ||
3022 | +** mov x29, sp | ||
3023 | +** addvl sp, sp, #-18 | ||
3024 | +** ... | ||
3025 | +** str p4, \[sp\] | ||
3026 | +** ... | ||
3027 | +** sub sp, sp, #272 | ||
3028 | +** mrs (x[0-9]+), tpidr2_el0 | ||
3029 | +** ldr (x[0-9]+), \[\1, #?16\] | ||
3030 | +** str \2, \[sp, #?264\] | ||
3031 | +** mov \2, #?0 | ||
3032 | +** add x0, sp, #?8 | ||
3033 | +** bl h | ||
3034 | +** ... | ||
3035 | +** mrs .* | ||
3036 | +** ... | ||
3037 | +** bne .* | ||
3038 | +** ... | ||
3039 | +** add sp, sp, #?272 | ||
3040 | +** ... | ||
3041 | +** ldr p4, \[sp\] | ||
3042 | +** ... | ||
3043 | +** addvl sp, sp, #18 | ||
3044 | +** ldp x29, x30, \[sp\], #?16 | ||
3045 | +** ret | ||
3046 | +** bl __stack_chk_fail | ||
3047 | +*/ | ||
3048 | +__SVBool_t test3() { | ||
3049 | + int y[0x40]; | ||
3050 | + return *h(y); | ||
3051 | +} | ||
3052 | diff --git a/gcc/testsuite/gcc.target/aarch64/stack-protector-9.c b/gcc/testsuite/gcc.target/aarch64/stack-protector-9.c | ||
3053 | new file mode 100644 | ||
3054 | index 00000000000..58f322aa480 | ||
3055 | --- /dev/null | ||
3056 | +++ b/gcc/testsuite/gcc.target/aarch64/stack-protector-9.c | ||
3057 | @@ -0,0 +1,33 @@ | ||
3058 | +/* { dg-options "-O2 -mcpu=neoverse-v1 -fstack-protector-all" } */ | ||
3059 | +/* { dg-final { check-function-bodies "**" "" } } */ | ||
3060 | + | ||
3061 | +/* | ||
3062 | +** main: | ||
3063 | +** ... | ||
3064 | +** stp x29, x30, \[sp, #?-[0-9]+\]! | ||
3065 | +** ... | ||
3066 | +** sub sp, sp, #[0-9]+ | ||
3067 | +** ... | ||
3068 | +** str x[0-9]+, \[x29, #?-8\] | ||
3069 | +** ... | ||
3070 | +*/ | ||
3071 | +int f(const char *); | ||
3072 | +void g(void *); | ||
3073 | +int main(int argc, char* argv[]) | ||
3074 | +{ | ||
3075 | + int a; | ||
3076 | + int b; | ||
3077 | + char c[2+f(argv[1])]; | ||
3078 | + int d[0x100]; | ||
3079 | + char y; | ||
3080 | + | ||
3081 | + y=42; a=4; b=10; | ||
3082 | + c[0] = 'h'; c[1] = '\0'; | ||
3083 | + | ||
3084 | + c[f(argv[2])] = '\0'; | ||
3085 | + | ||
3086 | + __builtin_printf("%d %d\n%s\n", a, b, c); | ||
3087 | + g(d); | ||
3088 | + | ||
3089 | + return 0; | ||
3090 | +} | ||
3091 | -- | ||
3092 | 2.34.1 | ||
3093 | |||
diff --git a/meta/recipes-devtools/gcc/gcc_13.2.bb b/meta/recipes-devtools/gcc/gcc_14.1.bb index 255fe552bd..255fe552bd 100644 --- a/meta/recipes-devtools/gcc/gcc_13.2.bb +++ b/meta/recipes-devtools/gcc/gcc_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_13.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_14.1.bb index a259082b47..a259082b47 100644 --- a/meta/recipes-devtools/gcc/libgcc-initial_13.2.bb +++ b/meta/recipes-devtools/gcc/libgcc-initial_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/libgcc_13.2.bb b/meta/recipes-devtools/gcc/libgcc_14.1.bb index fdcd6cc0da..fdcd6cc0da 100644 --- a/meta/recipes-devtools/gcc/libgcc_13.2.bb +++ b/meta/recipes-devtools/gcc/libgcc_14.1.bb | |||
diff --git a/meta/recipes-devtools/gcc/libgfortran_13.2.bb b/meta/recipes-devtools/gcc/libgfortran_14.1.bb index 71dd8b4bdc..71dd8b4bdc 100644 --- a/meta/recipes-devtools/gcc/libgfortran_13.2.bb +++ b/meta/recipes-devtools/gcc/libgfortran_14.1.bb | |||
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 81ac441462..c2fbcb2ac6 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc | |||
@@ -10,7 +10,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ | |||
10 | file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ | 10 | file://0003-Dont-disable-libreadline.a-when-using-disable-static.patch \ |
11 | file://0004-use-asm-sgidefs.h.patch \ | 11 | file://0004-use-asm-sgidefs.h.patch \ |
12 | file://0005-Change-order-of-CFLAGS.patch \ | 12 | file://0005-Change-order-of-CFLAGS.patch \ |
13 | file://0006-resolve-restrict-keyword-conflict.patch \ | ||
14 | file://0007-Fix-invalid-sigprocmask-call.patch \ | 13 | file://0007-Fix-invalid-sigprocmask-call.patch \ |
15 | file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ | 14 | file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ |
16 | " | 15 | " |
diff --git a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch b/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch deleted file mode 100644 index 45388c5ac5..0000000000 --- a/meta/recipes-devtools/gdb/gdb/0006-resolve-restrict-keyword-conflict.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 477f1b2049c7f940b8e8fda4ac396cfe322b269f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 10 May 2016 08:47:05 -0700 | ||
4 | Subject: [PATCH] resolve restrict keyword conflict | ||
5 | |||
6 | GCC detects that we call 'restrict' as param name in function | ||
7 | signatures and complains since both params are called 'restrict' | ||
8 | therefore we use __restrict to denote the C99 keywork | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | gnulib/import/sys_time.in.h | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/gnulib/import/sys_time.in.h b/gnulib/import/sys_time.in.h | ||
18 | index 87db1a88745..e6b98c7e467 100644 | ||
19 | --- a/gnulib/import/sys_time.in.h | ||
20 | +++ b/gnulib/import/sys_time.in.h | ||
21 | @@ -93,20 +93,20 @@ struct timeval | ||
22 | # define gettimeofday rpl_gettimeofday | ||
23 | # endif | ||
24 | _GL_FUNCDECL_RPL (gettimeofday, int, | ||
25 | - (struct timeval *restrict, void *restrict) | ||
26 | + (struct timeval *__restrict, void *__restrict) | ||
27 | _GL_ARG_NONNULL ((1))); | ||
28 | _GL_CXXALIAS_RPL (gettimeofday, int, | ||
29 | - (struct timeval *restrict, void *restrict)); | ||
30 | + (struct timeval *__restrict, void *__restrict)); | ||
31 | # else | ||
32 | # if !@HAVE_GETTIMEOFDAY@ | ||
33 | _GL_FUNCDECL_SYS (gettimeofday, int, | ||
34 | - (struct timeval *restrict, void *restrict) | ||
35 | + (struct timeval *__restrict, void *__restrict) | ||
36 | _GL_ARG_NONNULL ((1))); | ||
37 | # endif | ||
38 | /* Need to cast, because on glibc systems, by default, the second argument is | ||
39 | struct timezone *. */ | ||
40 | _GL_CXXALIAS_SYS_CAST (gettimeofday, int, | ||
41 | - (struct timeval *restrict, void *restrict)); | ||
42 | + (struct timeval *__restrict, void *__restrict)); | ||
43 | # endif | ||
44 | _GL_CXXALIASWARN (gettimeofday); | ||
45 | # if defined __cplusplus && defined GNULIB_NAMESPACE | ||
diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch index d80d082ba3..fc803c73c7 100644 --- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch +++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch | |||
@@ -9,12 +9,16 @@ different flags than git builds on other host distros. | |||
9 | Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] | 9 | Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | 11 | ||
12 | Rebased for 2.45.1. | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | |||
12 | --- | 16 | --- |
13 | config.mak.uname | 4 ---- | 17 | config.mak.uname | 4 ---- |
14 | 1 file changed, 4 deletions(-) | 18 | 1 file changed, 4 deletions(-) |
15 | 19 | ||
16 | diff --git a/config.mak.uname b/config.mak.uname | 20 | diff --git a/config.mak.uname b/config.mak.uname |
17 | index 259d151..136ae3b 100644 | 21 | index a7607a5..251057e 100644 |
18 | --- a/config.mak.uname | 22 | --- a/config.mak.uname |
19 | +++ b/config.mak.uname | 23 | +++ b/config.mak.uname |
20 | @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) | 24 | @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) |
@@ -22,9 +26,9 @@ index 259d151..136ae3b 100644 | |||
22 | HAVE_PLATFORM_PROCINFO = YesPlease | 26 | HAVE_PLATFORM_PROCINFO = YesPlease |
23 | COMPAT_OBJS += compat/linux/procinfo.o | 27 | COMPAT_OBJS += compat/linux/procinfo.o |
24 | - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. | 28 | - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. |
25 | - ifneq ($(findstring .el7.,$(uname_R)),) | 29 | - ifneq ($(findstring .el7.,$(uname_R)),) |
26 | - BASIC_CFLAGS += -std=c99 | 30 | - BASIC_CFLAGS += -std=c99 |
27 | - endif | 31 | - endif |
28 | endif | 32 | endif |
29 | ifeq ($(uname_S),GNU/kFreeBSD) | 33 | ifeq ($(uname_S),GNU/kFreeBSD) |
30 | HAVE_ALLOCA_H = YesPlease | 34 | HAVE_ALLOCA_H = YesPlease |
diff --git a/meta/recipes-devtools/git/git_2.44.0.bb b/meta/recipes-devtools/git/git_2.45.1.bb index 90e555eba7..d1b3e6ad40 100644 --- a/meta/recipes-devtools/git/git_2.44.0.bb +++ b/meta/recipes-devtools/git/git_2.45.1.bb | |||
@@ -40,6 +40,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ | |||
40 | --without-iconv \ | 40 | --without-iconv \ |
41 | " | 41 | " |
42 | EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig " | 42 | EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig " |
43 | EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig " | ||
43 | 44 | ||
44 | # Needs brokensep as this doesn't use automake | 45 | # Needs brokensep as this doesn't use automake |
45 | inherit autotools-brokensep perlnative bash-completion manpages | 46 | inherit autotools-brokensep perlnative bash-completion manpages |
@@ -163,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ | |||
163 | " | 164 | " |
164 | EXTRA_OEMAKE += "NO_GETTEXT=1" | 165 | EXTRA_OEMAKE += "NO_GETTEXT=1" |
165 | 166 | ||
166 | SRC_URI[tarball.sha256sum] = "f9e36f085458fe9688fbbe7846b8c4770b13d161fcd8953655f36b2b85f06b76" | 167 | SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24" |
diff --git a/meta/recipes-devtools/go/go-1.22.2.inc b/meta/recipes-devtools/go/go-1.22.3.inc index b399207311..34703bc1fa 100644 --- a/meta/recipes-devtools/go/go-1.22.2.inc +++ b/meta/recipes-devtools/go/go-1.22.3.inc | |||
@@ -15,4 +15,4 @@ SRC_URI += "\ | |||
15 | file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ | 15 | file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ |
16 | file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ | 16 | file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ |
17 | " | 17 | " |
18 | SRC_URI[main.sha256sum] = "374ea82b289ec738e968267cac59c7d5ff180f9492250254784b2044e90df5a9" | 18 | SRC_URI[main.sha256sum] = "80648ef34f903193d72a59c0dff019f5f98ae0c9aa13ade0b0ecbff991a76f68" |
diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.2.bb b/meta/recipes-devtools/go/go-binary-native_1.22.3.bb index 0f00509f03..b67d97608d 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.2.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.3.bb | |||
@@ -9,9 +9,9 @@ PROVIDES = "go-native" | |||
9 | 9 | ||
10 | # Checksums available at https://go.dev/dl/ | 10 | # Checksums available at https://go.dev/dl/ |
11 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" | 11 | SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" |
12 | SRC_URI[go_linux_amd64.sha256sum] = "5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17" | 12 | SRC_URI[go_linux_amd64.sha256sum] = "8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36" |
13 | SRC_URI[go_linux_arm64.sha256sum] = "36e720b2d564980c162a48c7e97da2e407dfcc4239e1e58d98082dfa2486a0c1" | 13 | SRC_URI[go_linux_arm64.sha256sum] = "6c33e52a5b26e7aa021b94475587fce80043a727a54ceb0eee2f9fc160646434" |
14 | SRC_URI[go_linux_ppc64le.sha256sum] = "251a8886c5113be6490bdbb955ddee98763b49c9b1bf4c8364c02d3b482dab00" | 14 | SRC_URI[go_linux_ppc64le.sha256sum] = "04b7b05283de30dd2da20bf3114b2e22cc727938aed3148babaf35cc951051ac" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" | 16 | UPSTREAM_CHECK_URI = "https://golang.org/dl/" |
17 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" | 17 | UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux" |
diff --git a/meta/recipes-devtools/go/go-cross-canadian_1.22.2.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.3.bb index 7ac9449e47..7ac9449e47 100644 --- a/meta/recipes-devtools/go/go-cross-canadian_1.22.2.bb +++ b/meta/recipes-devtools/go/go-cross-canadian_1.22.3.bb | |||
diff --git a/meta/recipes-devtools/go/go-cross_1.22.2.bb b/meta/recipes-devtools/go/go-cross_1.22.3.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/meta/recipes-devtools/go/go-cross_1.22.2.bb +++ b/meta/recipes-devtools/go/go-cross_1.22.3.bb | |||
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.2.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.3.bb index 1857c8a577..1857c8a577 100644 --- a/meta/recipes-devtools/go/go-crosssdk_1.22.2.bb +++ b/meta/recipes-devtools/go/go-crosssdk_1.22.3.bb | |||
diff --git a/meta/recipes-devtools/go/go-native_1.22.2.bb b/meta/recipes-devtools/go/go-native_1.22.3.bb index ddf25b2c9b..ddf25b2c9b 100644 --- a/meta/recipes-devtools/go/go-native_1.22.2.bb +++ b/meta/recipes-devtools/go/go-native_1.22.3.bb | |||
diff --git a/meta/recipes-devtools/go/go-runtime_1.22.2.bb b/meta/recipes-devtools/go/go-runtime_1.22.3.bb index 63464a1501..63464a1501 100644 --- a/meta/recipes-devtools/go/go-runtime_1.22.2.bb +++ b/meta/recipes-devtools/go/go-runtime_1.22.3.bb | |||
diff --git a/meta/recipes-devtools/go/go_1.22.2.bb b/meta/recipes-devtools/go/go_1.22.3.bb index 46f5fbc6be..46f5fbc6be 100644 --- a/meta/recipes-devtools/go/go_1.22.2.bb +++ b/meta/recipes-devtools/go/go_1.22.3.bb | |||
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb index 56a9321fb9..dd1b257b10 100644 --- a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb | |||
@@ -26,7 +26,8 @@ ICECC_DISABLED = "1" | |||
26 | PATCHTOOL = "patch" | 26 | PATCHTOOL = "patch" |
27 | SRC_URI = "file://icecc-create-env" | 27 | SRC_URI = "file://icecc-create-env" |
28 | 28 | ||
29 | S = "${WORKDIR}" | 29 | S = "${WORKDIR}/sources" |
30 | UNPACKDIR = "${S}" | ||
30 | 31 | ||
31 | do_install() { | 32 | do_install() { |
32 | install -d ${D}/${bindir} | 33 | install -d ${D}/${bindir} |
diff --git a/meta/recipes-devtools/libedit/libedit_20230828-3.1.bb b/meta/recipes-devtools/libedit/libedit_20240517-3.1.bb index 1684b57d31..f8fa871ec9 100644 --- a/meta/recipes-devtools/libedit/libedit_20230828-3.1.bb +++ b/meta/recipes-devtools/libedit/libedit_20240517-3.1.bb | |||
@@ -13,7 +13,7 @@ inherit autotools | |||
13 | SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ | 13 | SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ |
14 | file://stdc-predef.patch \ | 14 | file://stdc-predef.patch \ |
15 | " | 15 | " |
16 | SRC_URI[sha256sum] = "4ee8182b6e569290e7d1f44f0f78dac8716b35f656b76528f699c69c98814dad" | 16 | SRC_URI[sha256sum] = "3a489097bb4115495f3bd85ae782852b7097c556d9500088d74b6fa38dbd12ff" |
17 | 17 | ||
18 | BBCLASSEXTEND = "native nativesdk" | 18 | BBCLASSEXTEND = "native nativesdk" |
19 | 19 | ||
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.7.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc index 16bb10d48f..e0c9aae387 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.7.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc | |||
@@ -8,33 +8,21 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
9 | file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " | 9 | file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " |
10 | 10 | ||
11 | SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ | 11 | SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ |
12 | file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ | 12 | file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ |
13 | file://0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch \ | ||
14 | file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \ | 13 | file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \ |
15 | file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \ | 14 | file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \ |
16 | file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \ | 15 | file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \ |
17 | file://dont-depend-on-help2man.patch \ | 16 | file://dont-depend-on-help2man.patch \ |
18 | file://0003-libtool.m4-Cleanup-sysroot-trailing.patch \ | ||
19 | file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ | 17 | file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ |
20 | file://nohardcodepaths.patch \ | ||
21 | file://0007-libtool-Fix-support-for-NIOS2-processor.patch \ | ||
22 | file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ | 18 | file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ |
23 | file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ | 19 | file://nohardcodepaths.patch \ |
24 | file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \ | 20 | file://filefix.patch \ |
25 | file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \ | ||
26 | file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \ | ||
27 | file://0001-ltmain.in-Parse-additional-clang-options.patch \ | ||
28 | " | 21 | " |
29 | 22 | ||
30 | SRC_URI[sha256sum] = "04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8" | ||
31 | 23 | ||
32 | do_compile:prepend () { | 24 | |
33 | # Sometimes this file doesn't get rebuilt, force the issue | 25 | SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" |
34 | rm -f ${S}/build-aux/ltmain.sh | ||
35 | make build-aux/ltmain.sh | ||
36 | ./config.status | ||
37 | } | ||
38 | 26 | ||
39 | inherit autotools texinfo | 27 | inherit autotools texinfo |
40 | EXTRA_AUTORECONF = "--exclude=libtoolize" | 28 | EXTRA_AUTORECONF = "--exclude=libtoolize" |
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb index 93f1dd7825..18849cb8ef 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb | |||
@@ -7,13 +7,6 @@ datadir = "${STAGING_DIR_TARGET}${target_datadir}" | |||
7 | 7 | ||
8 | inherit nopackages | 8 | inherit nopackages |
9 | 9 | ||
10 | do_configure:prepend () { | ||
11 | # Remove any existing libtool m4 since old stale versions would break | ||
12 | # any upgrade | ||
13 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
14 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
15 | } | ||
16 | |||
17 | # | 10 | # |
18 | # ccache may or may not be INHERITED, we remove references to it so the sstate | 11 | # ccache may or may not be INHERITED, we remove references to it so the sstate |
19 | # artefact works on a machine where its not present. libtool-cross isn't used | 12 | # artefact works on a machine where its not present. libtool-cross isn't used |
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb deleted file mode 100644 index 19024f7830..0000000000 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | require libtool-${PV}.inc | ||
2 | |||
3 | DEPENDS = "" | ||
4 | |||
5 | inherit native | ||
6 | |||
7 | EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}" | ||
8 | |||
9 | do_configure:prepend () { | ||
10 | # Remove any existing libtool m4 since old stale versions would break | ||
11 | # any upgrade | ||
12 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
13 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
14 | } | ||
15 | |||
16 | do_install () { | ||
17 | autotools_do_install | ||
18 | install -d ${D}${bindir}/ | ||
19 | install -m 0755 libtool ${D}${bindir}/libtool | ||
20 | } | ||
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb new file mode 100644 index 0000000000..be96b52dd6 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | require libtool-${PV}.inc | ||
2 | |||
3 | DEPENDS = "" | ||
4 | |||
5 | inherit native | ||
6 | |||
7 | do_install () { | ||
8 | autotools_do_install | ||
9 | install -d ${D}${bindir}/ | ||
10 | install -m 0755 libtool ${D}${bindir}/libtool | ||
11 | } | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch index 51c0c52da8..d5d906e6b6 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
14 | 14 | ||
15 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] | 15 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] |
16 | 16 | ||
17 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 17 | Index: libtool-2.5.0/build-aux/ltmain.in |
18 | index a5f21a1..f884824 100644 | 18 | =================================================================== |
19 | --- a/build-aux/ltmain.in | 19 | --- libtool-2.5.0.orig/build-aux/ltmain.in |
20 | +++ b/build-aux/ltmain.in | 20 | +++ libtool-2.5.0/build-aux/ltmain.in |
21 | @@ -2381,8 +2381,14 @@ func_mode_install () | 21 | @@ -2382,8 +2382,14 @@ func_mode_install () |
22 | func_append dir "$objdir" | 22 | func_append dir "$objdir" |
23 | 23 | ||
24 | if test -n "$relink_command"; then | 24 | if test -n "$relink_command"; then |
@@ -34,6 +34,3 @@ index a5f21a1..f884824 100644 | |||
34 | 34 | ||
35 | # Don't allow the user to place us outside of our expected | 35 | # Don't allow the user to place us outside of our expected |
36 | # location b/c this prevents finding dependent libraries that | 36 | # location b/c this prevents finding dependent libraries that |
37 | -- | ||
38 | 2.25.1 | ||
39 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch deleted file mode 100644 index c52083327c..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | ltmain.in: Parse additional clang options | ||
2 | |||
3 | clang uses -rtlib and --unwindlib to select proper compiler | ||
4 | runtime in some cases. Therefore pass these options to linker when found in | ||
5 | ldflags | ||
6 | |||
7 | * build-aux/ltmain.in: Handle clang linker options | ||
8 | |||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
10 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=725646bf095bf5c07c49ae38dd060f95bd95ae3c] | ||
11 | |||
12 | --- | ||
13 | build-aux/ltmain.in | 4 +++- | ||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
17 | index 037f009..ba5c816 100644 | ||
18 | --- a/build-aux/ltmain.in | ||
19 | +++ b/build-aux/ltmain.in | ||
20 | @@ -5414,10 +5414,12 @@ func_mode_link () | ||
21 | # -fsanitize=* Clang/GCC memory and address sanitizer | ||
22 | # -fuse-ld=* Linker select flags for GCC | ||
23 | # -f{file|debug|macro|profile}-prefix-map* needed for lto linking | ||
24 | + # -rtlib=* select c runtime lib with clang | ||
25 | + # --unwindlib=* select unwinder library with clang | ||
26 | # -Wa,* Pass flags directly to the assembler | ||
27 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | ||
28 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | ||
29 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | ||
30 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \ | ||
31 | -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*) | ||
32 | func_quote_arg pretty "$arg" | ||
33 | arg=$func_quote_arg_result | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch deleted file mode 100644 index 2126f82953..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ /dev/null | |||
@@ -1,170 +0,0 @@ | |||
1 | From: Khem Raj <raj.khem@gmail.com> | ||
2 | Subject: [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils | ||
3 | |||
4 | This patch renames the --with-sysroot option to --with-libtool-sysroot | ||
5 | to avoid namespace conflict with binutils, gcc and other toolchain | ||
6 | components since these componets also add that option to configure | ||
7 | and this becomes confusing and conflicting otherwise. | ||
8 | |||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
10 | |||
11 | Upstream report: | ||
12 | http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html | ||
13 | |||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] | ||
15 | |||
16 | Index: libtool-2.4.7/m4/libtool.m4 | ||
17 | =================================================================== | ||
18 | --- libtool-2.4.7.orig/m4/libtool.m4 | ||
19 | +++ libtool-2.4.7/m4/libtool.m4 | ||
20 | @@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr | ||
21 | AC_DEFUN([_LT_WITH_SYSROOT], | ||
22 | [m4_require([_LT_DECL_SED])dnl | ||
23 | AC_MSG_CHECKING([for sysroot]) | ||
24 | -AC_ARG_WITH([sysroot], | ||
25 | -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], | ||
26 | +AC_ARG_WITH([libtool-sysroot], | ||
27 | +[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@], | ||
28 | [Search for dependent libraries within DIR (or the compiler's sysroot | ||
29 | if not specified).])], | ||
30 | -[], [with_sysroot=no]) | ||
31 | +[], [with_libtool_sysroot=no]) | ||
32 | |||
33 | dnl lt_sysroot will always be passed unquoted. We quote it here | ||
34 | dnl in case the user passed a directory name. | ||
35 | lt_sysroot= | ||
36 | -case $with_sysroot in #( | ||
37 | +case $with_libtool_sysroot in #( | ||
38 | yes) | ||
39 | if test yes = "$GCC"; then | ||
40 | lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
41 | fi | ||
42 | ;; #( | ||
43 | /*) | ||
44 | - lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` | ||
45 | + lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` | ||
46 | ;; #( | ||
47 | no|'') | ||
48 | ;; #( | ||
49 | *) | ||
50 | - AC_MSG_RESULT([$with_sysroot]) | ||
51 | + AC_MSG_RESULT([$with_libtool_sysroot]) | ||
52 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | ||
53 | ;; | ||
54 | esac | ||
55 | Index: libtool-2.4.7/tests/sysroot.at | ||
56 | =================================================================== | ||
57 | --- libtool-2.4.7.orig/tests/sysroot.at | ||
58 | +++ libtool-2.4.7/tests/sysroot.at | ||
59 | @@ -65,7 +65,7 @@ while read file; do | ||
60 | done]) | ||
61 | |||
62 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | ||
63 | -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" | ||
64 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | ||
65 | |||
66 | #??? | ||
67 | if test PATH = "$shlibpath_var"; then | ||
68 | @@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
69 | AC_PROG_CC | ||
70 | AC_CONFIG_SRCDIR([lib2.c]) | ||
71 | LT_INIT | ||
72 | -sysroot=$with_sysroot | ||
73 | +sysroot=$with_libtool_sysroot | ||
74 | AC_SUBST([sysroot]) | ||
75 | AC_OUTPUT(Makefile) | ||
76 | ]]) | ||
77 | @@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
78 | AC_PROG_CC | ||
79 | AC_CONFIG_SRCDIR([prog.c]) | ||
80 | LT_INIT | ||
81 | -sysroot=$with_sysroot | ||
82 | +sysroot=$with_libtool_sysroot | ||
83 | AC_SUBST([sysroot]) | ||
84 | AC_OUTPUT(Makefile) | ||
85 | ]]) | ||
86 | diff --git a/tests/testsuite b/tests/testsuite | ||
87 | index 24265e4..d388e3e 100755 | ||
88 | --- a/tests/testsuite | ||
89 | +++ b/tests/testsuite | ||
90 | @@ -48997,7 +48997,7 @@ $at_traceon; } | ||
91 | |||
92 | |||
93 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | ||
94 | -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" | ||
95 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | ||
96 | |||
97 | #??? | ||
98 | if test PATH = "$shlibpath_var"; then | ||
99 | @@ -49211,7 +49211,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
100 | AC_PROG_CC | ||
101 | AC_CONFIG_SRCDIR([lib2.c]) | ||
102 | LT_INIT | ||
103 | -sysroot=$with_sysroot | ||
104 | +sysroot=$with_libtool_sysroot | ||
105 | AC_SUBST([sysroot]) | ||
106 | AC_OUTPUT(Makefile) | ||
107 | _ATEOF | ||
108 | @@ -49404,7 +49404,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
109 | AC_PROG_CC | ||
110 | AC_CONFIG_SRCDIR([prog.c]) | ||
111 | LT_INIT | ||
112 | -sysroot=$with_sysroot | ||
113 | +sysroot=$with_libtool_sysroot | ||
114 | AC_SUBST([sysroot]) | ||
115 | AC_OUTPUT(Makefile) | ||
116 | _ATEOF | ||
117 | @@ -49761,7 +49761,7 @@ $at_traceon; } | ||
118 | |||
119 | |||
120 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | ||
121 | -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" | ||
122 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | ||
123 | |||
124 | #??? | ||
125 | if test PATH = "$shlibpath_var"; then | ||
126 | @@ -49975,7 +49975,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
127 | AC_PROG_CC | ||
128 | AC_CONFIG_SRCDIR([lib2.c]) | ||
129 | LT_INIT | ||
130 | -sysroot=$with_sysroot | ||
131 | +sysroot=$with_libtool_sysroot | ||
132 | AC_SUBST([sysroot]) | ||
133 | AC_OUTPUT(Makefile) | ||
134 | _ATEOF | ||
135 | @@ -50168,7 +50168,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
136 | AC_PROG_CC | ||
137 | AC_CONFIG_SRCDIR([prog.c]) | ||
138 | LT_INIT | ||
139 | -sysroot=$with_sysroot | ||
140 | +sysroot=$with_libtool_sysroot | ||
141 | AC_SUBST([sysroot]) | ||
142 | AC_OUTPUT(Makefile) | ||
143 | _ATEOF | ||
144 | @@ -50525,7 +50525,7 @@ $at_traceon; } | ||
145 | |||
146 | |||
147 | LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" | ||
148 | -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" | ||
149 | +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" | ||
150 | |||
151 | #??? | ||
152 | if test PATH = "$shlibpath_var"; then | ||
153 | @@ -50739,7 +50739,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
154 | AC_PROG_CC | ||
155 | AC_CONFIG_SRCDIR([lib2.c]) | ||
156 | LT_INIT | ||
157 | -sysroot=$with_sysroot | ||
158 | +sysroot=$with_libtool_sysroot | ||
159 | AC_SUBST([sysroot]) | ||
160 | AC_OUTPUT(Makefile) | ||
161 | _ATEOF | ||
162 | @@ -50932,7 +50932,7 @@ AM_INIT_AUTOMAKE([foreign]) | ||
163 | AC_PROG_CC | ||
164 | AC_CONFIG_SRCDIR([prog.c]) | ||
165 | LT_INIT | ||
166 | -sysroot=$with_sysroot | ||
167 | +sysroot=$with_libtool_sysroot | ||
168 | AC_SUBST([sysroot]) | ||
169 | AC_OUTPUT(Makefile) | ||
170 | _ATEOF | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch deleted file mode 100644 index 6d922382ef..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | libtool.m4: Cleanup sysroot trailing "/" | ||
2 | |||
3 | If $CC has --sysroot=/, it is a valid configuration however libtool will | ||
4 | then set lt_sysroot to "/". | ||
5 | |||
6 | This means references like $lt_sysroot$libdir become //usr/lib instead | ||
7 | of the more normally expected /usr/lib. This may or may not break something | ||
8 | but certainly is confusing to the user and gives confusing output. Making | ||
9 | "/" simply unset lt_sysroot is much cleaner. | ||
10 | |||
11 | Whilst here, trim any trailing '/' from sysroot paths to drop the duplication | ||
12 | and result in cleaner/consistent output. | ||
13 | |||
14 | * m4/libtool.m4: Cleanup sysroot trailing '/' handling | ||
15 | |||
16 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=365805327c7b9bbdb0e622b954b6b0d8eaeb3f99] | ||
17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
18 | |||
19 | --- | ||
20 | m4/libtool.m4 | 4 +++- | ||
21 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | ||
24 | index fa1ae91..2f31d24 100644 | ||
25 | --- a/m4/libtool.m4 | ||
26 | +++ b/m4/libtool.m4 | ||
27 | @@ -1256,7 +1256,9 @@ lt_sysroot= | ||
28 | case $with_libtool_sysroot in #( | ||
29 | yes) | ||
30 | if test yes = "$GCC"; then | ||
31 | - lt_sysroot=`$CC --print-sysroot 2>/dev/null` | ||
32 | + # Trim trailing / since we'll always append absolute paths and we want | ||
33 | + # to avoid //, if only for less confusing output for the user. | ||
34 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'` | ||
35 | fi | ||
36 | ;; #( | ||
37 | /*) | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch index 35f48ef906..2436f68a49 100644 --- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch +++ b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch | |||
@@ -8,13 +8,14 @@ i.e. when lt_sysroot is not set, it will still behave the same and add | |||
8 | 8 | ||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
10 | 10 | ||
11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] | 11 | Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] |
12 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=3221f9f0fb98d5740ab5d0e8db6a731302520644] | ||
12 | 13 | ||
13 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 14 | Index: libtool-2.5.0/build-aux/ltmain.in |
14 | index f884824..25a91de 100644 | 15 | =================================================================== |
15 | --- a/build-aux/ltmain.in | 16 | --- libtool-2.5.0.orig/build-aux/ltmain.in |
16 | +++ b/build-aux/ltmain.in | 17 | +++ libtool-2.5.0/build-aux/ltmain.in |
17 | @@ -6503,7 +6503,7 @@ func_mode_link () | 18 | @@ -6514,7 +6514,7 @@ func_mode_link () |
18 | fi | 19 | fi |
19 | else | 20 | else |
20 | # We cannot seem to hardcode it, guess we'll fake it. | 21 | # We cannot seem to hardcode it, guess we'll fake it. |
@@ -23,6 +24,3 @@ index f884824..25a91de 100644 | |||
23 | # Try looking first in the location we're being installed to. | 24 | # Try looking first in the location we're being installed to. |
24 | if test -n "$inst_prefix_dir"; then | 25 | if test -n "$inst_prefix_dir"; then |
25 | case $libdir in | 26 | case $libdir in |
26 | -- | ||
27 | 2.25.1 | ||
28 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch index 9203302182..a6b3313d71 100644 --- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch +++ b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch | |||
@@ -9,11 +9,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
9 | 9 | ||
10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] | 10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] |
11 | 11 | ||
12 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 12 | Index: libtool-2.5.0/build-aux/ltmain.in |
13 | index 25a91de..40cb94a 100644 | 13 | =================================================================== |
14 | --- a/build-aux/ltmain.in | 14 | --- libtool-2.5.0.orig/build-aux/ltmain.in |
15 | +++ b/build-aux/ltmain.in | 15 | +++ libtool-2.5.0/build-aux/ltmain.in |
16 | @@ -7682,9 +7682,11 @@ EOF | 16 | @@ -7584,9 +7584,11 @@ func_mode_link () |
17 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath | 17 | test relink = "$opt_mode" || rpath=$compile_rpath$rpath |
18 | for libdir in $rpath; do | 18 | for libdir in $rpath; do |
19 | if test -n "$hardcode_libdir_flag_spec"; then | 19 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -27,7 +27,7 @@ index 25a91de..40cb94a 100644 | |||
27 | if test -z "$hardcode_libdirs"; then | 27 | if test -z "$hardcode_libdirs"; then |
28 | hardcode_libdirs=$libdir | 28 | hardcode_libdirs=$libdir |
29 | else | 29 | else |
30 | @@ -8414,6 +8416,10 @@ EOF | 30 | @@ -8316,6 +8318,10 @@ func_mode_link () |
31 | hardcode_libdirs= | 31 | hardcode_libdirs= |
32 | for libdir in $compile_rpath $finalize_rpath; do | 32 | for libdir in $compile_rpath $finalize_rpath; do |
33 | if test -n "$hardcode_libdir_flag_spec"; then | 33 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -38,7 +38,7 @@ index 25a91de..40cb94a 100644 | |||
38 | if test -n "$hardcode_libdir_separator"; then | 38 | if test -n "$hardcode_libdir_separator"; then |
39 | if test -z "$hardcode_libdirs"; then | 39 | if test -z "$hardcode_libdirs"; then |
40 | hardcode_libdirs=$libdir | 40 | hardcode_libdirs=$libdir |
41 | @@ -8465,6 +8471,10 @@ EOF | 41 | @@ -8367,6 +8373,10 @@ func_mode_link () |
42 | hardcode_libdirs= | 42 | hardcode_libdirs= |
43 | for libdir in $finalize_rpath; do | 43 | for libdir in $finalize_rpath; do |
44 | if test -n "$hardcode_libdir_flag_spec"; then | 44 | if test -n "$hardcode_libdir_flag_spec"; then |
@@ -49,6 +49,3 @@ index 25a91de..40cb94a 100644 | |||
49 | if test -n "$hardcode_libdir_separator"; then | 49 | if test -n "$hardcode_libdir_separator"; then |
50 | if test -z "$hardcode_libdirs"; then | 50 | if test -z "$hardcode_libdirs"; then |
51 | hardcode_libdirs=$libdir | 51 | hardcode_libdirs=$libdir |
52 | -- | ||
53 | 2.25.1 | ||
54 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch index 8b6352b01b..54e602f118 100644 --- a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch +++ b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch | |||
@@ -12,11 +12,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
12 | 12 | ||
13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] | 13 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] |
14 | 14 | ||
15 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | 15 | Index: libtool-2.5.0/build-aux/ltmain.in |
16 | index 40cb94a..2fa055e 100644 | 16 | =================================================================== |
17 | --- a/build-aux/ltmain.in | 17 | --- libtool-2.5.0.orig/build-aux/ltmain.in |
18 | +++ b/build-aux/ltmain.in | 18 | +++ libtool-2.5.0/build-aux/ltmain.in |
19 | @@ -7700,8 +7700,16 @@ EOF | 19 | @@ -7602,8 +7602,16 @@ func_mode_link () |
20 | esac | 20 | esac |
21 | fi | 21 | fi |
22 | else | 22 | else |
@@ -35,7 +35,7 @@ index 40cb94a..2fa055e 100644 | |||
35 | fi | 35 | fi |
36 | elif test -n "$runpath_var"; then | 36 | elif test -n "$runpath_var"; then |
37 | case "$perm_rpath " in | 37 | case "$perm_rpath " in |
38 | @@ -8434,8 +8442,16 @@ EOF | 38 | @@ -8336,8 +8344,16 @@ func_mode_link () |
39 | esac | 39 | esac |
40 | fi | 40 | fi |
41 | else | 41 | else |
@@ -54,7 +54,7 @@ index 40cb94a..2fa055e 100644 | |||
54 | fi | 54 | fi |
55 | elif test -n "$runpath_var"; then | 55 | elif test -n "$runpath_var"; then |
56 | case "$perm_rpath " in | 56 | case "$perm_rpath " in |
57 | @@ -8489,8 +8505,14 @@ EOF | 57 | @@ -8391,8 +8407,14 @@ func_mode_link () |
58 | esac | 58 | esac |
59 | fi | 59 | fi |
60 | else | 60 | else |
@@ -71,6 +71,3 @@ index 40cb94a..2fa055e 100644 | |||
71 | fi | 71 | fi |
72 | elif test -n "$runpath_var"; then | 72 | elif test -n "$runpath_var"; then |
73 | case "$finalize_perm_rpath " in | 73 | case "$finalize_perm_rpath " in |
74 | -- | ||
75 | 2.25.1 | ||
76 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch index c104e904cc..feb1048b55 100644 --- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch +++ b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch | |||
@@ -10,14 +10,14 @@ Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of d | |||
10 | m4/libtool.m4 | 6 +++--- | 10 | m4/libtool.m4 | 6 +++--- |
11 | 1 file changed, 3 insertions(+), 3 deletions(-) | 11 | 1 file changed, 3 insertions(+), 3 deletions(-) |
12 | 12 | ||
13 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 13 | Index: libtool-2.5.0/m4/libtool.m4 |
14 | index 2f31d24..bd90775 100644 | 14 | =================================================================== |
15 | --- a/m4/libtool.m4 | 15 | --- libtool-2.5.0.orig/m4/libtool.m4 |
16 | +++ b/m4/libtool.m4 | 16 | +++ libtool-2.5.0/m4/libtool.m4 |
17 | @@ -1254,18 +1254,18 @@ dnl lt_sysroot will always be passed unquoted. We quote it here | 17 | @@ -1253,18 +1253,18 @@ dnl lt_sysroot will always be passed unq |
18 | dnl in case the user passed a directory name. | 18 | dnl in case the user passed a directory name. |
19 | lt_sysroot= | 19 | lt_sysroot= |
20 | case $with_libtool_sysroot in #( | 20 | case $with_sysroot in #( |
21 | - yes) | 21 | - yes) |
22 | + no) | 22 | + no) |
23 | if test yes = "$GCC"; then | 23 | if test yes = "$GCC"; then |
@@ -29,10 +29,10 @@ index 2f31d24..bd90775 100644 | |||
29 | + yes|''|/) | 29 | + yes|''|/) |
30 | + ;; #( | 30 | + ;; #( |
31 | /*) | 31 | /*) |
32 | lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` | 32 | lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` |
33 | ;; #( | 33 | ;; #( |
34 | - no|'') | 34 | - no|'') |
35 | - ;; #( | 35 | - ;; #( |
36 | *) | 36 | *) |
37 | AC_MSG_RESULT([$with_libtool_sysroot]) | 37 | AC_MSG_RESULT([$with_sysroot]) |
38 | AC_MSG_ERROR([The sysroot must be an absolute path.]) | 38 | AC_MSG_ERROR([The sysroot must be an absolute path.]) |
diff --git a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch deleted file mode 100644 index 676ce7fd1b..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | libtool: Fix support for NIOS2 processor | ||
2 | |||
3 | The name of the system contains the string "nios2". This string | ||
4 | is caught by the some of the greedy checks for OS/2 in libtool, | ||
5 | in particular the *os2* branches of switch statements match for | ||
6 | the nios2 string, which results in incorrect behavior of libtool. | ||
7 | |||
8 | Switch to use $host_os instead of $host and tweak the patterns to | ||
9 | match to avoid this problem for nios2. | ||
10 | |||
11 | * build-aux/ltmain.in: Fix NIOS2 support | ||
12 | --- | ||
13 | build-aux/ltmain.in | 12 ++++++------ | ||
14 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
15 | |||
16 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
17 | |||
18 | Submitted: https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html | ||
19 | Reworked and submitted: https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00068.html | ||
20 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=49e6cb0d4dfdca2a59b909dc4532fe22dbc57ad5] | ||
21 | |||
22 | Index: libtool-2.4.7/build-aux/ltmain.in | ||
23 | =================================================================== | ||
24 | --- libtool-2.4.7.orig/build-aux/ltmain.in | ||
25 | +++ libtool-2.4.7/build-aux/ltmain.in | ||
26 | @@ -518,10 +518,10 @@ libtool_validate_options () | ||
27 | # preserve --debug | ||
28 | test : = "$debug_cmd" || func_append preserve_args " --debug" | ||
29 | |||
30 | - case $host in | ||
31 | + case $host_os in | ||
32 | # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 | ||
33 | # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 | ||
34 | - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) | ||
35 | + cygwin* | mingw* | pw32* | cegcc* | solaris2* | os2*) | ||
36 | # don't eliminate duplications in $postdeps and $predeps | ||
37 | opt_duplicate_compiler_generated_deps=: | ||
38 | ;; | ||
39 | @@ -6273,8 +6273,8 @@ func_mode_link () | ||
40 | fi | ||
41 | if test -n "$library_names" && | ||
42 | { test no = "$use_static_libs" || test -z "$old_library"; }; then | ||
43 | - case $host in | ||
44 | - *cygwin* | *mingw* | *cegcc* | *os2*) | ||
45 | + case $host_os in | ||
46 | + cygwin* | mingw* | cegcc* | os2*) | ||
47 | # No point in relinking DLLs because paths are not encoded | ||
48 | func_append notinst_deplibs " $lib" | ||
49 | need_relink=no | ||
50 | @@ -6343,8 +6343,8 @@ func_mode_link () | ||
51 | soname=$dlname | ||
52 | elif test -n "$soname_spec"; then | ||
53 | # bleh windows | ||
54 | - case $host in | ||
55 | - *cygwin* | mingw* | *cegcc* | *os2*) | ||
56 | + case $host_os in | ||
57 | + cygwin* | mingw* | cegcc* | os2*) | ||
58 | func_arith $current - $age | ||
59 | major=$func_arith_result | ||
60 | versuffix=-$major | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch index c151c3b481..c103ebb7bf 100644 --- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch +++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch | |||
@@ -15,19 +15,16 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 | |||
15 | 15 | ||
16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] | 16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] |
17 | 17 | ||
18 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | 18 | Index: libtool-2.5.0/m4/libtool.m4 |
19 | index bd90775..3794130 100644 | 19 | =================================================================== |
20 | --- a/m4/libtool.m4 | 20 | --- libtool-2.5.0.orig/m4/libtool.m4 |
21 | +++ b/m4/libtool.m4 | 21 | +++ libtool-2.5.0/m4/libtool.m4 |
22 | @@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then | 22 | @@ -7553,7 +7553,7 @@ if AC_TRY_EVAL(ac_compile); then |
23 | for p in `eval "$output_verbose_link_cmd"`; do | 23 | for p in `eval "$output_verbose_link_cmd"`; do |
24 | case $prev$p in | 24 | case $prev$p in |
25 | 25 | ||
26 | - -L* | -R* | -l*) | 26 | - -L* | -R* | -l*) |
27 | + -L* | -R* | -l* | */libclang_rt.*.a) | 27 | + -L* | -R* | -l* | */libclang_rt.*.a) |
28 | # Some compilers place space between "-{L,R}" and the path. | 28 | # Some compilers place space between "-{L,R,l}" and the path. |
29 | # Remove the space. | 29 | # Remove the space. |
30 | if test x-L = "$p" || | 30 | if test x-L = x"$p" || |
31 | -- | ||
32 | 2.25.1 | ||
33 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch deleted file mode 100644 index f51deecbef..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From: Mingli Yu <mingli.yu@windriver.com> | ||
2 | Subject: [PATCH 09/12] Makefile.am: make sure autoheader run before autoconf | ||
3 | |||
4 | autoheader will update ../libtool-2.4.6/libltdl/config-h.in which | ||
5 | autoconf needs, so there comes a race sometimes as below: | ||
6 | | configure.ac:45: error: required file 'config-h.in' not found | ||
7 | | touch '../libtool-2.4.6/libltdl/config-h.in' | ||
8 | |||
9 | So make sure autoheader run before autoconf to avoid this race. | ||
10 | |||
11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
13 | |||
14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a] | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index c29860e..9c34bfd 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) | ||
21 | $(lt_aclocal_m4): $(lt_aclocal_m4_deps) | ||
22 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4 | ||
23 | |||
24 | -$(lt_configure): $(lt_configure_deps) | ||
25 | +$(lt_configure): $(lt_configure_deps) $(lt_config_h_in) | ||
26 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF) | ||
27 | |||
28 | $(lt_config_h_in): $(lt_configure_deps) | ||
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch deleted file mode 100644 index e451de59e3..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From: Mingli Yu <mingli.yu@windriver.com> | ||
2 | Subject: [PATCH 10/12] Makefile.am: make sure autoheader run before automake | ||
3 | |||
4 | When use automake to generate Makefile.in from Makefile.am, there | ||
5 | comes below race: | ||
6 | | configure.ac:45: error: required file 'config-h.in' not found | ||
7 | |||
8 | It is because the file config-h.in in updating process by autoheader, | ||
9 | so make automake run after autoheader to avoid the above race. | ||
10 | |||
11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
13 | |||
14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e01c0bfe5e041418d84460901a1a5b11b89d596f] | ||
15 | |||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
17 | |||
18 | diff --git a/Makefile.am b/Makefile.am | ||
19 | index 9c34bfd..231ef3f 100644 | ||
20 | --- a/Makefile.am | ||
21 | +++ b/Makefile.am | ||
22 | @@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ | ||
23 | $(lt_obsolete_m4) \ | ||
24 | $(stamp_mk) | ||
25 | |||
26 | -$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) | ||
27 | +$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in) | ||
28 | $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile | ||
29 | |||
30 | # Don't let unused scripts leak into the libltdl Makefile | ||
31 | -- | ||
32 | 2.25.1 | ||
33 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch deleted file mode 100644 index 4c6b6f05b4..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | ltmain.in: Handle prefix-map compiler options correctly | ||
2 | |||
3 | If lto is enabled, we need the prefix-map variables to be passed to the linker | ||
4 | to correctly link the objects using correctly mapped paths. | ||
5 | |||
6 | Add these to the list of options libtool passes through. | ||
7 | |||
8 | * build-aux/ltmain.in: Handle prefix-map compiler options | ||
9 | |||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | |||
12 | https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html | ||
13 | https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00066.html | ||
14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=cdf4bf702f11d17e06569936e8a433a77f791228] | ||
15 | |||
16 | --- | ||
17 | build-aux/ltmain.in | 3 ++- | ||
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
21 | index 0a50f5b..037f009 100644 | ||
22 | --- a/build-aux/ltmain.in | ||
23 | +++ b/build-aux/ltmain.in | ||
24 | @@ -5413,11 +5413,12 @@ func_mode_link () | ||
25 | # -stdlib=* select c++ std lib with clang | ||
26 | # -fsanitize=* Clang/GCC memory and address sanitizer | ||
27 | # -fuse-ld=* Linker select flags for GCC | ||
28 | + # -f{file|debug|macro|profile}-prefix-map* needed for lto linking | ||
29 | # -Wa,* Pass flags directly to the assembler | ||
30 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | ||
31 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | ||
32 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | ||
33 | - -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) | ||
34 | + -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*) | ||
35 | func_quote_arg pretty "$arg" | ||
36 | arg=$func_quote_arg_result | ||
37 | func_append compile_command " $arg" | ||
diff --git a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch deleted file mode 100644 index 8469b8727e..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
2 | Subject: [PATCH 12/12] libtool.m4: For reproducibility stop encoding hostname in libtool script | ||
3 | |||
4 | For reproducibilty, stop encoding the hostname into the libtool script, this isn't | ||
5 | really adding much to debugging and most distros are carrying such a patch now as | ||
6 | reproducibility is important. | ||
7 | |||
8 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
9 | |||
10 | https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ | ||
11 | no_hostname.patch | ||
12 | |||
13 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd826173c4c9c3fa8d77d92785754897cb4bfd89] | ||
14 | |||
15 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 | ||
16 | index 3794130..84a550c 100644 | ||
17 | --- a/m4/libtool.m4 | ||
18 | +++ b/m4/libtool.m4 | ||
19 | @@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([ | ||
20 | cat <<_LT_EOF >> "$cfgfile" | ||
21 | #! $SHELL | ||
22 | # Generated automatically by $as_me ($PACKAGE) $VERSION | ||
23 | -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: | ||
24 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. | ||
25 | |||
26 | # Provide generalized library-building support services. | ||
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/meta/recipes-devtools/libtool/libtool/filefix.patch b/meta/recipes-devtools/libtool/libtool/filefix.patch new file mode 100644 index 0000000000..4d85132954 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/filefix.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | [PATCH] libtool.m4: Fix AC_CHECK_PROG usage | ||
2 | |||
3 | In commit: | ||
4 | |||
5 | https://git.savannah.gnu.org/cgit/libtool.git/commit/m4/libtool.m4?id=64bef5ba65f6820cd5f88e5249324b4f5955ee25 | ||
6 | |||
7 | AC_CHECK_TOOL was changed to AC_CHECK_PROG however the arguments are | ||
8 | different and this result is a value of ":". Change this to match the | ||
9 | original intent. | ||
10 | |||
11 | The lack of FILECMD was causing failures for mips64 builds as -m elf was | ||
12 | being passed to LD which isn't supported on our targets. | ||
13 | |||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-06/msg00000.html] | ||
15 | |||
16 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
17 | |||
18 | Index: libtool-2.5.0/m4/libtool.m4 | ||
19 | =================================================================== | ||
20 | --- libtool-2.5.0.orig/m4/libtool.m4 | ||
21 | +++ libtool-2.5.0/m4/libtool.m4 | ||
22 | @@ -8216,7 +8216,7 @@ AC_SUBST([DLLTOOL]) | ||
23 | # ---------------- | ||
24 | # Check for a file(cmd) program that can be used to detect file type and magic | ||
25 | m4_defun([_LT_DECL_FILECMD], | ||
26 | -[AC_CHECK_PROG([FILECMD], [file], [:]) | ||
27 | +[AC_CHECK_PROG([FILECMD], [file], [file], [:]) | ||
28 | _LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) | ||
29 | ])# _LD_DECL_FILECMD | ||
30 | |||
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.7.bb b/meta/recipes-devtools/libtool/libtool_2.5.0.bb index 44a4950574..44a4950574 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.7.bb +++ b/meta/recipes-devtools/libtool/libtool_2.5.0.bb | |||
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb index 86c55ded7b..ddb60e717c 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb | |||
@@ -9,13 +9,6 @@ inherit nativesdk | |||
9 | S = "${WORKDIR}/libtool-${PV}" | 9 | S = "${WORKDIR}/libtool-${PV}" |
10 | FILES:${PN} += "${datadir}/libtool/*" | 10 | FILES:${PN} += "${datadir}/libtool/*" |
11 | 11 | ||
12 | do_configure:prepend () { | ||
13 | # Remove any existing libtool m4 since old stale versions would break | ||
14 | # any upgrade | ||
15 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
16 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
17 | } | ||
18 | |||
19 | do_install () { | 12 | do_install () { |
20 | autotools_do_install | 13 | autotools_do_install |
21 | install -d ${D}${bindir}/ | 14 | install -d ${D}${bindir}/ |
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_18.1.6.bb index 296180ea45..189f5b1146 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_18.1.6.bb | |||
@@ -13,27 +13,26 @@ DEPENDS = "libffi libxml2 zlib zstd libedit ninja-native llvm-native" | |||
13 | RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" | 13 | RDEPENDS:${PN}:append:class-target = " ncurses-terminfo" |
14 | 14 | ||
15 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
16 | |||
17 | # could be 'rcX' or 'git' or empty ( for release ) | 16 | # could be 'rcX' or 'git' or empty ( for release ) |
18 | VER_SUFFIX = "" | 17 | VER_SUFFIX = "" |
19 | 18 | ||
20 | PV = "18.1.4${VER_SUFFIX}" | 19 | PV .= "${VER_SUFFIX}" |
21 | 20 | ||
22 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | 21 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" |
23 | 22 | ||
24 | LLVM_RELEASE = "${PV}" | 23 | LLVM_RELEASE = "${PV}" |
25 | 24 | ||
26 | BRANCH = "release/${MAJOR_VERSION}.x" | 25 | SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/llvm-project-${PV}.src.tar.xz \ |
27 | SRCREV = "e6c3289804a67ea0bb6a86fadbe454dd93b8d855" | ||
28 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ | ||
29 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ | 26 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ |
30 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ | 27 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ |
31 | file://llvm-config \ | 28 | file://llvm-config \ |
32 | " | 29 | " |
30 | SRC_URI[sha256sum] = "bd4b4cb6374bcd5fc5a3ba60cb80425d29da34f316b8821abc12c0db225cf6b4" | ||
33 | 31 | ||
34 | UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project" |
33 | UPSTREAM_CHECK_REGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)" | ||
35 | 34 | ||
36 | S = "${WORKDIR}/git/llvm" | 35 | S = "${WORKDIR}/llvm-project-${PV}.src/llvm" |
37 | 36 | ||
38 | LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" | 37 | LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" |
39 | 38 | ||
diff --git a/meta/recipes-devtools/lua/lua_5.4.6.bb b/meta/recipes-devtools/lua/lua_5.4.6.bb index 65f19ae247..17dc8fb17d 100644 --- a/meta/recipes-devtools/lua/lua_5.4.6.bb +++ b/meta/recipes-devtools/lua/lua_5.4.6.bb | |||
@@ -51,7 +51,7 @@ do_install () { | |||
51 | } | 51 | } |
52 | 52 | ||
53 | do_install_ptest () { | 53 | do_install_ptest () { |
54 | cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test | 54 | cp -R --no-dereference --preserve=mode,links -v ${UNPACKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test |
55 | } | 55 | } |
56 | 56 | ||
57 | do_install_ptest:append:libc-musl () { | 57 | do_install_ptest:append:libc-musl () { |
diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb index 0d6c7a01eb..7b11093364 100644 --- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb +++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb | |||
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://makedevs.c;beginline=2;endline=2;md5=c3817b10013a3007 | |||
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | SRC_URI = "file://makedevs.c" | 6 | SRC_URI = "file://makedevs.c" |
7 | 7 | ||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}/sources" |
9 | UNPACKDIR = "${S}" | ||
9 | 10 | ||
10 | FILES:${PN}:append:class-nativesdk = " ${datadir}" | 11 | FILES:${PN}:append:class-nativesdk = " ${datadir}" |
11 | 12 | ||
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index 8ea7c35950..94129b2f25 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch | |||
@@ -1,21 +1,20 @@ | |||
1 | From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 | 1 | From c61c93f43b70ba0670d41e841bff9f2a7186cc2f Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
4 | Subject: [PATCH] Make CPU family warnings fatal | 4 | Subject: [PATCH] Make CPU family warnings fatal |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | |||
9 | --- | 8 | --- |
10 | mesonbuild/envconfig.py | 4 ++-- | 9 | mesonbuild/envconfig.py | 4 ++-- |
11 | mesonbuild/environment.py | 6 ++---- | 10 | mesonbuild/environment.py | 6 ++---- |
12 | 2 files changed, 4 insertions(+), 6 deletions(-) | 11 | 2 files changed, 4 insertions(+), 6 deletions(-) |
13 | 12 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 13 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index 07f1229..a35c356 100644 | 14 | index 0e9cd23..b44e60c 100644 |
16 | --- a/mesonbuild/envconfig.py | 15 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 16 | +++ b/mesonbuild/envconfig.py |
18 | @@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): | 17 | @@ -276,8 +276,8 @@ class MachineInfo(HoldableObject): |
19 | 'but is missing {}.'.format(minimum_literal - set(literal))) | 18 | 'but is missing {}.'.format(minimum_literal - set(literal))) |
20 | 19 | ||
21 | cpu_family = literal['cpu_family'] | 20 | cpu_family = literal['cpu_family'] |
@@ -27,10 +26,10 @@ index 07f1229..a35c356 100644 | |||
27 | endian = literal['endian'] | 26 | endian = literal['endian'] |
28 | if endian not in ('little', 'big'): | 27 | if endian not in ('little', 'big'): |
29 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 28 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
30 | index 2ba2054..d798e3b 100644 | 29 | index af69f64..248d6dd 100644 |
31 | --- a/mesonbuild/environment.py | 30 | --- a/mesonbuild/environment.py |
32 | +++ b/mesonbuild/environment.py | 31 | +++ b/mesonbuild/environment.py |
33 | @@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 32 | @@ -379,10 +379,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
34 | if compilers and not any_compiler_has_define(compilers, '__mips64'): | 33 | if compilers and not any_compiler_has_define(compilers, '__mips64'): |
35 | trial = 'mips' | 34 | trial = 'mips' |
36 | 35 | ||
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index 2e0a4b1bbe..9f3f516a5c 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e85683698aa3556bf14fc6d35f2c067f16af520b Mon Sep 17 00:00:00 2001 | 1 | From b4c0602a56d3517ab66b98a7dbb69defe77d29a3 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 | 3 | Date: Mon, 19 Nov 2018 14:24:26 +0100 |
4 | Subject: [PATCH] python module: do not manipulate the environment when calling | 4 | Subject: [PATCH] python module: do not manipulate the environment when calling |
@@ -6,16 +6,15 @@ Subject: [PATCH] python module: do not manipulate the environment when calling | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [oe-core specific] | 7 | Upstream-Status: Inappropriate [oe-core specific] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | |||
10 | --- | 9 | --- |
11 | mesonbuild/dependencies/python.py | 6 +----- | 10 | mesonbuild/dependencies/python.py | 6 +----- |
12 | 1 file changed, 1 insertion(+), 5 deletions(-) | 11 | 1 file changed, 1 insertion(+), 5 deletions(-) |
13 | 12 | ||
14 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py | 13 | diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py |
15 | index 9aea6bd..8c13ede 100644 | 14 | index b9b17f8..a305afb 100644 |
16 | --- a/mesonbuild/dependencies/python.py | 15 | --- a/mesonbuild/dependencies/python.py |
17 | +++ b/mesonbuild/dependencies/python.py | 16 | +++ b/mesonbuild/dependencies/python.py |
18 | @@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 17 | @@ -381,9 +381,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
19 | empty.name = 'python' | 18 | empty.name = 'python' |
20 | return empty | 19 | return empty |
21 | 20 | ||
@@ -25,7 +24,7 @@ index 9aea6bd..8c13ede 100644 | |||
25 | try: | 24 | try: |
26 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) | 25 | return PythonPkgConfigDependency(name, env, kwargs, installation, True) |
27 | finally: | 26 | finally: |
28 | @@ -391,8 +388,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', | 27 | @@ -392,8 +389,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', |
29 | os.environ[name] = value | 28 | os.environ[name] = value |
30 | elif name in os.environ: | 29 | elif name in os.environ: |
31 | del os.environ[name] | 30 | del os.environ[name] |
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index a8396f30bb..fa5ea57d5b 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 | 1 | From 7f69bfabb87d311d7409ea6699f7dee8e9b3a95b Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <pkj@axis.com> | 2 | From: Peter Kjellerstedt <pkj@axis.com> |
3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 | 3 | Date: Thu, 26 Jul 2018 16:32:49 +0200 |
4 | Subject: [PATCH] Support building allarch recipes again | 4 | Subject: [PATCH] Support building allarch recipes again |
@@ -7,16 +7,15 @@ This registers "allarch" as a known CPU family. | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [OE specific] | 8 | Upstream-Status: Inappropriate [OE specific] |
9 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 9 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
10 | |||
11 | --- | 10 | --- |
12 | mesonbuild/envconfig.py | 1 + | 11 | mesonbuild/envconfig.py | 1 + |
13 | 1 file changed, 1 insertion(+) | 12 | 1 file changed, 1 insertion(+) |
14 | 13 | ||
15 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
16 | index a35c356..436355f 100644 | 15 | index b44e60c..c70e8cb 100644 |
17 | --- a/mesonbuild/envconfig.py | 16 | --- a/mesonbuild/envconfig.py |
18 | +++ b/mesonbuild/envconfig.py | 17 | +++ b/mesonbuild/envconfig.py |
19 | @@ -38,6 +38,7 @@ from pathlib import Path | 18 | @@ -28,6 +28,7 @@ from pathlib import Path |
20 | 19 | ||
21 | 20 | ||
22 | known_cpu_families = ( | 21 | known_cpu_families = ( |
diff --git a/meta/recipes-devtools/meson/meson_1.3.1.bb b/meta/recipes-devtools/meson/meson_1.4.0.bb index 3d2eedca10..5db100ff1c 100644 --- a/meta/recipes-devtools/meson/meson_1.3.1.bb +++ b/meta/recipes-devtools/meson/meson_1.4.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ | |||
15 | file://0001-Make-CPU-family-warnings-fatal.patch \ | 15 | file://0001-Make-CPU-family-warnings-fatal.patch \ |
16 | file://0002-Support-building-allarch-recipes-again.patch \ | 16 | file://0002-Support-building-allarch-recipes-again.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7" | 18 | SRC_URI[sha256sum] = "8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d" |
19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" |
20 | 20 | ||
21 | inherit python_setuptools_build_meta github-releases | 21 | inherit python_setuptools_build_meta github-releases |
@@ -86,7 +86,7 @@ ar = ${@meson_array('BUILD_AR', d)} | |||
86 | nm = ${@meson_array('BUILD_NM', d)} | 86 | nm = ${@meson_array('BUILD_NM', d)} |
87 | strip = ${@meson_array('BUILD_STRIP', d)} | 87 | strip = ${@meson_array('BUILD_STRIP', d)} |
88 | readelf = ${@meson_array('BUILD_READELF', d)} | 88 | readelf = ${@meson_array('BUILD_READELF', d)} |
89 | pkgconfig = 'pkg-config-native' | 89 | pkg-config = 'pkg-config-native' |
90 | 90 | ||
91 | [built-in options] | 91 | [built-in options] |
92 | c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}] | 92 | c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}] |
@@ -104,7 +104,7 @@ cpp = @CXX | |||
104 | ar = @AR | 104 | ar = @AR |
105 | nm = @NM | 105 | nm = @NM |
106 | strip = @STRIP | 106 | strip = @STRIP |
107 | pkgconfig = 'pkg-config' | 107 | pkg-config = 'pkg-config' |
108 | 108 | ||
109 | [built-in options] | 109 | [built-in options] |
110 | c_args = @CFLAGS | 110 | c_args = @CFLAGS |
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index a7e4d369ff..0bfd5c1cc8 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb | |||
@@ -1,15 +1,15 @@ | |||
1 | SUMMARY = "Userspace tools for MMC/SD devices" | 1 | SUMMARY = "Userspace tools for MMC/SD devices" |
2 | HOMEPAGE = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/" | 2 | HOMEPAGE = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/" |
3 | DESCRIPTION = "${SUMMARY}" | 3 | DESCRIPTION = "${SUMMARY}" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" | 5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" |
6 | 6 | ||
7 | SRCBRANCH ?= "master" | 7 | SRCBRANCH ?= "master" |
8 | SRCREV = "b5ca140312d279ad2f22068fd72a6230eea13436" | 8 | SRCREV = "f757f413dea4a143ad7c3b48b8264176f0499a82" |
9 | 9 | ||
10 | PV = "0.1+git" | 10 | PV = "0.1+git" |
11 | 11 | ||
12 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${SRCBRANCH};protocol=https" | 12 | SRC_URI = "git://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;branch=${SRCBRANCH};protocol=https" |
13 | UPSTREAM_CHECK_COMMITS = "1" | 13 | UPSTREAM_CHECK_COMMITS = "1" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/nasm/nasm_2.16.01.bb b/meta/recipes-devtools/nasm/nasm_2.16.03.bb index 219cc49360..281f3940e7 100644 --- a/meta/recipes-devtools/nasm/nasm_2.16.01.bb +++ b/meta/recipes-devtools/nasm/nasm_2.16.03.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 \ | |||
10 | file://0002-Add-debug-prefix-map-option.patch \ | 10 | file://0002-Add-debug-prefix-map-option.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "35b6ad2ee048d41c4779f073f3efca7762a822b7d2d4ef4e8df24cf65747bb2e" | 13 | SRC_URI[sha256sum] = "bef3de159bcd61adf98bb7cc87ee9046e944644ad76b7633f18ab063edb29e57" |
14 | 14 | ||
15 | EXTRA_AUTORECONF:append = " -I autoconf/m4" | 15 | EXTRA_AUTORECONF:append = " -I autoconf/m4" |
16 | 16 | ||
diff --git a/meta/recipes-devtools/ninja/ninja_1.12.0.bb b/meta/recipes-devtools/ninja/ninja_1.12.1.bb index ef7f80d0ae..9f5c014b9b 100644 --- a/meta/recipes-devtools/ninja/ninja_1.12.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.12.1.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" | |||
6 | 6 | ||
7 | DEPENDS = "re2c-native ninja-native" | 7 | DEPENDS = "re2c-native ninja-native" |
8 | 8 | ||
9 | SRCREV = "65d0dfcbbea6b8ca7d8a3a0f673ecb522379e43c" | 9 | SRCREV = "2daa09ba270b0a43e1929d29b073348aa985dfaa" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" | 11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" |
12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" |
diff --git a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb index 726a259a8c..4db35c1092 100644 --- a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb +++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb | |||
@@ -3,7 +3,8 @@ HOMEPAGE = "https://git.yoctoproject.org/opkg/" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 4 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
5 | 5 | ||
6 | S = "${WORKDIR}" | 6 | S = "${WORKDIR}/sources" |
7 | UNPACKDIR = "${S}" | ||
7 | 8 | ||
8 | do_compile() { | 9 | do_compile() { |
9 | mkdir -p ${S}/${sysconfdir}/opkg/ | 10 | mkdir -p ${S}/${sysconfdir}/opkg/ |
diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb b/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb index b41c182fad..48bda7e4b6 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb | |||
@@ -6,7 +6,7 @@ SECTION = "devel" | |||
6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
7 | # README.md is taken from https://github.com/arsv/perl-cross/blob/master/README.md | 7 | # README.md is taken from https://github.com/arsv/perl-cross/blob/master/README.md |
8 | # but is not provided inside the release tarballs | 8 | # but is not provided inside the release tarballs |
9 | LIC_FILES_CHKSUM = "file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b" | 9 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b" |
10 | 10 | ||
11 | inherit allarch github-releases | 11 | inherit allarch github-releases |
12 | 12 | ||
diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch index aa85ccef10..f2b1111552 100644 --- a/meta/recipes-devtools/perl/files/determinism.patch +++ b/meta/recipes-devtools/perl/files/determinism.patch | |||
@@ -8,9 +8,9 @@ b) Sort the order of the module lists from configure_mods.sh since otherwise | |||
8 | the result isn't the same leading to makefile differences. | 8 | the result isn't the same leading to makefile differences. |
9 | Reported upstream: https://github.com/arsv/perl-cross/issues/88 | 9 | Reported upstream: https://github.com/arsv/perl-cross/issues/88 |
10 | 10 | ||
11 | c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst | 11 | c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst |
12 | there for good measure) | 12 | there for good measure) |
13 | This needs to go to upstream perl (not done) | 13 | Submitted to upstream perl: https://github.com/dankogai/p5-encode/pull/179 |
14 | 14 | ||
15 | d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash | 15 | d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash |
16 | and "" with dash | 16 | and "" with dash |
@@ -18,7 +18,7 @@ d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with | |||
18 | 18 | ||
19 | RP 2020/2/7 | 19 | RP 2020/2/7 |
20 | 20 | ||
21 | Upstream-Status: Pending [75% submitted] | 21 | Upstream-Status: Submitted [see links above] |
22 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org | 22 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org |
23 | 23 | ||
24 | Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL | 24 | Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL |
diff --git a/meta/recipes-devtools/perl/perl_5.38.2.bb b/meta/recipes-devtools/perl/perl_5.38.2.bb index b6c9cda7ae..63909c242d 100644 --- a/meta/recipes-devtools/perl/perl_5.38.2.bb +++ b/meta/recipes-devtools/perl/perl_5.38.2.bb | |||
@@ -331,7 +331,7 @@ python split_perl_packages () { | |||
331 | d.setVar(d.expand("RDEPENDS:${PN}-modules"), ' '.join(packages)) | 331 | d.setVar(d.expand("RDEPENDS:${PN}-modules"), ' '.join(packages)) |
332 | 332 | ||
333 | # Read the pre-generated dependency file, and use it to set module dependecies | 333 | # Read the pre-generated dependency file, and use it to set module dependecies |
334 | for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): | 334 | for line in open(d.getVar("UNPACKDIR") + '/perl-rdepends.txt').readlines(): |
335 | splitline = line.split() | 335 | splitline = line.split() |
336 | # Filter empty lines and comments | 336 | # Filter empty lines and comments |
337 | if len(splitline) == 0 or splitline[0].startswith("#"): | 337 | if len(splitline) == 0 or splitline[0].startswith("#"): |
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index c70b509233..5f32b3777a 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb | |||
@@ -14,7 +14,7 @@ SRC_URI:append:class-nativesdk = " \ | |||
14 | file://older-glibc-symbols.patch" | 14 | file://older-glibc-symbols.patch" |
15 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" | 15 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" |
16 | 16 | ||
17 | SRCREV = "0d292df61aeb886ae8ca33d9edc3b6d0ff5c0f0f" | 17 | SRCREV = "e11ae91da7d0711f5e33ea9dfbf1875dde3c1734" |
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | PV = "1.9.0+git" | 19 | PV = "1.9.0+git" |
20 | 20 | ||
diff --git a/meta/recipes-devtools/python/python3-bcrypt-crates.inc b/meta/recipes-devtools/python/python3-bcrypt-crates.inc index 0e7479f0b5..7d9e1f3b59 100644 --- a/meta/recipes-devtools/python/python3-bcrypt-crates.inc +++ b/meta/recipes-devtools/python/python3-bcrypt-crates.inc | |||
@@ -2,113 +2,115 @@ | |||
2 | 2 | ||
3 | # from src/_bcrypt/Cargo.lock | 3 | # from src/_bcrypt/Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/autocfg/1.1.0 \ | 5 | crate://crates.io/autocfg/1.3.0 \ |
6 | crate://crates.io/base64/0.21.5 \ | 6 | crate://crates.io/base64/0.22.1 \ |
7 | crate://crates.io/bcrypt/0.15.0 \ | 7 | crate://crates.io/bcrypt/0.15.1 \ |
8 | crate://crates.io/bcrypt-pbkdf/0.10.0 \ | 8 | crate://crates.io/bcrypt-pbkdf/0.10.0 \ |
9 | crate://crates.io/bitflags/1.3.2 \ | 9 | crate://crates.io/bitflags/2.5.0 \ |
10 | crate://crates.io/block-buffer/0.10.4 \ | 10 | crate://crates.io/block-buffer/0.10.4 \ |
11 | crate://crates.io/blowfish/0.9.1 \ | 11 | crate://crates.io/blowfish/0.9.1 \ |
12 | crate://crates.io/byteorder/1.5.0 \ | 12 | crate://crates.io/byteorder/1.5.0 \ |
13 | crate://crates.io/cfg-if/1.0.0 \ | 13 | crate://crates.io/cfg-if/1.0.0 \ |
14 | crate://crates.io/cipher/0.4.4 \ | 14 | crate://crates.io/cipher/0.4.4 \ |
15 | crate://crates.io/cpufeatures/0.2.11 \ | 15 | crate://crates.io/cpufeatures/0.2.12 \ |
16 | crate://crates.io/crypto-common/0.1.6 \ | 16 | crate://crates.io/crypto-common/0.1.6 \ |
17 | crate://crates.io/digest/0.10.7 \ | 17 | crate://crates.io/digest/0.10.7 \ |
18 | crate://crates.io/generic-array/0.14.7 \ | 18 | crate://crates.io/generic-array/0.14.7 \ |
19 | crate://crates.io/getrandom/0.2.11 \ | 19 | crate://crates.io/getrandom/0.2.14 \ |
20 | crate://crates.io/heck/0.4.1 \ | 20 | crate://crates.io/heck/0.4.1 \ |
21 | crate://crates.io/indoc/2.0.4 \ | 21 | crate://crates.io/indoc/2.0.5 \ |
22 | crate://crates.io/inout/0.1.3 \ | 22 | crate://crates.io/inout/0.1.3 \ |
23 | crate://crates.io/libc/0.2.151 \ | 23 | crate://crates.io/libc/0.2.154 \ |
24 | crate://crates.io/lock_api/0.4.11 \ | 24 | crate://crates.io/lock_api/0.4.12 \ |
25 | crate://crates.io/memoffset/0.9.0 \ | 25 | crate://crates.io/memoffset/0.9.1 \ |
26 | crate://crates.io/once_cell/1.19.0 \ | 26 | crate://crates.io/once_cell/1.19.0 \ |
27 | crate://crates.io/parking_lot/0.12.1 \ | 27 | crate://crates.io/parking_lot/0.12.2 \ |
28 | crate://crates.io/parking_lot_core/0.9.9 \ | 28 | crate://crates.io/parking_lot_core/0.9.10 \ |
29 | crate://crates.io/pbkdf2/0.12.2 \ | 29 | crate://crates.io/pbkdf2/0.12.2 \ |
30 | crate://crates.io/portable-atomic/1.6.0 \ | 30 | crate://crates.io/portable-atomic/1.6.0 \ |
31 | crate://crates.io/proc-macro2/1.0.70 \ | 31 | crate://crates.io/proc-macro2/1.0.81 \ |
32 | crate://crates.io/pyo3/0.20.3 \ | 32 | crate://crates.io/pyo3/0.21.2 \ |
33 | crate://crates.io/pyo3-build-config/0.20.3 \ | 33 | crate://crates.io/pyo3-build-config/0.21.2 \ |
34 | crate://crates.io/pyo3-ffi/0.20.3 \ | 34 | crate://crates.io/pyo3-ffi/0.21.2 \ |
35 | crate://crates.io/pyo3-macros/0.20.3 \ | 35 | crate://crates.io/pyo3-macros/0.21.2 \ |
36 | crate://crates.io/pyo3-macros-backend/0.20.3 \ | 36 | crate://crates.io/pyo3-macros-backend/0.21.2 \ |
37 | crate://crates.io/quote/1.0.33 \ | 37 | crate://crates.io/quote/1.0.36 \ |
38 | crate://crates.io/redox_syscall/0.4.1 \ | 38 | crate://crates.io/redox_syscall/0.5.1 \ |
39 | crate://crates.io/scopeguard/1.2.0 \ | 39 | crate://crates.io/scopeguard/1.2.0 \ |
40 | crate://crates.io/sha2/0.10.8 \ | 40 | crate://crates.io/sha2/0.10.8 \ |
41 | crate://crates.io/smallvec/1.11.2 \ | 41 | crate://crates.io/smallvec/1.13.2 \ |
42 | crate://crates.io/subtle/2.5.0 \ | 42 | crate://crates.io/subtle/2.5.0 \ |
43 | crate://crates.io/syn/2.0.41 \ | 43 | crate://crates.io/syn/2.0.60 \ |
44 | crate://crates.io/target-lexicon/0.12.12 \ | 44 | crate://crates.io/target-lexicon/0.12.14 \ |
45 | crate://crates.io/typenum/1.17.0 \ | 45 | crate://crates.io/typenum/1.17.0 \ |
46 | crate://crates.io/unicode-ident/1.0.12 \ | 46 | crate://crates.io/unicode-ident/1.0.12 \ |
47 | crate://crates.io/unindent/0.2.3 \ | 47 | crate://crates.io/unindent/0.2.3 \ |
48 | crate://crates.io/version_check/0.9.4 \ | 48 | crate://crates.io/version_check/0.9.4 \ |
49 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 49 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
50 | crate://crates.io/windows-targets/0.48.5 \ | 50 | crate://crates.io/windows-targets/0.52.5 \ |
51 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ | 51 | crate://crates.io/windows_aarch64_gnullvm/0.52.5 \ |
52 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ | 52 | crate://crates.io/windows_aarch64_msvc/0.52.5 \ |
53 | crate://crates.io/windows_i686_gnu/0.48.5 \ | 53 | crate://crates.io/windows_i686_gnu/0.52.5 \ |
54 | crate://crates.io/windows_i686_msvc/0.48.5 \ | 54 | crate://crates.io/windows_i686_gnullvm/0.52.5 \ |
55 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ | 55 | crate://crates.io/windows_i686_msvc/0.52.5 \ |
56 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ | 56 | crate://crates.io/windows_x86_64_gnu/0.52.5 \ |
57 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ | 57 | crate://crates.io/windows_x86_64_gnullvm/0.52.5 \ |
58 | crate://crates.io/windows_x86_64_msvc/0.52.5 \ | ||
58 | crate://crates.io/zeroize/1.7.0 \ | 59 | crate://crates.io/zeroize/1.7.0 \ |
59 | " | 60 | " |
60 | 61 | ||
61 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 62 | SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" |
62 | SRC_URI[base64-0.21.5.sha256sum] = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" | 63 | SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" |
63 | SRC_URI[bcrypt-0.15.0.sha256sum] = "28d1c9c15093eb224f0baa400f38fcd713fc1391a6f1c389d886beef146d60a3" | 64 | SRC_URI[bcrypt-0.15.1.sha256sum] = "e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7" |
64 | SRC_URI[bcrypt-pbkdf-0.10.0.sha256sum] = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2" | 65 | SRC_URI[bcrypt-pbkdf-0.10.0.sha256sum] = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2" |
65 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 66 | SRC_URI[bitflags-2.5.0.sha256sum] = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" |
66 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" | 67 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" |
67 | SRC_URI[blowfish-0.9.1.sha256sum] = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" | 68 | SRC_URI[blowfish-0.9.1.sha256sum] = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" |
68 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | 69 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" |
69 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 70 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
70 | SRC_URI[cipher-0.4.4.sha256sum] = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" | 71 | SRC_URI[cipher-0.4.4.sha256sum] = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" |
71 | SRC_URI[cpufeatures-0.2.11.sha256sum] = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" | 72 | SRC_URI[cpufeatures-0.2.12.sha256sum] = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" |
72 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" | 73 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" |
73 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 74 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
74 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | 75 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" |
75 | SRC_URI[getrandom-0.2.11.sha256sum] = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" | 76 | SRC_URI[getrandom-0.2.14.sha256sum] = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" |
76 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" | 77 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" |
77 | SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" | 78 | SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" |
78 | SRC_URI[inout-0.1.3.sha256sum] = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" | 79 | SRC_URI[inout-0.1.3.sha256sum] = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" |
79 | SRC_URI[libc-0.2.151.sha256sum] = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" | 80 | SRC_URI[libc-0.2.154.sha256sum] = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" |
80 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" | 81 | SRC_URI[lock_api-0.4.12.sha256sum] = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" |
81 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" | 82 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" |
82 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 83 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
83 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 84 | SRC_URI[parking_lot-0.12.2.sha256sum] = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" |
84 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 85 | SRC_URI[parking_lot_core-0.9.10.sha256sum] = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" |
85 | SRC_URI[pbkdf2-0.12.2.sha256sum] = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" | 86 | SRC_URI[pbkdf2-0.12.2.sha256sum] = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" |
86 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | 87 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
87 | SRC_URI[proc-macro2-1.0.70.sha256sum] = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" | 88 | SRC_URI[proc-macro2-1.0.81.sha256sum] = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" |
88 | SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" | 89 | SRC_URI[pyo3-0.21.2.sha256sum] = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" |
89 | SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" | 90 | SRC_URI[pyo3-build-config-0.21.2.sha256sum] = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" |
90 | SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" | 91 | SRC_URI[pyo3-ffi-0.21.2.sha256sum] = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" |
91 | SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" | 92 | SRC_URI[pyo3-macros-0.21.2.sha256sum] = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" |
92 | SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" | 93 | SRC_URI[pyo3-macros-backend-0.21.2.sha256sum] = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" |
93 | SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" | 94 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" |
94 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" | 95 | SRC_URI[redox_syscall-0.5.1.sha256sum] = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" |
95 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 96 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
96 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" | 97 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" |
97 | SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" | 98 | SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" |
98 | SRC_URI[subtle-2.5.0.sha256sum] = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" | 99 | SRC_URI[subtle-2.5.0.sha256sum] = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" |
99 | SRC_URI[syn-2.0.41.sha256sum] = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" | 100 | SRC_URI[syn-2.0.60.sha256sum] = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" |
100 | SRC_URI[target-lexicon-0.12.12.sha256sum] = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" | 101 | SRC_URI[target-lexicon-0.12.14.sha256sum] = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" |
101 | SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" | 102 | SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" |
102 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" | 103 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" |
103 | SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" | 104 | SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" |
104 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" | 105 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" |
105 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 106 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
106 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" | 107 | SRC_URI[windows-targets-0.52.5.sha256sum] = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" |
107 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" | 108 | SRC_URI[windows_aarch64_gnullvm-0.52.5.sha256sum] = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" |
108 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" | 109 | SRC_URI[windows_aarch64_msvc-0.52.5.sha256sum] = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" |
109 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" | 110 | SRC_URI[windows_i686_gnu-0.52.5.sha256sum] = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" |
110 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" | 111 | SRC_URI[windows_i686_gnullvm-0.52.5.sha256sum] = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" |
111 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" | 112 | SRC_URI[windows_i686_msvc-0.52.5.sha256sum] = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" |
112 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" | 113 | SRC_URI[windows_x86_64_gnu-0.52.5.sha256sum] = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" |
113 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" | 114 | SRC_URI[windows_x86_64_gnullvm-0.52.5.sha256sum] = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" |
115 | SRC_URI[windows_x86_64_msvc-0.52.5.sha256sum] = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" | ||
114 | SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" | 116 | SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" |
diff --git a/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch b/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch deleted file mode 100644 index 3f671fcc98..0000000000 --- a/meta/recipes-devtools/python/python3-bcrypt/0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | From cfdd98b3215cc12e66190a9c7f0a32c052e3c2e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 26 Feb 2024 18:26:30 -0800 | ||
4 | Subject: [PATCH] Bump pyo3 from 0.20.0 to 0.20.3 in /src/_bcrypt (#746) | ||
5 | |||
6 | It fixes build on hosts without 64bit atomics | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/pyca/bcrypt/commit/c2ef9350798ab59b18e8a0e04a01389858578fe0] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/_bcrypt/Cargo.lock | 22 ++++++++++++++-------- | ||
12 | src/_bcrypt/Cargo.toml | 2 +- | ||
13 | 2 files changed, 15 insertions(+), 9 deletions(-) | ||
14 | |||
15 | --- a/src/_bcrypt/Cargo.lock | ||
16 | +++ b/src/_bcrypt/Cargo.lock | ||
17 | @@ -233,6 +233,12 @@ dependencies = [ | ||
18 | ] | ||
19 | |||
20 | [[package]] | ||
21 | +name = "portable-atomic" | ||
22 | +version = "1.6.0" | ||
23 | +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
24 | +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | ||
25 | + | ||
26 | +[[package]] | ||
27 | name = "proc-macro2" | ||
28 | version = "1.0.70" | ||
29 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
30 | @@ -243,15 +249,16 @@ dependencies = [ | ||
31 | |||
32 | [[package]] | ||
33 | name = "pyo3" | ||
34 | -version = "0.20.0" | ||
35 | +version = "0.20.3" | ||
36 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
37 | -checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" | ||
38 | +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" | ||
39 | dependencies = [ | ||
40 | "cfg-if", | ||
41 | "indoc", | ||
42 | "libc", | ||
43 | "memoffset", | ||
44 | "parking_lot", | ||
45 | + "portable-atomic", | ||
46 | "pyo3-build-config", | ||
47 | "pyo3-ffi", | ||
48 | "pyo3-macros", | ||
49 | @@ -260,9 +267,9 @@ dependencies = [ | ||
50 | |||
51 | [[package]] | ||
52 | name = "pyo3-build-config" | ||
53 | -version = "0.20.0" | ||
54 | +version = "0.20.3" | ||
55 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
56 | -checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" | ||
57 | +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" | ||
58 | dependencies = [ | ||
59 | "once_cell", | ||
60 | "target-lexicon", | ||
61 | @@ -270,9 +277,9 @@ dependencies = [ | ||
62 | |||
63 | [[package]] | ||
64 | name = "pyo3-ffi" | ||
65 | -version = "0.20.0" | ||
66 | +version = "0.20.3" | ||
67 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
68 | -checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" | ||
69 | +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" | ||
70 | dependencies = [ | ||
71 | "libc", | ||
72 | "pyo3-build-config", | ||
73 | @@ -280,9 +287,9 @@ dependencies = [ | ||
74 | |||
75 | [[package]] | ||
76 | name = "pyo3-macros" | ||
77 | -version = "0.20.0" | ||
78 | +version = "0.20.3" | ||
79 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
80 | -checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" | ||
81 | +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" | ||
82 | dependencies = [ | ||
83 | "proc-macro2", | ||
84 | "pyo3-macros-backend", | ||
85 | @@ -292,12 +299,13 @@ dependencies = [ | ||
86 | |||
87 | [[package]] | ||
88 | name = "pyo3-macros-backend" | ||
89 | -version = "0.20.0" | ||
90 | +version = "0.20.3" | ||
91 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
92 | -checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" | ||
93 | +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" | ||
94 | dependencies = [ | ||
95 | "heck", | ||
96 | "proc-macro2", | ||
97 | + "pyo3-build-config", | ||
98 | "quote", | ||
99 | "syn", | ||
100 | ] | ||
101 | --- a/src/_bcrypt/Cargo.toml | ||
102 | +++ b/src/_bcrypt/Cargo.toml | ||
103 | @@ -6,7 +6,7 @@ edition = "2018" | ||
104 | publish = false | ||
105 | |||
106 | [dependencies] | ||
107 | -pyo3 = { version = "0.20.0", features = ["abi3"] } | ||
108 | +pyo3 = { version = "0.20.3", features = ["abi3"] } | ||
109 | bcrypt = "0.15" | ||
110 | bcrypt-pbkdf = "0.10.0" | ||
111 | base64 = "0.21.5" | ||
diff --git a/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb b/meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb index 93fa645f33..deb5cbdee3 100644 --- a/meta/recipes-devtools/python/python3-bcrypt_4.1.2.bb +++ b/meta/recipes-devtools/python/python3-bcrypt_4.1.3.bb | |||
@@ -6,12 +6,11 @@ HOMEPAGE = "https://pypi.org/project/bcrypt/" | |||
6 | DEPENDS += "python3-cffi-native" | 6 | DEPENDS += "python3-cffi-native" |
7 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' -fuse-ld=bfd', '', d)}" | 7 | LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' -fuse-ld=bfd', '', d)}" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac7a1258" | 9 | SRC_URI[sha256sum] = "2ee15dd749f5952fe3f0430d0ff6b74082e159c50332a1413d51b5689cf06623" |
10 | 10 | ||
11 | inherit pypi python_setuptools3_rust ptest-cargo cargo-update-recipe-crates | 11 | inherit pypi python_setuptools3_rust ptest-cargo cargo-update-recipe-crates |
12 | 12 | ||
13 | SRC_URI += " \ | 13 | SRC_URI += " \ |
14 | file://0001-Bump-pyo3-from-0.20.0-to-0.20.3-in-src-_bcrypt-746.patch \ | ||
15 | file://run-ptest \ | 14 | file://run-ptest \ |
16 | " | 15 | " |
17 | 16 | ||
@@ -33,5 +32,4 @@ RDEPENDS:${PN}:class-target += "\ | |||
33 | python3-cffi \ | 32 | python3-cffi \ |
34 | python3-ctypes \ | 33 | python3-ctypes \ |
35 | python3-shell \ | 34 | python3-shell \ |
36 | python3-six \ | ||
37 | " | 35 | " |
diff --git a/meta/recipes-devtools/python/python3-cryptography-crates.inc b/meta/recipes-devtools/python/python3-cryptography-crates.inc index b26e22b70c..dbeda05dc4 100644 --- a/meta/recipes-devtools/python/python3-cryptography-crates.inc +++ b/meta/recipes-devtools/python/python3-cryptography-crates.inc | |||
@@ -18,9 +18,9 @@ SRC_URI += " \ | |||
18 | crate://crates.io/lock_api/0.4.11 \ | 18 | crate://crates.io/lock_api/0.4.11 \ |
19 | crate://crates.io/memoffset/0.9.0 \ | 19 | crate://crates.io/memoffset/0.9.0 \ |
20 | crate://crates.io/once_cell/1.19.0 \ | 20 | crate://crates.io/once_cell/1.19.0 \ |
21 | crate://crates.io/openssl/0.10.63 \ | 21 | crate://crates.io/openssl/0.10.64 \ |
22 | crate://crates.io/openssl-macros/0.1.1 \ | 22 | crate://crates.io/openssl-macros/0.1.1 \ |
23 | crate://crates.io/openssl-sys/0.9.99 \ | 23 | crate://crates.io/openssl-sys/0.9.102 \ |
24 | crate://crates.io/parking_lot/0.12.1 \ | 24 | crate://crates.io/parking_lot/0.12.1 \ |
25 | crate://crates.io/parking_lot_core/0.9.9 \ | 25 | crate://crates.io/parking_lot_core/0.9.9 \ |
26 | crate://crates.io/pem/3.0.3 \ | 26 | crate://crates.io/pem/3.0.3 \ |
@@ -68,9 +68,9 @@ SRC_URI[libc-0.2.152.sha256sum] = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb0 | |||
68 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" | 68 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" |
69 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" | 69 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" |
70 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 70 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
71 | SRC_URI[openssl-0.10.63.sha256sum] = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" | 71 | SRC_URI[openssl-0.10.64.sha256sum] = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" |
72 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" | 72 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" |
73 | SRC_URI[openssl-sys-0.9.99.sha256sum] = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" | 73 | SRC_URI[openssl-sys-0.9.102.sha256sum] = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" |
74 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 74 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
75 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 75 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" |
76 | SRC_URI[pem-3.0.3.sha256sum] = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" | 76 | SRC_URI[pem-3.0.3.sha256sum] = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" |
diff --git a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb index ee522af08e..9a025a530c 100644 --- a/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.5.bb +++ b/meta/recipes-devtools/python/python3-cryptography-vectors_42.0.7.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ | |||
9 | # NOTE: Make sure to keep this recipe at the same version as python3-cryptography | 9 | # NOTE: Make sure to keep this recipe at the same version as python3-cryptography |
10 | # Upgrade both recipes at the same time | 10 | # Upgrade both recipes at the same time |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "505cd5e3b0cb32da1526f07042b7fc38a4b6c356710cb73d2b5f76b037a38ed1" | 12 | SRC_URI[sha256sum] = "8294c632dbe2cb14c7b7e24219560e674bc2224dfc4bed577ab077dbb82bfa3c" |
13 | 13 | ||
14 | PYPI_PACKAGE = "cryptography_vectors" | 14 | PYPI_PACKAGE = "cryptography_vectors" |
15 | 15 | ||
diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch index f9c8d1393d..ec4bfcc98b 100644 --- a/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch +++ b/meta/recipes-devtools/python/python3-cryptography/0001-pyproject.toml-remove-benchmark-disable-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b7dd3ce1d75d1e6255e1aca82aa7f401d4246a75 Mon Sep 17 00:00:00 2001 | 1 | From 18d78736f5c39784d5151b08fdfdd21c61225686 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Tue, 17 May 2022 17:22:48 +0800 | 3 | Date: Tue, 17 May 2022 17:22:48 +0800 |
4 | Subject: [PATCH] pyproject.toml: remove --benchmark-disable option | 4 | Subject: [PATCH] pyproject.toml: remove --benchmark-disable option |
@@ -26,7 +26,7 @@ Signed-off-by: Tim Orling <tim.orling@konsulko.com> | |||
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | 26 | 1 file changed, 1 insertion(+), 1 deletion(-) |
27 | 27 | ||
28 | diff --git a/pyproject.toml b/pyproject.toml | 28 | diff --git a/pyproject.toml b/pyproject.toml |
29 | index c9a7979bd..dec4b7157 100644 | 29 | index 4f0fa36..0d54ea6 100644 |
30 | --- a/pyproject.toml | 30 | --- a/pyproject.toml |
31 | +++ b/pyproject.toml | 31 | +++ b/pyproject.toml |
32 | @@ -92,7 +92,7 @@ rust-version = ">=1.63.0" | 32 | @@ -92,7 +92,7 @@ rust-version = ">=1.63.0" |
@@ -38,6 +38,3 @@ index c9a7979bd..dec4b7157 100644 | |||
38 | console_output_style = "progress-even-when-capture-no" | 38 | console_output_style = "progress-even-when-capture-no" |
39 | markers = [ | 39 | markers = [ |
40 | "skip_fips: this test is not executed in FIPS mode", | 40 | "skip_fips: this test is not executed in FIPS mode", |
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb b/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb index 732f925d92..5964400a04 100644 --- a/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb +++ b/meta/recipes-devtools/python/python3-cryptography_42.0.7.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \ | |||
8 | " | 8 | " |
9 | LDSHARED += "-pthread" | 9 | LDSHARED += "-pthread" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "6fe07eec95dfd477eb9530aef5bead34fec819b3aaf6c5bd6d20565da607bfe1" | 11 | SRC_URI[sha256sum] = "ecbfbc00bf55888edda9868a4cf927205de8499e7fabe6c050322298382953f2" |
12 | 12 | ||
13 | SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ | 13 | SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \ |
14 | file://check-memfree.py \ | 14 | file://check-memfree.py \ |
@@ -49,7 +49,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
49 | inherit ptest | 49 | inherit ptest |
50 | 50 | ||
51 | do_install_ptest() { | 51 | do_install_ptest() { |
52 | install -D ${WORKDIR}/check-memfree.py ${D}${PTEST_PATH}/ | 52 | install -D ${UNPACKDIR}/check-memfree.py ${D}${PTEST_PATH}/ |
53 | install -d ${D}${PTEST_PATH}/tests | 53 | install -d ${D}${PTEST_PATH}/tests |
54 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 54 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
55 | # remove test_x509.py as it needs benchmark and we don't | 55 | # remove test_x509.py as it needs benchmark and we don't |
diff --git a/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb b/meta/recipes-devtools/python/python3-hatchling_1.24.2.bb index fc8d953281..0ad545f448 100644 --- a/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb +++ b/meta/recipes-devtools/python/python3-hatchling_1.24.2.bb | |||
@@ -8,7 +8,7 @@ inherit pypi python_hatchling | |||
8 | DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" | 8 | DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" |
9 | DEPENDS:remove:class-native = "python3-hatchling-native" | 9 | DEPENDS:remove:class-native = "python3-hatchling-native" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "51f861891e98c4044eb455163a737e5d2328d7aa74890b182db2d80fee22a497" | 11 | SRC_URI[sha256sum] = "41ddc27cdb25db9ef7b68bef075f829c84cb349aa1bff8240797d012510547b0" |
12 | 12 | ||
13 | do_compile:prepend() { | 13 | do_compile:prepend() { |
14 | export PYTHONPATH=src | 14 | export PYTHONPATH=src |
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb b/meta/recipes-devtools/python/python3-hypothesis_6.103.0.bb index af7facfe7e..18ef7992a1 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.103.0.bb | |||
@@ -13,7 +13,7 @@ SRC_URI += " \ | |||
13 | file://test_rle.py \ | 13 | file://test_rle.py \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "ebff09d7fa4f1fb6a855a812baf17e578b4481b7b70ec6d96496210d1a4c6c35" | 16 | SRC_URI[sha256sum] = "7fe91917b99fc98ac150ec295775a687448c7c42c2276ab6e4a6969a4b285bb5" |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-attrs \ | 19 | python3-attrs \ |
@@ -32,8 +32,8 @@ RDEPENDS:${PN}-ptest += " \ | |||
32 | 32 | ||
33 | do_install_ptest() { | 33 | do_install_ptest() { |
34 | install -d ${D}${PTEST_PATH}/examples | 34 | install -d ${D}${PTEST_PATH}/examples |
35 | install -m 0755 ${WORKDIR}/test_binary_search.py ${D}${PTEST_PATH}/examples/ | 35 | install -m 0755 ${UNPACKDIR}/test_binary_search.py ${D}${PTEST_PATH}/examples/ |
36 | install -m 0755 ${WORKDIR}/test_rle.py ${D}${PTEST_PATH}/examples/ | 36 | install -m 0755 ${UNPACKDIR}/test_rle.py ${D}${PTEST_PATH}/examples/ |
37 | } | 37 | } |
38 | 38 | ||
39 | BBCLASSEXTEND = "native nativesdk" | 39 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.3.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb index 636fb35811..2c02037011 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.3.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb | |||
@@ -2,17 +2,17 @@ SUMMARY = "Python Jinja2: A small but fast and easy to use stand-alone template | |||
2 | HOMEPAGE = "https://pypi.org/project/Jinja2/" | 2 | HOMEPAGE = "https://pypi.org/project/Jinja2/" |
3 | 3 | ||
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90" | 7 | SRC_URI[sha256sum] = "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369" |
8 | 8 | ||
9 | PYPI_PACKAGE = "Jinja2" | 9 | PYPI_PACKAGE = "jinja2" |
10 | 10 | ||
11 | CVE_PRODUCT = "jinja2 jinja" | 11 | CVE_PRODUCT = "jinja2 jinja" |
12 | 12 | ||
13 | CLEANBROKEN = "1" | 13 | CLEANBROKEN = "1" |
14 | 14 | ||
15 | inherit pypi setuptools3 ptest | 15 | inherit pypi python_flit_core ptest |
16 | 16 | ||
17 | SRC_URI += " \ | 17 | SRC_URI += " \ |
18 | file://run-ptest \ | 18 | file://run-ptest \ |
diff --git a/meta/recipes-devtools/python/python3-jsonschema_4.21.1.bb b/meta/recipes-devtools/python/python3-jsonschema_4.22.0.bb index 381148f4bb..c3184396d2 100644 --- a/meta/recipes-devtools/python/python3-jsonschema_4.21.1.bb +++ b/meta/recipes-devtools/python/python3-jsonschema_4.22.0.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ |
5 | file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af" | 5 | file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "85727c00279f5fa6bedbe6238d2aa6403bedd8b4864ab11207d07df3cc1b2ee5" | 7 | SRC_URI[sha256sum] = "5b22d434a45935119af990552c862e5d6d564e8f6601206b305a61fdf661a2b7" |
8 | 8 | ||
9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-lxml_5.2.1.bb b/meta/recipes-devtools/python/python3-lxml_5.2.2.bb index 44a10505f3..e5a22e7090 100644 --- a/meta/recipes-devtools/python/python3-lxml_5.2.1.bb +++ b/meta/recipes-devtools/python/python3-lxml_5.2.2.bb | |||
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ | |||
18 | 18 | ||
19 | DEPENDS += "libxml2 libxslt" | 19 | DEPENDS += "libxml2 libxslt" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306" | 21 | SRC_URI[sha256sum] = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87" |
22 | 22 | ||
23 | SRC_URI += "${PYPI_SRC_URI}" | 23 | SRC_URI += "${PYPI_SRC_URI}" |
24 | inherit pkgconfig pypi setuptools3 | 24 | inherit pkgconfig pypi setuptools3 |
diff --git a/meta/recipes-devtools/python/python3-mako_1.3.3.bb b/meta/recipes-devtools/python/python3-mako_1.3.5.bb index 7545cbef99..d27fb121a6 100644 --- a/meta/recipes-devtools/python/python3-mako_1.3.3.bb +++ b/meta/recipes-devtools/python/python3-mako_1.3.5.bb | |||
@@ -8,7 +8,7 @@ PYPI_PACKAGE = "Mako" | |||
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73" | 11 | SRC_URI[sha256sum] = "48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc" |
12 | 12 | ||
13 | RDEPENDS:${PN} = "python3-html \ | 13 | RDEPENDS:${PN} = "python3-html \ |
14 | python3-markupsafe \ | 14 | python3-markupsafe \ |
diff --git a/meta/recipes-devtools/python/python3-maturin-crates.inc b/meta/recipes-devtools/python/python3-maturin-crates.inc index ba207458ef..dff1a166b2 100644 --- a/meta/recipes-devtools/python/python3-maturin-crates.inc +++ b/meta/recipes-devtools/python/python3-maturin-crates.inc | |||
@@ -26,11 +26,11 @@ SRC_URI += " \ | |||
26 | crate://crates.io/bzip2-sys/0.1.11+1.0.8 \ | 26 | crate://crates.io/bzip2-sys/0.1.11+1.0.8 \ |
27 | crate://crates.io/cab/0.4.1 \ | 27 | crate://crates.io/cab/0.4.1 \ |
28 | crate://crates.io/camino/1.1.6 \ | 28 | crate://crates.io/camino/1.1.6 \ |
29 | crate://crates.io/cargo-config2/0.1.19 \ | 29 | crate://crates.io/cargo-config2/0.1.24 \ |
30 | crate://crates.io/cargo-options/0.7.2 \ | 30 | crate://crates.io/cargo-options/0.7.4 \ |
31 | crate://crates.io/cargo-platform/0.1.6 \ | 31 | crate://crates.io/cargo-platform/0.1.6 \ |
32 | crate://crates.io/cargo-xwin/0.16.4 \ | 32 | crate://crates.io/cargo-xwin/0.16.4 \ |
33 | crate://crates.io/cargo-zigbuild/0.18.3 \ | 33 | crate://crates.io/cargo-zigbuild/0.18.4 \ |
34 | crate://crates.io/cargo_metadata/0.18.1 \ | 34 | crate://crates.io/cargo_metadata/0.18.1 \ |
35 | crate://crates.io/cbindgen/0.26.0 \ | 35 | crate://crates.io/cbindgen/0.26.0 \ |
36 | crate://crates.io/cc/1.0.88 \ | 36 | crate://crates.io/cc/1.0.88 \ |
@@ -69,6 +69,7 @@ SRC_URI += " \ | |||
69 | crate://crates.io/dirs-sys/0.4.1 \ | 69 | crate://crates.io/dirs-sys/0.4.1 \ |
70 | crate://crates.io/dissimilar/1.0.7 \ | 70 | crate://crates.io/dissimilar/1.0.7 \ |
71 | crate://crates.io/dunce/1.0.4 \ | 71 | crate://crates.io/dunce/1.0.4 \ |
72 | crate://crates.io/dyn-clone/1.0.17 \ | ||
72 | crate://crates.io/either/1.9.0 \ | 73 | crate://crates.io/either/1.9.0 \ |
73 | crate://crates.io/encode_unicode/0.3.6 \ | 74 | crate://crates.io/encode_unicode/0.3.6 \ |
74 | crate://crates.io/encoding_rs/0.8.33 \ | 75 | crate://crates.io/encoding_rs/0.8.33 \ |
@@ -84,6 +85,16 @@ SRC_URI += " \ | |||
84 | crate://crates.io/foreign-types-shared/0.1.1 \ | 85 | crate://crates.io/foreign-types-shared/0.1.1 \ |
85 | crate://crates.io/form_urlencoded/1.2.1 \ | 86 | crate://crates.io/form_urlencoded/1.2.1 \ |
86 | crate://crates.io/fs-err/2.11.0 \ | 87 | crate://crates.io/fs-err/2.11.0 \ |
88 | crate://crates.io/futures/0.3.30 \ | ||
89 | crate://crates.io/futures-channel/0.3.30 \ | ||
90 | crate://crates.io/futures-core/0.3.30 \ | ||
91 | crate://crates.io/futures-executor/0.3.30 \ | ||
92 | crate://crates.io/futures-io/0.3.30 \ | ||
93 | crate://crates.io/futures-macro/0.3.30 \ | ||
94 | crate://crates.io/futures-sink/0.3.30 \ | ||
95 | crate://crates.io/futures-task/0.3.30 \ | ||
96 | crate://crates.io/futures-timer/3.0.3 \ | ||
97 | crate://crates.io/futures-util/0.3.30 \ | ||
87 | crate://crates.io/generic-array/0.14.7 \ | 98 | crate://crates.io/generic-array/0.14.7 \ |
88 | crate://crates.io/getrandom/0.2.12 \ | 99 | crate://crates.io/getrandom/0.2.12 \ |
89 | crate://crates.io/glob/0.3.1 \ | 100 | crate://crates.io/glob/0.3.1 \ |
@@ -148,6 +159,7 @@ SRC_URI += " \ | |||
148 | crate://crates.io/pep508_rs/0.4.2 \ | 159 | crate://crates.io/pep508_rs/0.4.2 \ |
149 | crate://crates.io/percent-encoding/2.3.1 \ | 160 | crate://crates.io/percent-encoding/2.3.1 \ |
150 | crate://crates.io/pin-project-lite/0.2.13 \ | 161 | crate://crates.io/pin-project-lite/0.2.13 \ |
162 | crate://crates.io/pin-utils/0.1.0 \ | ||
151 | crate://crates.io/pkg-config/0.3.29 \ | 163 | crate://crates.io/pkg-config/0.3.29 \ |
152 | crate://crates.io/plain/0.2.3 \ | 164 | crate://crates.io/plain/0.2.3 \ |
153 | crate://crates.io/platform-info/2.0.2 \ | 165 | crate://crates.io/platform-info/2.0.2 \ |
@@ -174,11 +186,14 @@ SRC_URI += " \ | |||
174 | crate://crates.io/regex-automata/0.4.5 \ | 186 | crate://crates.io/regex-automata/0.4.5 \ |
175 | crate://crates.io/regex-syntax/0.6.29 \ | 187 | crate://crates.io/regex-syntax/0.6.29 \ |
176 | crate://crates.io/regex-syntax/0.8.2 \ | 188 | crate://crates.io/regex-syntax/0.8.2 \ |
189 | crate://crates.io/relative-path/1.9.2 \ | ||
177 | crate://crates.io/rfc2047-decoder/0.2.2 \ | 190 | crate://crates.io/rfc2047-decoder/0.2.2 \ |
178 | crate://crates.io/ring/0.17.7 \ | 191 | crate://crates.io/ring/0.17.7 \ |
192 | crate://crates.io/rstest/0.18.2 \ | ||
193 | crate://crates.io/rstest_macros/0.18.2 \ | ||
179 | crate://crates.io/rustc_version/0.4.0 \ | 194 | crate://crates.io/rustc_version/0.4.0 \ |
180 | crate://crates.io/rustix/0.38.32 \ | 195 | crate://crates.io/rustix/0.38.32 \ |
181 | crate://crates.io/rustls/0.22.2 \ | 196 | crate://crates.io/rustls/0.22.4 \ |
182 | crate://crates.io/rustls-pemfile/2.1.0 \ | 197 | crate://crates.io/rustls-pemfile/2.1.0 \ |
183 | crate://crates.io/rustls-pki-types/1.3.1 \ | 198 | crate://crates.io/rustls-pki-types/1.3.1 \ |
184 | crate://crates.io/rustls-webpki/0.102.1 \ | 199 | crate://crates.io/rustls-webpki/0.102.1 \ |
@@ -186,6 +201,8 @@ SRC_URI += " \ | |||
186 | crate://crates.io/ryu/1.0.16 \ | 201 | crate://crates.io/ryu/1.0.16 \ |
187 | crate://crates.io/same-file/1.0.6 \ | 202 | crate://crates.io/same-file/1.0.6 \ |
188 | crate://crates.io/schannel/0.1.23 \ | 203 | crate://crates.io/schannel/0.1.23 \ |
204 | crate://crates.io/schemars/0.8.16 \ | ||
205 | crate://crates.io/schemars_derive/0.8.16 \ | ||
189 | crate://crates.io/scopeguard/1.2.0 \ | 206 | crate://crates.io/scopeguard/1.2.0 \ |
190 | crate://crates.io/scroll/0.12.0 \ | 207 | crate://crates.io/scroll/0.12.0 \ |
191 | crate://crates.io/scroll_derive/0.12.0 \ | 208 | crate://crates.io/scroll_derive/0.12.0 \ |
@@ -194,6 +211,7 @@ SRC_URI += " \ | |||
194 | crate://crates.io/semver/1.0.22 \ | 211 | crate://crates.io/semver/1.0.22 \ |
195 | crate://crates.io/serde/1.0.197 \ | 212 | crate://crates.io/serde/1.0.197 \ |
196 | crate://crates.io/serde_derive/1.0.197 \ | 213 | crate://crates.io/serde_derive/1.0.197 \ |
214 | crate://crates.io/serde_derive_internals/0.26.0 \ | ||
197 | crate://crates.io/serde_json/1.0.114 \ | 215 | crate://crates.io/serde_json/1.0.114 \ |
198 | crate://crates.io/serde_spanned/0.6.5 \ | 216 | crate://crates.io/serde_spanned/0.6.5 \ |
199 | crate://crates.io/sha2/0.10.8 \ | 217 | crate://crates.io/sha2/0.10.8 \ |
@@ -201,6 +219,7 @@ SRC_URI += " \ | |||
201 | crate://crates.io/shell-words/1.1.0 \ | 219 | crate://crates.io/shell-words/1.1.0 \ |
202 | crate://crates.io/shlex/1.3.0 \ | 220 | crate://crates.io/shlex/1.3.0 \ |
203 | crate://crates.io/similar/2.4.0 \ | 221 | crate://crates.io/similar/2.4.0 \ |
222 | crate://crates.io/slab/0.4.9 \ | ||
204 | crate://crates.io/smallvec/1.13.1 \ | 223 | crate://crates.io/smallvec/1.13.1 \ |
205 | crate://crates.io/smawk/0.3.2 \ | 224 | crate://crates.io/smawk/0.3.2 \ |
206 | crate://crates.io/snapbox/0.5.7 \ | 225 | crate://crates.io/snapbox/0.5.7 \ |
@@ -321,11 +340,11 @@ SRC_URI[bzip2-0.4.4.sha256sum] = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb8849 | |||
321 | SRC_URI[bzip2-sys-0.1.11+1.0.8.sha256sum] = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" | 340 | SRC_URI[bzip2-sys-0.1.11+1.0.8.sha256sum] = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" |
322 | SRC_URI[cab-0.4.1.sha256sum] = "ae6b4de23c7d39c0631fd3cc952d87951c86c75a13812d7247cb7a896e7b3551" | 341 | SRC_URI[cab-0.4.1.sha256sum] = "ae6b4de23c7d39c0631fd3cc952d87951c86c75a13812d7247cb7a896e7b3551" |
323 | SRC_URI[camino-1.1.6.sha256sum] = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" | 342 | SRC_URI[camino-1.1.6.sha256sum] = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" |
324 | SRC_URI[cargo-config2-0.1.19.sha256sum] = "3a7fb69d74d76f8c254afd1c0e76aca40c305707b28aebe3c5a0fd2ee62aeeeb" | 343 | SRC_URI[cargo-config2-0.1.24.sha256sum] = "88d9bdc858a15454c2d0a5138d8dcf4bcabc06fde679abdea8330393fbc0ef05" |
325 | SRC_URI[cargo-options-0.7.2.sha256sum] = "cad71bf996c8e5b9d28ef3472d7ee41f277edf4e38cd597f51ad0438d05d76ea" | 344 | SRC_URI[cargo-options-0.7.4.sha256sum] = "f3540247c0a37a76eb324acc238dc617786ea22c43b95da560c82a8f2714321f" |
326 | SRC_URI[cargo-platform-0.1.6.sha256sum] = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" | 345 | SRC_URI[cargo-platform-0.1.6.sha256sum] = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" |
327 | SRC_URI[cargo-xwin-0.16.4.sha256sum] = "5e6c3dd7f20fdd197397532ac882e918cfe1d56f262a97ded7460a50e031e06b" | 346 | SRC_URI[cargo-xwin-0.16.4.sha256sum] = "5e6c3dd7f20fdd197397532ac882e918cfe1d56f262a97ded7460a50e031e06b" |
328 | SRC_URI[cargo-zigbuild-0.18.3.sha256sum] = "cb76e6ab558f9138291c7e1fa954ffd58e060712eab13f97a317da712218ca24" | 347 | SRC_URI[cargo-zigbuild-0.18.4.sha256sum] = "65004153e67ac23be88a8e244304a872d727b2aa08654dcabfbecd1fdea4a488" |
329 | SRC_URI[cargo_metadata-0.18.1.sha256sum] = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" | 348 | SRC_URI[cargo_metadata-0.18.1.sha256sum] = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" |
330 | SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" | 349 | SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" |
331 | SRC_URI[cc-1.0.88.sha256sum] = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" | 350 | SRC_URI[cc-1.0.88.sha256sum] = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" |
@@ -364,6 +383,7 @@ SRC_URI[dirs-5.0.1.sha256sum] = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5 | |||
364 | SRC_URI[dirs-sys-0.4.1.sha256sum] = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" | 383 | SRC_URI[dirs-sys-0.4.1.sha256sum] = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" |
365 | SRC_URI[dissimilar-1.0.7.sha256sum] = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" | 384 | SRC_URI[dissimilar-1.0.7.sha256sum] = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" |
366 | SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" | 385 | SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" |
386 | SRC_URI[dyn-clone-1.0.17.sha256sum] = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" | ||
367 | SRC_URI[either-1.9.0.sha256sum] = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" | 387 | SRC_URI[either-1.9.0.sha256sum] = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" |
368 | SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" | 388 | SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" |
369 | SRC_URI[encoding_rs-0.8.33.sha256sum] = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" | 389 | SRC_URI[encoding_rs-0.8.33.sha256sum] = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" |
@@ -379,6 +399,16 @@ SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d | |||
379 | SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" | 399 | SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" |
380 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" | 400 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" |
381 | SRC_URI[fs-err-2.11.0.sha256sum] = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" | 401 | SRC_URI[fs-err-2.11.0.sha256sum] = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" |
402 | SRC_URI[futures-0.3.30.sha256sum] = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" | ||
403 | SRC_URI[futures-channel-0.3.30.sha256sum] = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" | ||
404 | SRC_URI[futures-core-0.3.30.sha256sum] = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" | ||
405 | SRC_URI[futures-executor-0.3.30.sha256sum] = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" | ||
406 | SRC_URI[futures-io-0.3.30.sha256sum] = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" | ||
407 | SRC_URI[futures-macro-0.3.30.sha256sum] = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" | ||
408 | SRC_URI[futures-sink-0.3.30.sha256sum] = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" | ||
409 | SRC_URI[futures-task-0.3.30.sha256sum] = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" | ||
410 | SRC_URI[futures-timer-3.0.3.sha256sum] = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" | ||
411 | SRC_URI[futures-util-0.3.30.sha256sum] = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" | ||
382 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | 412 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" |
383 | SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" | 413 | SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" |
384 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" | 414 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" |
@@ -443,6 +473,7 @@ SRC_URI[pep440_rs-0.5.0.sha256sum] = "15efd4d885c29126cc93e12af3087896e2518bd5ca | |||
443 | SRC_URI[pep508_rs-0.4.2.sha256sum] = "1455babf8edd3eedcdfcb39700e455a4bb189e71b4f1fa0eacc9b244cc5a55e6" | 473 | SRC_URI[pep508_rs-0.4.2.sha256sum] = "1455babf8edd3eedcdfcb39700e455a4bb189e71b4f1fa0eacc9b244cc5a55e6" |
444 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | 474 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" |
445 | SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" | 475 | SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" |
476 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" | ||
446 | SRC_URI[pkg-config-0.3.29.sha256sum] = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" | 477 | SRC_URI[pkg-config-0.3.29.sha256sum] = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" |
447 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" | 478 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" |
448 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" | 479 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" |
@@ -469,11 +500,14 @@ SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3 | |||
469 | SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" | 500 | SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" |
470 | SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" | 501 | SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" |
471 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" | 502 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" |
503 | SRC_URI[relative-path-1.9.2.sha256sum] = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" | ||
472 | SRC_URI[rfc2047-decoder-0.2.2.sha256sum] = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" | 504 | SRC_URI[rfc2047-decoder-0.2.2.sha256sum] = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" |
473 | SRC_URI[ring-0.17.7.sha256sum] = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" | 505 | SRC_URI[ring-0.17.7.sha256sum] = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" |
506 | SRC_URI[rstest-0.18.2.sha256sum] = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" | ||
507 | SRC_URI[rstest_macros-0.18.2.sha256sum] = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" | ||
474 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" | 508 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" |
475 | SRC_URI[rustix-0.38.32.sha256sum] = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" | 509 | SRC_URI[rustix-0.38.32.sha256sum] = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" |
476 | SRC_URI[rustls-0.22.2.sha256sum] = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" | 510 | SRC_URI[rustls-0.22.4.sha256sum] = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" |
477 | SRC_URI[rustls-pemfile-2.1.0.sha256sum] = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" | 511 | SRC_URI[rustls-pemfile-2.1.0.sha256sum] = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" |
478 | SRC_URI[rustls-pki-types-1.3.1.sha256sum] = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" | 512 | SRC_URI[rustls-pki-types-1.3.1.sha256sum] = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" |
479 | SRC_URI[rustls-webpki-0.102.1.sha256sum] = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" | 513 | SRC_URI[rustls-webpki-0.102.1.sha256sum] = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" |
@@ -481,6 +515,8 @@ SRC_URI[rustversion-1.0.14.sha256sum] = "7ffc183a10b4478d04cbbbfc96d0873219d962d | |||
481 | SRC_URI[ryu-1.0.16.sha256sum] = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" | 515 | SRC_URI[ryu-1.0.16.sha256sum] = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" |
482 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | 516 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" |
483 | SRC_URI[schannel-0.1.23.sha256sum] = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" | 517 | SRC_URI[schannel-0.1.23.sha256sum] = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" |
518 | SRC_URI[schemars-0.8.16.sha256sum] = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" | ||
519 | SRC_URI[schemars_derive-0.8.16.sha256sum] = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" | ||
484 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 520 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
485 | SRC_URI[scroll-0.12.0.sha256sum] = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" | 521 | SRC_URI[scroll-0.12.0.sha256sum] = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" |
486 | SRC_URI[scroll_derive-0.12.0.sha256sum] = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" | 522 | SRC_URI[scroll_derive-0.12.0.sha256sum] = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" |
@@ -489,6 +525,7 @@ SRC_URI[security-framework-sys-2.9.1.sha256sum] = "e932934257d3b408ed8f30db49d85 | |||
489 | SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" | 525 | SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" |
490 | SRC_URI[serde-1.0.197.sha256sum] = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" | 526 | SRC_URI[serde-1.0.197.sha256sum] = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" |
491 | SRC_URI[serde_derive-1.0.197.sha256sum] = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" | 527 | SRC_URI[serde_derive-1.0.197.sha256sum] = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" |
528 | SRC_URI[serde_derive_internals-0.26.0.sha256sum] = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" | ||
492 | SRC_URI[serde_json-1.0.114.sha256sum] = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" | 529 | SRC_URI[serde_json-1.0.114.sha256sum] = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" |
493 | SRC_URI[serde_spanned-0.6.5.sha256sum] = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" | 530 | SRC_URI[serde_spanned-0.6.5.sha256sum] = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" |
494 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" | 531 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" |
@@ -496,6 +533,7 @@ SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e9 | |||
496 | SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" | 533 | SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" |
497 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | 534 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
498 | SRC_URI[similar-2.4.0.sha256sum] = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" | 535 | SRC_URI[similar-2.4.0.sha256sum] = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" |
536 | SRC_URI[slab-0.4.9.sha256sum] = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" | ||
499 | SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" | 537 | SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" |
500 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" | 538 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" |
501 | SRC_URI[snapbox-0.5.7.sha256sum] = "4a99efa20de5053229642a477436cdb39828c7651c614622eb4888f9688523e6" | 539 | SRC_URI[snapbox-0.5.7.sha256sum] = "4a99efa20de5053229642a477436cdb39828c7651c614622eb4888f9688523e6" |
diff --git a/meta/recipes-devtools/python/python3-maturin_1.5.1.bb b/meta/recipes-devtools/python/python3-maturin_1.6.0.bb index 96b046feba..1d62671bb9 100644 --- a/meta/recipes-devtools/python/python3-maturin_1.5.1.bb +++ b/meta/recipes-devtools/python/python3-maturin_1.6.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "MIT | Apache-2.0" | |||
5 | LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ | 5 | LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ |
6 | file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" | 6 | file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "3dd834ece80edb866af18cbd4635e0ecac40139c726428d5f1849ae154b26dca" | 8 | SRC_URI[sha256sum] = "b955025c24c8babc808db49e0ff90db8b4b1320dcc16b14eb26132841737230d" |
9 | 9 | ||
10 | S = "${WORKDIR}/maturin-${PV}" | 10 | S = "${WORKDIR}/maturin-${PV}" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-pycparser_2.22.bb b/meta/recipes-devtools/python/python3-pycparser_2.22.bb index 9a5abc42bd..0be39ea383 100644 --- a/meta/recipes-devtools/python/python3-pycparser_2.22.bb +++ b/meta/recipes-devtools/python/python3-pycparser_2.22.bb | |||
@@ -11,9 +11,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
11 | 11 | ||
12 | RDEPENDS:${PN}:class-target += "\ | 12 | RDEPENDS:${PN}:class-target += "\ |
13 | python3-netclient \ | 13 | python3-netclient \ |
14 | python3-ply \ | 14 | " |
15 | python3-pprint \ | ||
16 | " | ||
17 | 15 | ||
18 | RSUGGESTS:${PN}:class-target += "\ | 16 | RSUGGESTS:${PN}:class-target += "\ |
19 | cpp \ | 17 | cpp \ |
diff --git a/meta/recipes-devtools/python/python3-pygments_2.17.2.bb b/meta/recipes-devtools/python/python3-pygments_2.18.0.bb index 8b98064b78..fd37365681 100644 --- a/meta/recipes-devtools/python/python3-pygments_2.17.2.bb +++ b/meta/recipes-devtools/python/python3-pygments_2.18.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" |
6 | 6 | ||
7 | inherit python_hatchling | 7 | inherit python_hatchling |
8 | SRC_URI[sha256sum] = "da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367" | 8 | SRC_URI[sha256sum] = "786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199" |
9 | 9 | ||
10 | UPSTREAM_CHECK_PYPI_PACKAGE = "Pygments" | 10 | UPSTREAM_CHECK_PYPI_PACKAGE = "Pygments" |
11 | inherit pypi | 11 | inherit pypi |
diff --git a/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb b/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb index e714ad838e..9ef3145bf8 100644 --- a/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb +++ b/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb | |||
@@ -15,7 +15,6 @@ FILES:${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test" | |||
15 | 15 | ||
16 | RDEPENDS:${PN}:class-target = " \ | 16 | RDEPENDS:${PN}:class-target = " \ |
17 | python3-cryptography \ | 17 | python3-cryptography \ |
18 | python3-six \ | ||
19 | python3-threading \ | 18 | python3-threading \ |
20 | " | 19 | " |
21 | RDEPENDS:${PN}-tests = "${PN}" | 20 | RDEPENDS:${PN}-tests = "${PN}" |
diff --git a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb index 9d08e7acc4..c3f1fb75ed 100644 --- a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb +++ b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb | |||
@@ -22,5 +22,3 @@ RDEPENDS:${PN} += " \ | |||
22 | do_compile:class-native () { | 22 | do_compile:class-native () { |
23 | python_flit_core_do_manual_build | 23 | python_flit_core_do_manual_build |
24 | } | 24 | } |
25 | |||
26 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
diff --git a/meta/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb b/meta/recipes-devtools/python/python3-pyproject-metadata_0.8.0.bb index 8b9549f3d0..8d00826f86 100644 --- a/meta/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb +++ b/meta/recipes-devtools/python/python3-pyproject-metadata_0.8.0.bb | |||
@@ -12,11 +12,11 @@ HOMEPAGE = "https://github.com/FFY00/python-pyproject-metadata" | |||
12 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |
13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" |
14 | 14 | ||
15 | PYPI_PACKAGE = "pyproject-metadata" | 15 | PYPI_PACKAGE = "pyproject_metadata" |
16 | 16 | ||
17 | inherit pypi python_setuptools_build_meta | 17 | inherit pypi python_setuptools_build_meta |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67" | 19 | SRC_URI[sha256sum] = "376d5a00764ac29440a54579f88e66b7d9cb7e629d35c35a1c7248bfebc9b455" |
20 | 20 | ||
21 | RDEPENDS:${PN} += " \ | 21 | RDEPENDS:${PN} += " \ |
22 | python3-logging \ | 22 | python3-logging \ |
diff --git a/meta/recipes-devtools/python/python3-pytest_8.2.0.bb b/meta/recipes-devtools/python/python3-pytest_8.2.1.bb index 1e6674079f..28dbe786f8 100644 --- a/meta/recipes-devtools/python/python3-pytest_8.2.0.bb +++ b/meta/recipes-devtools/python/python3-pytest_8.2.1.bb | |||
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f" | 8 | SRC_URI[sha256sum] = "5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd" |
9 | 9 | ||
10 | DEPENDS += "python3-setuptools-scm-native" | 10 | DEPENDS += "python3-setuptools-scm-native" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb index 3388312557..6e2022719c 100644 --- a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb +++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb | |||
@@ -34,7 +34,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
34 | 34 | ||
35 | do_install_ptest() { | 35 | do_install_ptest() { |
36 | install -d ${D}${PTEST_PATH}/tests | 36 | install -d ${D}${PTEST_PATH}/tests |
37 | cp -rf ${WORKDIR}/test_dump_load.py ${D}${PTEST_PATH}/tests/ | 37 | cp -rf ${UNPACKDIR}/test_dump_load.py ${D}${PTEST_PATH}/tests/ |
38 | } | 38 | } |
39 | 39 | ||
40 | BBCLASSEXTEND = "native nativesdk" | 40 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-referencing_0.34.0.bb b/meta/recipes-devtools/python/python3-referencing_0.35.1.bb index 6fbd10d9cf..3e2a380607 100644 --- a/meta/recipes-devtools/python/python3-referencing_0.34.0.bb +++ b/meta/recipes-devtools/python/python3-referencing_0.35.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/python-jsonschema/referencing" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=93eb9740964b59e9ba30281255b044e2" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=93eb9740964b59e9ba30281255b044e2" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "5773bd84ef41799a5a8ca72dc34590c041eb01bf9aa02632b4a973fb0181a844" | 6 | SRC_URI[sha256sum] = "25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c" |
7 | 7 | ||
8 | inherit pypi python_hatchling | 8 | inherit pypi python_hatchling |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-requests_2.31.0.bb b/meta/recipes-devtools/python/python3-requests_2.32.1.bb index df48cd54c3..a1144181bc 100644 --- a/meta/recipes-devtools/python/python3-requests_2.31.0.bb +++ b/meta/recipes-devtools/python/python3-requests_2.32.1.bb | |||
@@ -1,19 +1,17 @@ | |||
1 | SUMMARY = "Python HTTP for Humans." | 1 | SUMMARY = "Python HTTP for Humans." |
2 | HOMEPAGE = "http://python-requests.org" | 2 | HOMEPAGE = "https://requests.readthedocs.io" |
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" | 6 | SRC_URI[sha256sum] = "eb97e87e64c79e64e5b8ac75cee9dd1f97f49e289b083ee6be96268930725685" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
11 | python3-certifi \ | ||
11 | python3-email \ | 12 | python3-email \ |
12 | python3-json \ | 13 | python3-json \ |
13 | python3-ndg-httpsclient \ | ||
14 | python3-netserver \ | 14 | python3-netserver \ |
15 | python3-pyasn1 \ | ||
16 | python3-pyopenssl \ | ||
17 | python3-pysocks \ | 15 | python3-pysocks \ |
18 | python3-urllib3 \ | 16 | python3-urllib3 \ |
19 | python3-chardet \ | 17 | python3-chardet \ |
diff --git a/meta/recipes-devtools/python/python3-rpds-py-crates.inc b/meta/recipes-devtools/python/python3-rpds-py-crates.inc index b9048bde51..3551bdb5f7 100644 --- a/meta/recipes-devtools/python/python3-rpds-py-crates.inc +++ b/meta/recipes-devtools/python/python3-rpds-py-crates.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/archery/1.1.0 \ | 5 | crate://crates.io/archery/1.2.0 \ |
6 | crate://crates.io/autocfg/1.1.0 \ | 6 | crate://crates.io/autocfg/1.1.0 \ |
7 | crate://crates.io/bitflags/1.3.2 \ | 7 | crate://crates.io/bitflags/1.3.2 \ |
8 | crate://crates.io/cfg-if/1.0.0 \ | 8 | crate://crates.io/cfg-if/1.0.0 \ |
@@ -14,12 +14,13 @@ SRC_URI += " \ | |||
14 | crate://crates.io/once_cell/1.18.0 \ | 14 | crate://crates.io/once_cell/1.18.0 \ |
15 | crate://crates.io/parking_lot/0.12.1 \ | 15 | crate://crates.io/parking_lot/0.12.1 \ |
16 | crate://crates.io/parking_lot_core/0.9.8 \ | 16 | crate://crates.io/parking_lot_core/0.9.8 \ |
17 | crate://crates.io/portable-atomic/1.6.0 \ | ||
17 | crate://crates.io/proc-macro2/1.0.66 \ | 18 | crate://crates.io/proc-macro2/1.0.66 \ |
18 | crate://crates.io/pyo3/0.20.2 \ | 19 | crate://crates.io/pyo3/0.20.3 \ |
19 | crate://crates.io/pyo3-build-config/0.20.2 \ | 20 | crate://crates.io/pyo3-build-config/0.20.3 \ |
20 | crate://crates.io/pyo3-ffi/0.20.2 \ | 21 | crate://crates.io/pyo3-ffi/0.20.3 \ |
21 | crate://crates.io/pyo3-macros/0.20.2 \ | 22 | crate://crates.io/pyo3-macros/0.20.3 \ |
22 | crate://crates.io/pyo3-macros-backend/0.20.2 \ | 23 | crate://crates.io/pyo3-macros-backend/0.20.3 \ |
23 | crate://crates.io/quote/1.0.31 \ | 24 | crate://crates.io/quote/1.0.31 \ |
24 | crate://crates.io/redox_syscall/0.3.5 \ | 25 | crate://crates.io/redox_syscall/0.3.5 \ |
25 | crate://crates.io/rpds/1.1.0 \ | 26 | crate://crates.io/rpds/1.1.0 \ |
@@ -41,7 +42,7 @@ SRC_URI += " \ | |||
41 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ | 42 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ |
42 | " | 43 | " |
43 | 44 | ||
44 | SRC_URI[archery-1.1.0.sha256sum] = "487955f60962765486ce000015a3492ca45c34a2ebbf12bc0aa2b5110ca6e7d2" | 45 | SRC_URI[archery-1.2.0.sha256sum] = "8967cd1cc9e9e1954f644e14fbd6042fe9a37da96c52a67e44a2ac18261f8561" |
45 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 46 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
46 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 47 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
47 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 48 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
@@ -53,12 +54,13 @@ SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff | |||
53 | SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" | 54 | SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" |
54 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 55 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
55 | SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" | 56 | SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" |
57 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | ||
56 | SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" | 58 | SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" |
57 | SRC_URI[pyo3-0.20.2.sha256sum] = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" | 59 | SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" |
58 | SRC_URI[pyo3-build-config-0.20.2.sha256sum] = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" | 60 | SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" |
59 | SRC_URI[pyo3-ffi-0.20.2.sha256sum] = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" | 61 | SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" |
60 | SRC_URI[pyo3-macros-0.20.2.sha256sum] = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" | 62 | SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" |
61 | SRC_URI[pyo3-macros-backend-0.20.2.sha256sum] = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" | 63 | SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" |
62 | SRC_URI[quote-1.0.31.sha256sum] = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" | 64 | SRC_URI[quote-1.0.31.sha256sum] = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" |
63 | SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" | 65 | SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" |
64 | SRC_URI[rpds-1.1.0.sha256sum] = "a0e15515d3ce3313324d842629ea4905c25a13f81953eadb88f85516f59290a4" | 66 | SRC_URI[rpds-1.1.0.sha256sum] = "a0e15515d3ce3313324d842629ea4905c25a13f81953eadb88f85516f59290a4" |
diff --git a/meta/recipes-devtools/python/python3-rpds-py/run-ptest b/meta/recipes-devtools/python/python3-rpds-py/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta/recipes-devtools/python/python3-rpds-py/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest --automake | ||
diff --git a/meta/recipes-devtools/python/python3-rpds-py_0.18.0.bb b/meta/recipes-devtools/python/python3-rpds-py_0.18.0.bb deleted file mode 100644 index cece2cb8cc..0000000000 --- a/meta/recipes-devtools/python/python3-rpds-py_0.18.0.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | SUMMARY = "Python bindings to the Rust rpds crate for persistent data structures." | ||
2 | HOMEPAGE = "https://pypi.org/project/rpds-py/" | ||
3 | |||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7767fa537c4596c54141f32882c4a984" | ||
6 | |||
7 | SRC_URI[sha256sum] = "42821446ee7a76f5d9f71f9e33a4fb2ffd724bb3e7f93386150b61a43115788d" | ||
8 | |||
9 | require ${BPN}-crates.inc | ||
10 | |||
11 | inherit pypi cargo-update-recipe-crates python_maturin | ||
12 | |||
13 | PYPI_PACKAGE = "rpds_py" | ||
14 | |||
15 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-rpds-py_0.18.1.bb b/meta/recipes-devtools/python/python3-rpds-py_0.18.1.bb new file mode 100644 index 0000000000..f46df1115c --- /dev/null +++ b/meta/recipes-devtools/python/python3-rpds-py_0.18.1.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | SUMMARY = "Python bindings to the Rust rpds crate for persistent data structures." | ||
2 | HOMEPAGE = "https://pypi.org/project/rpds-py/" | ||
3 | |||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7767fa537c4596c54141f32882c4a984" | ||
6 | |||
7 | SRC_URI += "file://run-ptest" | ||
8 | |||
9 | SRC_URI[sha256sum] = "dc48b479d540770c811fbd1eb9ba2bb66951863e448efec2e2c102625328e92f" | ||
10 | |||
11 | require ${BPN}-crates.inc | ||
12 | |||
13 | inherit pypi cargo-update-recipe-crates python_maturin ptest | ||
14 | |||
15 | PYPI_PACKAGE = "rpds_py" | ||
16 | |||
17 | RDEPENDS:${PN}-ptest += " \ | ||
18 | python3-iniconfig \ | ||
19 | python3-packaging \ | ||
20 | python3-pluggy \ | ||
21 | python3-pytest \ | ||
22 | python3-unittest-automake-output \ | ||
23 | " | ||
24 | |||
25 | do_install_ptest() { | ||
26 | install -d ${D}${PTEST_PATH}/tests | ||
27 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
28 | } | ||
29 | |||
30 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb b/meta/recipes-devtools/python/python3-setuptools-scm_8.1.0.bb index 64b5050c3b..ea65b476fc 100644 --- a/meta/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb +++ b/meta/recipes-devtools/python/python3-setuptools-scm_8.1.0.bb | |||
@@ -6,7 +6,9 @@ argument or in a SCM managed file." | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7" | 9 | SRC_URI[sha256sum] = "42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7" |
10 | |||
11 | PYPI_PACKAGE = "setuptools_scm" | ||
10 | 12 | ||
11 | inherit pypi python_setuptools_build_meta | 13 | inherit pypi python_setuptools_build_meta |
12 | 14 | ||
diff --git a/meta/recipes-devtools/python/python3-sphinx_7.2.6.bb b/meta/recipes-devtools/python/python3-sphinx_7.3.7.bb index f4ed0720ff..a1cae2abc0 100644 --- a/meta/recipes-devtools/python/python3-sphinx_7.2.6.bb +++ b/meta/recipes-devtools/python/python3-sphinx_7.3.7.bb | |||
@@ -2,9 +2,9 @@ SUMMARY = "Python documentation generator" | |||
2 | HOMEPAGE = "http://sphinx-doc.org/" | 2 | HOMEPAGE = "http://sphinx-doc.org/" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "BSD-2-Clause & MIT" | 4 | LICENSE = "BSD-2-Clause & MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb6ac1b115a1ed24a12d9f15b633993" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=b6c681698874edd2eb9eaff7cc9de642" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5" | 7 | SRC_URI[sha256sum] = "a4a7db75ed37531c05002d56ed6948d4c42f473a36f46e1382b0bd76ca9627bc" |
8 | 8 | ||
9 | inherit python_flit_core pypi | 9 | inherit python_flit_core pypi |
10 | UPSTREAM_CHECK_REGEX = "/Sphinx/(?P<pver>(\d+[\.\-_]*)+)/" | 10 | UPSTREAM_CHECK_REGEX = "/Sphinx/(?P<pver>(\d+[\.\-_]*)+)/" |
diff --git a/meta/recipes-devtools/python/python3-trove-classifiers_2024.4.10.bb b/meta/recipes-devtools/python/python3-trove-classifiers_2024.5.22.bb index 357b428983..8876b63e7d 100644 --- a/meta/recipes-devtools/python/python3-trove-classifiers_2024.4.10.bb +++ b/meta/recipes-devtools/python/python3-trove-classifiers_2024.5.22.bb | |||
@@ -3,7 +3,9 @@ HOMEPAGE = "https://github.com/pypa/trove-classifiers" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "49f40bb6a746b72a1cba4f8d55ee8252169cda0f70802e3fd24f04b7fb25a492" | 6 | SRC_URI[sha256sum] = "8a6242bbb5c9ae88d34cf665e816b287d2212973c8777dfaef5ec18d72ac1d03" |
7 | |||
8 | PYPI_PACKAGE = "trove_classifiers" | ||
7 | 9 | ||
8 | inherit pypi python_setuptools_build_meta ptest | 10 | inherit pypi python_setuptools_build_meta ptest |
9 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-zipp_3.18.1.bb b/meta/recipes-devtools/python/python3-zipp_3.18.2.bb index e43432469d..97aa1fed25 100644 --- a/meta/recipes-devtools/python/python3-zipp_3.18.1.bb +++ b/meta/recipes-devtools/python/python3-zipp_3.18.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715" | 6 | SRC_URI[sha256sum] = "6278d9ddbcfb1f1089a88fde84481528b07b0e10474e09dcfe53dad4069fa059" |
7 | 7 | ||
8 | DEPENDS += "python3-setuptools-scm-native" | 8 | DEPENDS += "python3-setuptools-scm-native" |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch new file mode 100644 index 0000000000..88b84c6024 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 | ||
2 | From: Petr Viktorin <encukou@gmail.com> | ||
3 | Date: Wed, 23 Aug 2023 20:00:07 +0200 | ||
4 | Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to | ||
5 | set it (#108369) | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/python/cpython/pull/108369] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Lib/tarfile.py | 3 ++- | ||
11 | .../Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 3 +++ | ||
12 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
13 | create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
14 | |||
15 | diff --git a/Lib/tarfile.py b/Lib/tarfile.py | ||
16 | index 3bbbcaa..473167d 100755 | ||
17 | --- a/Lib/tarfile.py | ||
18 | +++ b/Lib/tarfile.py | ||
19 | @@ -2557,7 +2557,8 @@ class TarFile(object): | ||
20 | os.lchown(targetpath, u, g) | ||
21 | else: | ||
22 | os.chown(targetpath, u, g) | ||
23 | - except OSError as e: | ||
24 | + except (OSError, OverflowError) as e: | ||
25 | + # OverflowError can be raised if an ID doesn't fit in `id_t` | ||
26 | raise ExtractError("could not change owner") from e | ||
27 | |||
28 | def chmod(self, tarinfo, targetpath): | ||
29 | diff --git a/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
30 | new file mode 100644 | ||
31 | index 0000000..ffca413 | ||
32 | --- /dev/null | ||
33 | +++ b/Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | ||
34 | @@ -0,0 +1,3 @@ | ||
35 | +:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on | ||
36 | +an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to | ||
37 | +set the ID. | ||
38 | -- | ||
39 | 2.45.0 | ||
40 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch b/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch deleted file mode 100644 index 8406ef30a2..0000000000 --- a/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 439aa02f42d6e6715c172076261757fcb89a936a Mon Sep 17 00:00:00 2001 | ||
2 | From: "Miss Islington (bot)" | ||
3 | <31488909+miss-islington@users.noreply.github.com> | ||
4 | Date: Tue, 23 Jan 2024 23:02:02 +0100 | ||
5 | Subject: [PATCH] gh-114492: Initialize struct termios before calling | ||
6 | tcgetattr() (GH-114495) (GH-114502) | ||
7 | |||
8 | On Alpine Linux it could leave some field non-initialized. | ||
9 | (cherry picked from commit d22c066b802592932f9eb18434782299e80ca42e) | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/python/cpython/commit/386c72d9928c51aa2c855ce592bd8022da3b407f] | ||
12 | Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | .../next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | 2 ++ | ||
16 | 1 file changed, 2 insertions(+) | ||
17 | create mode 100644 Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | ||
18 | |||
19 | diff --git a/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst b/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | ||
20 | new file mode 100644 | ||
21 | index 0000000..8df8299 | ||
22 | --- /dev/null | ||
23 | +++ b/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | ||
24 | @@ -0,0 +1,2 @@ | ||
25 | +Make the result of :func:`termios.tcgetattr` reproducible on Alpine Linux. | ||
26 | +Previously it could leave a random garbage in some fields. | ||
diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch new file mode 100644 index 0000000000..1d4cda18b1 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 9d4cdbde100798ba9fa1cf3f82dbaf18fd10a543 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Wed, 8 May 2024 11:58:09 -0400 | ||
4 | Subject: [PATCH] test_shutdown: skip problematic test | ||
5 | |||
6 | This test hangs frequently when run on the Autobuilder. Disable it in | ||
7 | testing until the cause can be determined. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | |||
11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
12 | --- | ||
13 | Lib/test/test_concurrent_futures/test_shutdown.py | 3 +++ | ||
14 | 1 file changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py | ||
17 | index 7a4065afd4..6b878a48bf 100644 | ||
18 | --- a/Lib/test/test_concurrent_futures/test_shutdown.py | ||
19 | +++ b/Lib/test/test_concurrent_futures/test_shutdown.py | ||
20 | @@ -20,6 +20,7 @@ def sleep_and_print(t, msg): | ||
21 | sys.stdout.flush() | ||
22 | |||
23 | |||
24 | +@unittest.skip("skipping problematic test") | ||
25 | class ExecutorShutdownTest: | ||
26 | def test_run_after_shutdown(self): | ||
27 | self.executor.shutdown() | ||
28 | @@ -156,6 +157,7 @@ def timeout(_signum, _frame): | ||
29 | signal.signal(signal.SIGALRM, old_handler) | ||
30 | |||
31 | |||
32 | +@unittest.skip("skipping problematic test") | ||
33 | class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): | ||
34 | def test_threads_terminate(self): | ||
35 | def acquire_lock(lock): | ||
36 | @@ -252,6 +254,7 @@ def test_cancel_futures_wait_false(self): | ||
37 | self.assertIn(out.strip(), [b"apple", b""]) | ||
38 | |||
39 | |||
40 | +@unittest.skip("skipping problematic test") | ||
41 | class ProcessPoolShutdownTest(ExecutorShutdownTest): | ||
42 | def test_processes_terminate(self): | ||
43 | def acquire_lock(lock): | ||
44 | -- | ||
45 | 2.45.0 | ||
46 | |||
diff --git a/meta/recipes-devtools/python/python3_3.12.3.bb b/meta/recipes-devtools/python/python3_3.12.3.bb index 04558a6463..e74c0a27aa 100644 --- a/meta/recipes-devtools/python/python3_3.12.3.bb +++ b/meta/recipes-devtools/python/python3_3.12.3.bb | |||
@@ -29,7 +29,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
29 | file://0001-Update-test_sysconfig-for-posix_user-purelib.patch \ | 29 | file://0001-Update-test_sysconfig-for-posix_user-purelib.patch \ |
30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ | 30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ |
31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ | 31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ |
32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ | 32 | file://0001-test_shutdown-skip-problematic-test.patch \ |
33 | file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ | ||
33 | " | 34 | " |
34 | 35 | ||
35 | SRC_URI:append:class-native = " \ | 36 | SRC_URI:append:class-native = " \ |
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index 997f72e6e7..90bba84b03 100644 --- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | |||
@@ -18,7 +18,8 @@ SRC_URI = "file://${COREBASE}/scripts/runqemu \ | |||
18 | file://${COREBASE}/scripts/runqemu-export-rootfs \ | 18 | file://${COREBASE}/scripts/runqemu-export-rootfs \ |
19 | " | 19 | " |
20 | 20 | ||
21 | S = "${WORKDIR}" | 21 | S = "${WORKDIR}/sources" |
22 | UNPACKDIR = "${S}" | ||
22 | 23 | ||
23 | inherit nativesdk | 24 | inherit nativesdk |
24 | 25 | ||
diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index 8bb6ef0995..28a3b95c4e 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | |||
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://${S}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab8 | |||
6 | 6 | ||
7 | SRC_URI = "file://qemu-oe-bridge-helper.c" | 7 | SRC_URI = "file://qemu-oe-bridge-helper.c" |
8 | 8 | ||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}/sources" |
10 | UNPACKDIR = "${S}" | ||
10 | 11 | ||
11 | inherit native | 12 | inherit native |
12 | 13 | ||
diff --git a/meta/recipes-devtools/qemu/qemu-native_8.2.1.bb b/meta/recipes-devtools/qemu/qemu-native_9.0.0.bb index a77953529b..a77953529b 100644 --- a/meta/recipes-devtools/qemu/qemu-native_8.2.1.bb +++ b/meta/recipes-devtools/qemu/qemu-native_9.0.0.bb | |||
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb b/meta/recipes-devtools/qemu/qemu-system-native_9.0.0.bb index 5d2fbcbc02..5d2fbcbc02 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_9.0.0.bb | |||
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f76cbbb5cb..fb38fb44de 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -22,62 +22,31 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
22 | file://powerpc_rom.bin \ | 22 | file://powerpc_rom.bin \ |
23 | file://run-ptest \ | 23 | file://run-ptest \ |
24 | file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ | 24 | file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ |
25 | file://0003-apic-fixup-fallthrough-to-PIC.patch \ | 25 | file://0002-apic-fixup-fallthrough-to-PIC.patch \ |
26 | file://0004-configure-Add-pkg-config-handling-for-libgcrypt.patch \ | 26 | file://0003-configure-Add-pkg-config-handling-for-libgcrypt.patch \ |
27 | file://0005-qemu-Do-not-include-file-if-not-exists.patch \ | 27 | file://0004-qemu-Do-not-include-file-if-not-exists.patch \ |
28 | file://0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \ | 28 | file://0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \ |
29 | file://0007-qemu-Determinism-fixes.patch \ | 29 | file://0006-qemu-Determinism-fixes.patch \ |
30 | file://0008-tests-meson.build-use-relative-path-to-refer-to-file.patch \ | 30 | file://0007-tests-meson.build-use-relative-path-to-refer-to-file.patch \ |
31 | file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ | 31 | file://0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ |
32 | file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ | 32 | file://0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ |
33 | file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ | 33 | file://0010-configure-lookup-meson-exutable-from-PATH.patch \ |
34 | file://fixedmeson.patch \ | 34 | file://0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch \ |
35 | file://no-pip.patch \ | ||
36 | file://4a8579ad8629b57a43daa62e46cc7af6e1078116.patch \ | ||
37 | file://0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch \ | ||
38 | file://0002-linux-user-loongarch64-Remove-TARGET_FORCE_SHMLBA.patch \ | ||
39 | file://0003-linux-user-Add-strace-for-shmat.patch \ | ||
40 | file://0004-linux-user-Rewrite-target_shmat.patch \ | ||
41 | file://0005-tests-tcg-Check-that-shmat-does-not-break-proc-self-.patch \ | ||
42 | file://CVE-2023-6683.patch \ | ||
43 | file://qemu-guest-agent.init \ | 35 | file://qemu-guest-agent.init \ |
44 | file://qemu-guest-agent.udev \ | 36 | file://qemu-guest-agent.udev \ |
45 | " | 37 | " |
46 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 38 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
47 | 39 | ||
48 | # SDK_OLDEST_KERNEL is set below 4.17, which is the minimum version required by QEMU >= 8.1 | 40 | SRC_URI[sha256sum] = "32708ac66c30d8c892633ea968c771c1c76d597d70ddead21a0d22ccf386da69" |
49 | # This is due to two MMAP flags being used at certain points | ||
50 | SRC_URI:append:class-nativesdk = " \ | ||
51 | file://0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch \ | ||
52 | file://0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch \ | ||
53 | " | ||
54 | |||
55 | # Support building and using native version on pre 4.17 kernels | ||
56 | SRC_URI:append:class-native = " \ | ||
57 | file://0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch \ | ||
58 | file://0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch \ | ||
59 | " | ||
60 | |||
61 | SRC_URI[sha256sum] = "8562751158175f9d187c5f22b57555abe3c870f0325c8ced12c34c6d987729be" | ||
62 | 41 | ||
63 | CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." | 42 | CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." |
64 | 43 | ||
65 | # https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 | 44 | # https://bugzilla.redhat.com/show_bug.cgi?id=1609015#c11 |
66 | CVE_STATUS[CVE-2018-18438] = "disputed: The issues identified by this CVE were determined to not constitute a vulnerability." | 45 | CVE_STATUS[CVE-2018-18438] = "disputed: The issues identified by this CVE were determined to not constitute a vulnerability." |
67 | 46 | ||
68 | # As per https://nvd.nist.gov/vuln/detail/CVE-2023-0664 | ||
69 | # https://bugzilla.redhat.com/show_bug.cgi?id=2167423 | ||
70 | CVE_STATUS[CVE-2023-0664] = "not-applicable-platform: Issue only applies on Windows" | ||
71 | |||
72 | # As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387 | 47 | # As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387 |
73 | CVE_STATUS[CVE-2023-2680] = "not-applicable-platform: RHEL specific issue." | 48 | CVE_STATUS[CVE-2023-2680] = "not-applicable-platform: RHEL specific issue." |
74 | 49 | ||
75 | CVE_STATUS[CVE-2023-3019] = "cpe-incorrect: Applies only against versions before 8.2.0" | ||
76 | |||
77 | CVE_STATUS[CVE-2023-5088] = "cpe-incorrect: Applies only against version 8.2.0 and earlier" | ||
78 | |||
79 | CVE_STATUS[CVE-2023-6693] = "cpe-incorrect: Applies only against version 8.2.0 and earlier" | ||
80 | |||
81 | COMPATIBLE_HOST:mipsarchn32 = "null" | 50 | COMPATIBLE_HOST:mipsarchn32 = "null" |
82 | COMPATIBLE_HOST:mipsarchn64 = "null" | 51 | COMPATIBLE_HOST:mipsarchn64 = "null" |
83 | COMPATIBLE_HOST:riscv32 = "null" | 52 | COMPATIBLE_HOST:riscv32 = "null" |
@@ -182,6 +151,8 @@ do_install () { | |||
182 | rm ${D}${datadir}/qemu/s390-netboot.img -f | 151 | rm ${D}${datadir}/qemu/s390-netboot.img -f |
183 | # ELF binary /usr/share/qemu/s390-ccw.img has relocations in .text [textrel] | 152 | # ELF binary /usr/share/qemu/s390-ccw.img has relocations in .text [textrel] |
184 | rm ${D}${datadir}/qemu/s390-ccw.img -f | 153 | rm ${D}${datadir}/qemu/s390-ccw.img -f |
154 | # We don't support PARISC and these cause strip and SDK relocation errors | ||
155 | rm ${D}${datadir}/qemu/hppa* -f | ||
185 | } | 156 | } |
186 | 157 | ||
187 | # The following fragment will create a wrapper for qemu-mips user emulation | 158 | # The following fragment will create a wrapper for qemu-mips user emulation |
diff --git a/meta/recipes-devtools/qemu/qemu/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch b/meta/recipes-devtools/qemu/qemu/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch deleted file mode 100644 index 2eaebe883c..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 4517e2046610722879761bcdb60edbb2b929c848 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Henderson <richard.henderson@linaro.org> | ||
3 | Date: Wed, 28 Feb 2024 10:25:14 -1000 | ||
4 | Subject: [PATCH 1/5] linux-user/x86_64: Handle the vsyscall page in | ||
5 | open_self_maps_{2,4} | ||
6 | |||
7 | This is the only case in which we expect to have no host memory backing | ||
8 | for a guest memory page, because in general linux user processes cannot | ||
9 | map any pages in the top half of the 64-bit address space. | ||
10 | |||
11 | Upstream-Status: Submitted [https://www.mail-archive.com/qemu-devel@nongnu.org/msg1026793.html] | ||
12 | |||
13 | Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2170 | ||
14 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
16 | --- | ||
17 | linux-user/syscall.c | 16 ++++++++++++++++ | ||
18 | 1 file changed, 16 insertions(+) | ||
19 | |||
20 | diff --git a/linux-user/syscall.c b/linux-user/syscall.c | ||
21 | index a114f29a8..8307a8a61 100644 | ||
22 | --- a/linux-user/syscall.c | ||
23 | +++ b/linux-user/syscall.c | ||
24 | @@ -7922,6 +7922,10 @@ static void open_self_maps_4(const struct open_self_maps_data *d, | ||
25 | path = "[heap]"; | ||
26 | } else if (start == info->vdso) { | ||
27 | path = "[vdso]"; | ||
28 | +#ifdef TARGET_X86_64 | ||
29 | + } else if (start == TARGET_VSYSCALL_PAGE) { | ||
30 | + path = "[vsyscall]"; | ||
31 | +#endif | ||
32 | } | ||
33 | |||
34 | /* Except null device (MAP_ANON), adjust offset for this fragment. */ | ||
35 | @@ -8010,6 +8014,18 @@ static int open_self_maps_2(void *opaque, target_ulong guest_start, | ||
36 | uintptr_t host_start = (uintptr_t)g2h_untagged(guest_start); | ||
37 | uintptr_t host_last = (uintptr_t)g2h_untagged(guest_end - 1); | ||
38 | |||
39 | +#ifdef TARGET_X86_64 | ||
40 | + /* | ||
41 | + * Because of the extremely high position of the page within the guest | ||
42 | + * virtual address space, this is not backed by host memory at all. | ||
43 | + * Therefore the loop below would fail. This is the only instance | ||
44 | + * of not having host backing memory. | ||
45 | + */ | ||
46 | + if (guest_start == TARGET_VSYSCALL_PAGE) { | ||
47 | + return open_self_maps_3(opaque, guest_start, guest_end, flags); | ||
48 | + } | ||
49 | +#endif | ||
50 | + | ||
51 | while (1) { | ||
52 | IntervalTreeNode *n = | ||
53 | interval_tree_iter_first(d->host_maps, host_start, host_start); | ||
54 | -- | ||
55 | 2.34.1 | ||
56 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch index c65508017d..2333cc8432 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From de64af82950a6908f9407dfc92b83c17e2af3eab Mon Sep 17 00:00:00 2001 | 1 | From e9baf07a667a1c04b57e14776cc4fa387448c908 Mon Sep 17 00:00:00 2001 |
2 | From: Jason Wessel <jason.wessel@windriver.com> | 2 | From: Jason Wessel <jason.wessel@windriver.com> |
3 | Date: Fri, 28 Mar 2014 17:42:43 +0800 | 3 | Date: Fri, 28 Mar 2014 17:42:43 +0800 |
4 | Subject: [PATCH 01/12] qemu: Add addition environment space to boot loader | 4 | Subject: [PATCH 01/11] qemu: Add addition environment space to boot loader |
5 | qemu-system-mips | 5 | qemu-system-mips |
6 | 6 | ||
7 | Upstream-Status: Inappropriate - OE uses deep paths | 7 | Upstream-Status: Inappropriate - OE uses deep paths |
@@ -13,16 +13,15 @@ to only 256 bytes. This patch expands the limit. | |||
13 | 13 | ||
14 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | 14 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> |
15 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 15 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
16 | |||
17 | --- | 16 | --- |
18 | hw/mips/malta.c | 2 +- | 17 | hw/mips/malta.c | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 19 | ||
21 | Index: qemu-8.0.0/hw/mips/malta.c | 20 | diff --git a/hw/mips/malta.c b/hw/mips/malta.c |
22 | =================================================================== | 21 | index af74008c82..a588b9ad4e 100644 |
23 | --- qemu-8.0.0.orig/hw/mips/malta.c | 22 | --- a/hw/mips/malta.c |
24 | +++ qemu-8.0.0/hw/mips/malta.c | 23 | +++ b/hw/mips/malta.c |
25 | @@ -64,7 +64,7 @@ | 24 | @@ -63,7 +63,7 @@ |
26 | #define ENVP_PADDR 0x2000 | 25 | #define ENVP_PADDR 0x2000 |
27 | #define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR) | 26 | #define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR) |
28 | #define ENVP_NB_ENTRIES 16 | 27 | #define ENVP_NB_ENTRIES 16 |
@@ -31,3 +30,6 @@ Index: qemu-8.0.0/hw/mips/malta.c | |||
31 | 30 | ||
32 | /* Hardware addresses */ | 31 | /* Hardware addresses */ |
33 | #define FLASH_ADDRESS 0x1e000000ULL | 32 | #define FLASH_ADDRESS 0x1e000000ULL |
33 | -- | ||
34 | 2.44.0 | ||
35 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0003-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch index e85f8202e9..5f8fe4faa3 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From dc2a8ccd440ee3741b61606eafed3f7e092f4312 Mon Sep 17 00:00:00 2001 | 1 | From 23bf534e463bf4c1ba2e1356eaf17be0b23b192e Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Tue, 26 Feb 2013 11:43:28 -0500 | 3 | Date: Tue, 26 Feb 2013 11:43:28 -0500 |
4 | Subject: [PATCH 03/12] apic: fixup fallthrough to PIC | 4 | Subject: [PATCH 02/11] apic: fixup fallthrough to PIC |
5 | 5 | ||
6 | Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC | 6 | Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC |
7 | interrupts through the local APIC if the local APIC config says so.] | 7 | interrupts through the local APIC if the local APIC config says so.] |
@@ -24,16 +24,15 @@ serviced, is -1. | |||
24 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 24 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
25 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html] | 25 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html] |
26 | Signed-off-by: He Zhe <zhe.he@windriver.com> | 26 | Signed-off-by: He Zhe <zhe.he@windriver.com> |
27 | |||
28 | --- | 27 | --- |
29 | hw/intc/apic.c | 2 +- | 28 | hw/intc/apic.c | 2 +- |
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | 29 | 1 file changed, 1 insertion(+), 1 deletion(-) |
31 | 30 | ||
32 | Index: qemu-8.0.0/hw/intc/apic.c | 31 | diff --git a/hw/intc/apic.c b/hw/intc/apic.c |
33 | =================================================================== | 32 | index 4186c57b34..43cd805a96 100644 |
34 | --- qemu-8.0.0.orig/hw/intc/apic.c | 33 | --- a/hw/intc/apic.c |
35 | +++ qemu-8.0.0/hw/intc/apic.c | 34 | +++ b/hw/intc/apic.c |
36 | @@ -607,7 +607,7 @@ int apic_accept_pic_intr(DeviceState *de | 35 | @@ -759,7 +759,7 @@ int apic_accept_pic_intr(DeviceState *dev) |
37 | APICCommonState *s = APIC(dev); | 36 | APICCommonState *s = APIC(dev); |
38 | uint32_t lvt0; | 37 | uint32_t lvt0; |
39 | 38 | ||
@@ -42,3 +41,6 @@ Index: qemu-8.0.0/hw/intc/apic.c | |||
42 | return -1; | 41 | return -1; |
43 | 42 | ||
44 | lvt0 = s->lvt[APIC_LVT_LINT0]; | 43 | lvt0 = s->lvt[APIC_LVT_LINT0]; |
44 | -- | ||
45 | 2.44.0 | ||
46 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0002-linux-user-loongarch64-Remove-TARGET_FORCE_SHMLBA.patch b/meta/recipes-devtools/qemu/qemu/0002-linux-user-loongarch64-Remove-TARGET_FORCE_SHMLBA.patch deleted file mode 100644 index 3f01aaa644..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0002-linux-user-loongarch64-Remove-TARGET_FORCE_SHMLBA.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 5bf65b24414d3ff8339f6f1beb221c7c35c91e5d Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Henderson <richard.henderson@linaro.org> | ||
3 | Date: Wed, 28 Feb 2024 10:25:15 -1000 | ||
4 | Subject: [PATCH 2/5] linux-user/loongarch64: Remove TARGET_FORCE_SHMLBA | ||
5 | |||
6 | The kernel abi was changed with | ||
7 | |||
8 | commit d23b77953f5a4fbf94c05157b186aac2a247ae32 | ||
9 | Author: Huacai Chen <chenhuacai@kernel.org> | ||
10 | Date: Wed Jan 17 12:43:08 2024 +0800 | ||
11 | |||
12 | LoongArch: Change SHMLBA from SZ_64K to PAGE_SIZE | ||
13 | |||
14 | during the v6.8 cycle. | ||
15 | |||
16 | Upstream-Status: Submitted [https://www.mail-archive.com/qemu-devel@nongnu.org/msg1026793.html] | ||
17 | |||
18 | Reviewed-by: Song Gao <gaosong@loongson.cn> | ||
19 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
20 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
21 | --- | ||
22 | linux-user/loongarch64/target_syscall.h | 7 ------- | ||
23 | 1 file changed, 7 deletions(-) | ||
24 | |||
25 | diff --git a/linux-user/loongarch64/target_syscall.h b/linux-user/loongarch64/target_syscall.h | ||
26 | index 8b5de5212..39f229bb9 100644 | ||
27 | --- a/linux-user/loongarch64/target_syscall.h | ||
28 | +++ b/linux-user/loongarch64/target_syscall.h | ||
29 | @@ -38,11 +38,4 @@ struct target_pt_regs { | ||
30 | #define TARGET_MCL_FUTURE 2 | ||
31 | #define TARGET_MCL_ONFAULT 4 | ||
32 | |||
33 | -#define TARGET_FORCE_SHMLBA | ||
34 | - | ||
35 | -static inline abi_ulong target_shmlba(CPULoongArchState *env) | ||
36 | -{ | ||
37 | - return 64 * KiB; | ||
38 | -} | ||
39 | - | ||
40 | #endif | ||
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch index f981a64a54..30e269f8f4 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d8265abdce5dc2bf74b3fccdf2b7257b4f3894f0 Mon Sep 17 00:00:00 2001 | 1 | From e4f6c6b9f43b28271bc9dc6cbcafad53f80387e0 Mon Sep 17 00:00:00 2001 |
2 | From: He Zhe <zhe.he@windriver.com> | 2 | From: He Zhe <zhe.he@windriver.com> |
3 | Date: Wed, 28 Aug 2019 19:56:28 +0800 | 3 | Date: Wed, 28 Aug 2019 19:56:28 +0800 |
4 | Subject: [PATCH 04/12] configure: Add pkg-config handling for libgcrypt | 4 | Subject: [PATCH 03/11] configure: Add pkg-config handling for libgcrypt |
5 | 5 | ||
6 | libgcrypt may also be controlled by pkg-config, this patch adds pkg-config | 6 | libgcrypt may also be controlled by pkg-config, this patch adds pkg-config |
7 | handling for libgcrypt. | 7 | handling for libgcrypt. |
@@ -9,16 +9,15 @@ handling for libgcrypt. | |||
9 | Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] | 9 | Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] |
10 | 10 | ||
11 | Signed-off-by: He Zhe <zhe.he@windriver.com> | 11 | Signed-off-by: He Zhe <zhe.he@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | meson.build | 2 +- | 13 | meson.build | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 15 | ||
17 | Index: qemu-8.1.0/meson.build | 16 | diff --git a/meson.build b/meson.build |
18 | =================================================================== | 17 | index 91a0aa64c6..e8373d55b8 100644 |
19 | --- qemu-8.1.0.orig/meson.build | 18 | --- a/meson.build |
20 | +++ qemu-8.1.0/meson.build | 19 | +++ b/meson.build |
21 | @@ -1481,7 +1481,7 @@ endif | 20 | @@ -1655,7 +1655,7 @@ endif |
22 | if not gnutls_crypto.found() | 21 | if not gnutls_crypto.found() |
23 | if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() | 22 | if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() |
24 | gcrypt = dependency('libgcrypt', version: '>=1.8', | 23 | gcrypt = dependency('libgcrypt', version: '>=1.8', |
@@ -27,3 +26,6 @@ Index: qemu-8.1.0/meson.build | |||
27 | required: get_option('gcrypt')) | 26 | required: get_option('gcrypt')) |
28 | # Debian has removed -lgpg-error from libgcrypt-config | 27 | # Debian has removed -lgpg-error from libgcrypt-config |
29 | # as it "spreads unnecessary dependencies" which in | 28 | # as it "spreads unnecessary dependencies" which in |
29 | -- | ||
30 | 2.44.0 | ||
31 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0003-linux-user-Add-strace-for-shmat.patch b/meta/recipes-devtools/qemu/qemu/0003-linux-user-Add-strace-for-shmat.patch deleted file mode 100644 index 0c601c804a..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0003-linux-user-Add-strace-for-shmat.patch +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | From e8f06676c6c88e12cd5f4f81a839b7111c683596 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Henderson <richard.henderson@linaro.org> | ||
3 | Date: Wed, 28 Feb 2024 10:25:16 -1000 | ||
4 | Subject: [PATCH 3/5] linux-user: Add strace for shmat | ||
5 | |||
6 | Upstream-Status: Submitted [https://www.mail-archive.com/qemu-devel@nongnu.org/msg1026793.html] | ||
7 | |||
8 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
10 | --- | ||
11 | linux-user/strace.c | 23 +++++++++++++++++++++++ | ||
12 | linux-user/strace.list | 2 +- | ||
13 | 2 files changed, 24 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/linux-user/strace.c b/linux-user/strace.c | ||
16 | index cf26e5526..47d6ec326 100644 | ||
17 | --- a/linux-user/strace.c | ||
18 | +++ b/linux-user/strace.c | ||
19 | @@ -670,6 +670,25 @@ print_semctl(CPUArchState *cpu_env, const struct syscallname *name, | ||
20 | } | ||
21 | #endif | ||
22 | |||
23 | +static void | ||
24 | +print_shmat(CPUArchState *cpu_env, const struct syscallname *name, | ||
25 | + abi_long arg0, abi_long arg1, abi_long arg2, | ||
26 | + abi_long arg3, abi_long arg4, abi_long arg5) | ||
27 | +{ | ||
28 | + static const struct flags shmat_flags[] = { | ||
29 | + FLAG_GENERIC(SHM_RND), | ||
30 | + FLAG_GENERIC(SHM_REMAP), | ||
31 | + FLAG_GENERIC(SHM_RDONLY), | ||
32 | + FLAG_GENERIC(SHM_EXEC), | ||
33 | + }; | ||
34 | + | ||
35 | + print_syscall_prologue(name); | ||
36 | + print_raw_param(TARGET_ABI_FMT_ld, arg0, 0); | ||
37 | + print_pointer(arg1, 0); | ||
38 | + print_flags(shmat_flags, arg2, 1); | ||
39 | + print_syscall_epilogue(name); | ||
40 | +} | ||
41 | + | ||
42 | #ifdef TARGET_NR_ipc | ||
43 | static void | ||
44 | print_ipc(CPUArchState *cpu_env, const struct syscallname *name, | ||
45 | @@ -683,6 +702,10 @@ print_ipc(CPUArchState *cpu_env, const struct syscallname *name, | ||
46 | print_ipc_cmd(arg3); | ||
47 | qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); | ||
48 | break; | ||
49 | + case IPCOP_shmat: | ||
50 | + print_shmat(cpu_env, &(const struct syscallname){ .name = "shmat" }, | ||
51 | + arg1, arg4, arg2, 0, 0, 0); | ||
52 | + break; | ||
53 | default: | ||
54 | qemu_log(("%s(" | ||
55 | TARGET_ABI_FMT_ld "," | ||
56 | diff --git a/linux-user/strace.list b/linux-user/strace.list | ||
57 | index 6655d4f26..dfd4237d1 100644 | ||
58 | --- a/linux-user/strace.list | ||
59 | +++ b/linux-user/strace.list | ||
60 | @@ -1398,7 +1398,7 @@ | ||
61 | { TARGET_NR_sgetmask, "sgetmask" , NULL, NULL, NULL }, | ||
62 | #endif | ||
63 | #ifdef TARGET_NR_shmat | ||
64 | -{ TARGET_NR_shmat, "shmat" , NULL, NULL, print_syscall_ret_addr }, | ||
65 | +{ TARGET_NR_shmat, "shmat" , NULL, print_shmat, print_syscall_ret_addr }, | ||
66 | #endif | ||
67 | #ifdef TARGET_NR_shmctl | ||
68 | { TARGET_NR_shmctl, "shmctl" , NULL, NULL, NULL }, | ||
69 | -- | ||
70 | 2.34.1 | ||
71 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0004-linux-user-Rewrite-target_shmat.patch b/meta/recipes-devtools/qemu/qemu/0004-linux-user-Rewrite-target_shmat.patch deleted file mode 100644 index 88c3ed40b0..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0004-linux-user-Rewrite-target_shmat.patch +++ /dev/null | |||
@@ -1,236 +0,0 @@ | |||
1 | From cb48d5d1592e63ebd0d4a3e300ef98e38e6306d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Henderson <richard.henderson@linaro.org> | ||
3 | Date: Wed, 28 Feb 2024 10:25:17 -1000 | ||
4 | Subject: [PATCH 4/5] linux-user: Rewrite target_shmat | ||
5 | |||
6 | Handle combined host and guest alignment requirements. | ||
7 | Handle host and guest page size differences. | ||
8 | Handle SHM_EXEC. | ||
9 | |||
10 | Upstream-Status: Submitted [https://www.mail-archive.com/qemu-devel@nongnu.org/msg1026793.html] | ||
11 | |||
12 | Resolves: https://gitlab.com/qemu-project/qemu/-/issues/115 | ||
13 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
15 | --- | ||
16 | linux-user/mmap.c | 166 +++++++++++++++++++++++++++++++++++++--------- | ||
17 | 1 file changed, 133 insertions(+), 33 deletions(-) | ||
18 | |||
19 | diff --git a/linux-user/mmap.c b/linux-user/mmap.c | ||
20 | index 18fb3aaf7..6a2f649bb 100644 | ||
21 | --- a/linux-user/mmap.c | ||
22 | +++ b/linux-user/mmap.c | ||
23 | @@ -1062,69 +1062,161 @@ static inline abi_ulong target_shmlba(CPUArchState *cpu_env) | ||
24 | } | ||
25 | #endif | ||
26 | |||
27 | +#if defined(__arm__) || defined(__mips__) || defined(__sparc__) | ||
28 | +#define HOST_FORCE_SHMLBA 1 | ||
29 | +#else | ||
30 | +#define HOST_FORCE_SHMLBA 0 | ||
31 | +#endif | ||
32 | + | ||
33 | abi_ulong target_shmat(CPUArchState *cpu_env, int shmid, | ||
34 | abi_ulong shmaddr, int shmflg) | ||
35 | { | ||
36 | CPUState *cpu = env_cpu(cpu_env); | ||
37 | - abi_ulong raddr; | ||
38 | struct shmid_ds shm_info; | ||
39 | int ret; | ||
40 | - abi_ulong shmlba; | ||
41 | + int h_pagesize; | ||
42 | + int t_shmlba, h_shmlba, m_shmlba; | ||
43 | + size_t t_len, h_len, m_len; | ||
44 | |||
45 | /* shmat pointers are always untagged */ | ||
46 | |||
47 | - /* find out the length of the shared memory segment */ | ||
48 | + /* | ||
49 | + * Because we can't use host shmat() unless the address is sufficiently | ||
50 | + * aligned for the host, we'll need to check both. | ||
51 | + * TODO: Could be fixed with softmmu. | ||
52 | + */ | ||
53 | + t_shmlba = target_shmlba(cpu_env); | ||
54 | + h_pagesize = qemu_real_host_page_size(); | ||
55 | + h_shmlba = (HOST_FORCE_SHMLBA ? SHMLBA : h_pagesize); | ||
56 | + m_shmlba = MAX(t_shmlba, h_shmlba); | ||
57 | + | ||
58 | + if (shmaddr) { | ||
59 | + if (shmaddr & (m_shmlba - 1)) { | ||
60 | + if (shmflg & SHM_RND) { | ||
61 | + /* | ||
62 | + * The guest is allowing the kernel to round the address. | ||
63 | + * Assume that the guest is ok with us rounding to the | ||
64 | + * host required alignment too. Anyway if we don't, we'll | ||
65 | + * get an error from the kernel. | ||
66 | + */ | ||
67 | + shmaddr &= ~(m_shmlba - 1); | ||
68 | + if (shmaddr == 0 && (shmflg & SHM_REMAP)) { | ||
69 | + return -TARGET_EINVAL; | ||
70 | + } | ||
71 | + } else { | ||
72 | + int require = TARGET_PAGE_SIZE; | ||
73 | +#ifdef TARGET_FORCE_SHMLBA | ||
74 | + require = t_shmlba; | ||
75 | +#endif | ||
76 | + /* | ||
77 | + * Include host required alignment, as otherwise we cannot | ||
78 | + * use host shmat at all. | ||
79 | + */ | ||
80 | + require = MAX(require, h_shmlba); | ||
81 | + if (shmaddr & (require - 1)) { | ||
82 | + return -TARGET_EINVAL; | ||
83 | + } | ||
84 | + } | ||
85 | + } | ||
86 | + } else { | ||
87 | + if (shmflg & SHM_REMAP) { | ||
88 | + return -TARGET_EINVAL; | ||
89 | + } | ||
90 | + } | ||
91 | + /* All rounding now manually concluded. */ | ||
92 | + shmflg &= ~SHM_RND; | ||
93 | + | ||
94 | + /* Find out the length of the shared memory segment. */ | ||
95 | ret = get_errno(shmctl(shmid, IPC_STAT, &shm_info)); | ||
96 | if (is_error(ret)) { | ||
97 | /* can't get length, bail out */ | ||
98 | return ret; | ||
99 | } | ||
100 | + t_len = TARGET_PAGE_ALIGN(shm_info.shm_segsz); | ||
101 | + h_len = ROUND_UP(shm_info.shm_segsz, h_pagesize); | ||
102 | + m_len = MAX(t_len, h_len); | ||
103 | |||
104 | - shmlba = target_shmlba(cpu_env); | ||
105 | - | ||
106 | - if (shmaddr & (shmlba - 1)) { | ||
107 | - if (shmflg & SHM_RND) { | ||
108 | - shmaddr &= ~(shmlba - 1); | ||
109 | - } else { | ||
110 | - return -TARGET_EINVAL; | ||
111 | - } | ||
112 | - } | ||
113 | - if (!guest_range_valid_untagged(shmaddr, shm_info.shm_segsz)) { | ||
114 | + if (!guest_range_valid_untagged(shmaddr, m_len)) { | ||
115 | return -TARGET_EINVAL; | ||
116 | } | ||
117 | |||
118 | WITH_MMAP_LOCK_GUARD() { | ||
119 | - void *host_raddr; | ||
120 | + bool mapped = false; | ||
121 | + void *want, *test; | ||
122 | abi_ulong last; | ||
123 | |||
124 | - if (shmaddr) { | ||
125 | - host_raddr = shmat(shmid, (void *)g2h_untagged(shmaddr), shmflg); | ||
126 | + if (!shmaddr) { | ||
127 | + shmaddr = mmap_find_vma(0, m_len, m_shmlba); | ||
128 | + if (shmaddr == -1) { | ||
129 | + return -TARGET_ENOMEM; | ||
130 | + } | ||
131 | + mapped = !reserved_va; | ||
132 | + } else if (shmflg & SHM_REMAP) { | ||
133 | + /* | ||
134 | + * If host page size > target page size, the host shmat may map | ||
135 | + * more memory than the guest expects. Reject a mapping that | ||
136 | + * would replace memory in the unexpected gap. | ||
137 | + * TODO: Could be fixed with softmmu. | ||
138 | + */ | ||
139 | + if (t_len < h_len && | ||
140 | + !page_check_range_empty(shmaddr + t_len, | ||
141 | + shmaddr + h_len - 1)) { | ||
142 | + return -TARGET_EINVAL; | ||
143 | + } | ||
144 | } else { | ||
145 | - abi_ulong mmap_start; | ||
146 | + if (!page_check_range_empty(shmaddr, shmaddr + m_len - 1)) { | ||
147 | + return -TARGET_EINVAL; | ||
148 | + } | ||
149 | + } | ||
150 | |||
151 | - /* In order to use the host shmat, we need to honor host SHMLBA. */ | ||
152 | - mmap_start = mmap_find_vma(0, shm_info.shm_segsz, | ||
153 | - MAX(SHMLBA, shmlba)); | ||
154 | + /* All placement is now complete. */ | ||
155 | + want = (void *)g2h_untagged(shmaddr); | ||
156 | |||
157 | - if (mmap_start == -1) { | ||
158 | - return -TARGET_ENOMEM; | ||
159 | + /* | ||
160 | + * Map anonymous pages across the entire range, then remap with | ||
161 | + * the shared memory. This is required for a number of corner | ||
162 | + * cases for which host and guest page sizes differ. | ||
163 | + */ | ||
164 | + if (h_len != t_len) { | ||
165 | + int mmap_p = PROT_READ | (shmflg & SHM_RDONLY ? 0 : PROT_WRITE); | ||
166 | + int mmap_f = MAP_PRIVATE | MAP_ANONYMOUS | ||
167 | + | (reserved_va || (shmflg & SHM_REMAP) | ||
168 | + ? MAP_FIXED : MAP_FIXED_NOREPLACE); | ||
169 | + | ||
170 | + test = mmap(want, m_len, mmap_p, mmap_f, -1, 0); | ||
171 | + if (unlikely(test != want)) { | ||
172 | + /* shmat returns EINVAL not EEXIST like mmap. */ | ||
173 | + ret = (test == MAP_FAILED && errno != EEXIST | ||
174 | + ? get_errno(-1) : -TARGET_EINVAL); | ||
175 | + if (mapped) { | ||
176 | + do_munmap(want, m_len); | ||
177 | + } | ||
178 | + return ret; | ||
179 | } | ||
180 | - host_raddr = shmat(shmid, g2h_untagged(mmap_start), | ||
181 | - shmflg | SHM_REMAP); | ||
182 | + mapped = true; | ||
183 | } | ||
184 | |||
185 | - if (host_raddr == (void *)-1) { | ||
186 | - return get_errno(-1); | ||
187 | + if (reserved_va || mapped) { | ||
188 | + shmflg |= SHM_REMAP; | ||
189 | + } | ||
190 | + test = shmat(shmid, want, shmflg); | ||
191 | + if (test == MAP_FAILED) { | ||
192 | + ret = get_errno(-1); | ||
193 | + if (mapped) { | ||
194 | + do_munmap(want, m_len); | ||
195 | + } | ||
196 | + return ret; | ||
197 | } | ||
198 | - raddr = h2g(host_raddr); | ||
199 | - last = raddr + shm_info.shm_segsz - 1; | ||
200 | + assert(test == want); | ||
201 | |||
202 | - page_set_flags(raddr, last, | ||
203 | + last = shmaddr + m_len - 1; | ||
204 | + page_set_flags(shmaddr, last, | ||
205 | PAGE_VALID | PAGE_RESET | PAGE_READ | | ||
206 | - (shmflg & SHM_RDONLY ? 0 : PAGE_WRITE)); | ||
207 | + (shmflg & SHM_RDONLY ? 0 : PAGE_WRITE) | | ||
208 | + (shmflg & SHM_EXEC ? PAGE_EXEC : 0)); | ||
209 | |||
210 | - shm_region_rm_complete(raddr, last); | ||
211 | - shm_region_add(raddr, last); | ||
212 | + shm_region_rm_complete(shmaddr, last); | ||
213 | + shm_region_add(shmaddr, last); | ||
214 | } | ||
215 | |||
216 | /* | ||
217 | @@ -1138,7 +1230,15 @@ abi_ulong target_shmat(CPUArchState *cpu_env, int shmid, | ||
218 | tb_flush(cpu); | ||
219 | } | ||
220 | |||
221 | - return raddr; | ||
222 | + if (qemu_loglevel_mask(CPU_LOG_PAGE)) { | ||
223 | + FILE *f = qemu_log_trylock(); | ||
224 | + if (f) { | ||
225 | + fprintf(f, "page layout changed following shmat\n"); | ||
226 | + page_dump(f); | ||
227 | + qemu_log_unlock(f); | ||
228 | + } | ||
229 | + } | ||
230 | + return shmaddr; | ||
231 | } | ||
232 | |||
233 | abi_long target_shmdt(abi_ulong shmaddr) | ||
234 | -- | ||
235 | 2.34.1 | ||
236 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch index 38aa4c3bbe..d9cab428c4 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-Do-not-include-file-if-not-exists.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f39e7bfc5ed07b5ecaeb705c4eae4855ca120d47 Mon Sep 17 00:00:00 2001 | 1 | From 5223d46a8d5302396f9fc7cc5d830769e87242fe Mon Sep 17 00:00:00 2001 |
2 | From: Oleksiy Obitotskyy <oobitots@cisco.com> | 2 | From: Oleksiy Obitotskyy <oobitots@cisco.com> |
3 | Date: Wed, 25 Mar 2020 21:21:35 +0200 | 3 | Date: Wed, 25 Mar 2020 21:21:35 +0200 |
4 | Subject: [PATCH 05/12] qemu: Do not include file if not exists | 4 | Subject: [PATCH 04/11] qemu: Do not include file if not exists |
5 | 5 | ||
6 | Script configure checks for if_alg.h and check failed but | 6 | Script configure checks for if_alg.h and check failed but |
7 | if_alg.h still included. | 7 | if_alg.h still included. |
@@ -11,16 +11,15 @@ Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> | |||
11 | 11 | ||
12 | [update patch context] | 12 | [update patch context] |
13 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | 13 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
14 | |||
15 | --- | 14 | --- |
16 | linux-user/syscall.c | 2 ++ | 15 | linux-user/syscall.c | 2 ++ |
17 | 1 file changed, 2 insertions(+) | 16 | 1 file changed, 2 insertions(+) |
18 | 17 | ||
19 | Index: qemu-8.0.0/linux-user/syscall.c | 18 | diff --git a/linux-user/syscall.c b/linux-user/syscall.c |
20 | =================================================================== | 19 | index 3df2b94d9a..18f09f1f07 100644 |
21 | --- qemu-8.0.0.orig/linux-user/syscall.c | 20 | --- a/linux-user/syscall.c |
22 | +++ qemu-8.0.0/linux-user/syscall.c | 21 | +++ b/linux-user/syscall.c |
23 | @@ -115,7 +115,9 @@ | 22 | @@ -116,7 +116,9 @@ |
24 | #include <linux/blkpg.h> | 23 | #include <linux/blkpg.h> |
25 | #include <netpacket/packet.h> | 24 | #include <netpacket/packet.h> |
26 | #include <linux/netlink.h> | 25 | #include <linux/netlink.h> |
@@ -30,3 +29,6 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
30 | #include <linux/rtc.h> | 29 | #include <linux/rtc.h> |
31 | #include <sound/asound.h> | 30 | #include <sound/asound.h> |
32 | #ifdef HAVE_BTRFS_H | 31 | #ifdef HAVE_BTRFS_H |
32 | -- | ||
33 | 2.44.0 | ||
34 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch index 5d1d7c6881..3c7f5776ff 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 375cae3dd6151ef33cae8f243f6a2c2da6c0c356 Mon Sep 17 00:00:00 2001 | 1 | From 1c295069857b9850f15f2cd6b33b133ea641a454 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Fri, 8 Jan 2021 17:27:06 +0000 | 3 | Date: Fri, 8 Jan 2021 17:27:06 +0000 |
4 | Subject: [PATCH 06/12] qemu: Add some user space mmap tweaks to address musl | 4 | Subject: [PATCH 05/11] qemu: Add some user space mmap tweaks to address musl |
5 | 32 bit | 5 | 32 bit |
6 | 6 | ||
7 | When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an | 7 | When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an |
@@ -18,16 +18,15 @@ rather than ENOMEM so adjust the other part of the test to this. | |||
18 | 18 | ||
19 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] | 19 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] |
20 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org | 20 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org |
21 | |||
22 | --- | 21 | --- |
23 | linux-user/mmap.c | 10 +++++++--- | 22 | linux-user/mmap.c | 10 +++++++--- |
24 | 1 file changed, 7 insertions(+), 3 deletions(-) | 23 | 1 file changed, 7 insertions(+), 3 deletions(-) |
25 | 24 | ||
26 | Index: qemu-8.0.0/linux-user/mmap.c | 25 | diff --git a/linux-user/mmap.c b/linux-user/mmap.c |
27 | =================================================================== | 26 | index be3b9a68eb..481286f01d 100644 |
28 | --- qemu-8.0.0.orig/linux-user/mmap.c | 27 | --- a/linux-user/mmap.c |
29 | +++ qemu-8.0.0/linux-user/mmap.c | 28 | +++ b/linux-user/mmap.c |
30 | @@ -776,12 +776,16 @@ abi_long target_mremap(abi_ulong old_add | 29 | @@ -1060,12 +1060,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, |
31 | int prot; | 30 | int prot; |
32 | void *host_addr; | 31 | void *host_addr; |
33 | 32 | ||
@@ -47,3 +46,6 @@ Index: qemu-8.0.0/linux-user/mmap.c | |||
47 | return -1; | 46 | return -1; |
48 | } | 47 | } |
49 | 48 | ||
49 | -- | ||
50 | 2.44.0 | ||
51 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0005-tests-tcg-Check-that-shmat-does-not-break-proc-self-.patch b/meta/recipes-devtools/qemu/qemu/0005-tests-tcg-Check-that-shmat-does-not-break-proc-self-.patch deleted file mode 100644 index 5afb35ea0c..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0005-tests-tcg-Check-that-shmat-does-not-break-proc-self-.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | From 1234063488134ad1f541f56dd30caa7896905f06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ilya Leoshkevich <iii@linux.ibm.com> | ||
3 | Date: Wed, 28 Feb 2024 10:25:18 -1000 | ||
4 | Subject: [PATCH 5/5] tests/tcg: Check that shmat() does not break | ||
5 | /proc/self/maps | ||
6 | |||
7 | Add a regression test for a recently fixed issue, where shmat() | ||
8 | desynced the guest and the host view of the address space and caused | ||
9 | open("/proc/self/maps") to SEGV. | ||
10 | |||
11 | Upstream-Status: Submitted [https://www.mail-archive.com/qemu-devel@nongnu.org/msg1026793.html] | ||
12 | |||
13 | Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> | ||
14 | Message-Id: <jwyuvao4apydvykmsnvacwshdgy3ixv7qvkh4dbxm3jkwgnttw@k4wpaayou7oq> | ||
15 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
16 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
17 | --- | ||
18 | tests/tcg/multiarch/linux/linux-shmat-maps.c | 55 ++++++++++++++++++++ | ||
19 | 1 file changed, 55 insertions(+) | ||
20 | create mode 100644 tests/tcg/multiarch/linux/linux-shmat-maps.c | ||
21 | |||
22 | diff --git a/tests/tcg/multiarch/linux/linux-shmat-maps.c b/tests/tcg/multiarch/linux/linux-shmat-maps.c | ||
23 | new file mode 100644 | ||
24 | index 000000000..0ccf7a973 | ||
25 | --- /dev/null | ||
26 | +++ b/tests/tcg/multiarch/linux/linux-shmat-maps.c | ||
27 | @@ -0,0 +1,55 @@ | ||
28 | +/* | ||
29 | + * Test that shmat() does not break /proc/self/maps. | ||
30 | + * | ||
31 | + * SPDX-License-Identifier: GPL-2.0-or-later | ||
32 | + */ | ||
33 | +#include <assert.h> | ||
34 | +#include <fcntl.h> | ||
35 | +#include <stdlib.h> | ||
36 | +#include <sys/ipc.h> | ||
37 | +#include <sys/shm.h> | ||
38 | +#include <unistd.h> | ||
39 | + | ||
40 | +int main(void) | ||
41 | +{ | ||
42 | + char buf[128]; | ||
43 | + int err, fd; | ||
44 | + int shmid; | ||
45 | + ssize_t n; | ||
46 | + void *p; | ||
47 | + | ||
48 | + shmid = shmget(IPC_PRIVATE, 1, IPC_CREAT | 0600); | ||
49 | + assert(shmid != -1); | ||
50 | + | ||
51 | + /* | ||
52 | + * The original bug required a non-NULL address, which skipped the | ||
53 | + * mmap_find_vma step, which could result in a host mapping smaller | ||
54 | + * than the target mapping. Choose an address at random. | ||
55 | + */ | ||
56 | + p = shmat(shmid, (void *)0x800000, SHM_RND); | ||
57 | + if (p == (void *)-1) { | ||
58 | + /* | ||
59 | + * Because we are now running the testcase for all guests for which | ||
60 | + * we have a cross-compiler, the above random address might conflict | ||
61 | + * with the guest executable in some way. Rather than stopping, | ||
62 | + * continue with a system supplied address, which should never fail. | ||
63 | + */ | ||
64 | + p = shmat(shmid, NULL, 0); | ||
65 | + assert(p != (void *)-1); | ||
66 | + } | ||
67 | + | ||
68 | + fd = open("/proc/self/maps", O_RDONLY); | ||
69 | + assert(fd != -1); | ||
70 | + do { | ||
71 | + n = read(fd, buf, sizeof(buf)); | ||
72 | + assert(n >= 0); | ||
73 | + } while (n != 0); | ||
74 | + close(fd); | ||
75 | + | ||
76 | + err = shmdt(p); | ||
77 | + assert(err == 0); | ||
78 | + err = shmctl(shmid, IPC_RMID, NULL); | ||
79 | + assert(err == 0); | ||
80 | + | ||
81 | + return EXIT_SUCCESS; | ||
82 | +} | ||
83 | -- | ||
84 | 2.34.1 | ||
85 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0007-qemu-Determinism-fixes.patch b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch index d3f965e070..f07054f19a 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-qemu-Determinism-fixes.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 50bab5c2605b609ea7ea154f57a9be96d656725a Mon Sep 17 00:00:00 2001 | 1 | From 9d32df80e33a7541658858497f45bed1e59e3621 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Mon, 1 Mar 2021 13:00:47 +0000 | 3 | Date: Mon, 1 Mar 2021 13:00:47 +0000 |
4 | Subject: [PATCH 07/12] qemu: Determinism fixes | 4 | Subject: [PATCH 06/11] qemu: Determinism fixes |
5 | 5 | ||
6 | When sources are included within debug information, a couple of areas of the | 6 | When sources are included within debug information, a couple of areas of the |
7 | qemu build are not reproducible due to either full buildpaths or timestamps. | 7 | qemu build are not reproducible due to either full buildpaths or timestamps. |
@@ -11,16 +11,15 @@ meson to pass relative paths but we can fix that in the script. | |||
11 | 11 | ||
12 | Upstream-Status: Pending [some version of all/part of this may be accepted] | 12 | Upstream-Status: Pending [some version of all/part of this may be accepted] |
13 | RP 2021/3/1 | 13 | RP 2021/3/1 |
14 | |||
15 | --- | 14 | --- |
16 | scripts/decodetree.py | 2 +- | 15 | scripts/decodetree.py | 2 +- |
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 17 | ||
19 | Index: qemu-8.0.0/scripts/decodetree.py | 18 | diff --git a/scripts/decodetree.py b/scripts/decodetree.py |
20 | =================================================================== | 19 | index e8b72da3a9..5cd86b1428 100644 |
21 | --- qemu-8.0.0.orig/scripts/decodetree.py | 20 | --- a/scripts/decodetree.py |
22 | +++ qemu-8.0.0/scripts/decodetree.py | 21 | +++ b/scripts/decodetree.py |
23 | @@ -1328,7 +1328,7 @@ def main(): | 22 | @@ -1558,7 +1558,7 @@ def main(): |
24 | toppat = ExcMultiPattern(0) | 23 | toppat = ExcMultiPattern(0) |
25 | 24 | ||
26 | for filename in args: | 25 | for filename in args: |
@@ -29,3 +28,6 @@ Index: qemu-8.0.0/scripts/decodetree.py | |||
29 | f = open(filename, 'rt', encoding='utf-8') | 28 | f = open(filename, 'rt', encoding='utf-8') |
30 | parse_file(f, toppat) | 29 | parse_file(f, toppat) |
31 | f.close() | 30 | f.close() |
31 | -- | ||
32 | 2.44.0 | ||
33 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch index a84364ccc1..74de158b2e 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2bf9388b801d4389e2d57e95a7897bfc1c42786e Mon Sep 17 00:00:00 2001 | 1 | From 77ebf67d0c96f51da91c8499200ebd13f4dcdd68 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 14 Jan 2021 06:33:04 +0000 | 3 | Date: Thu, 14 Jan 2021 06:33:04 +0000 |
4 | Subject: [PATCH 08/12] tests/meson.build: use relative path to refer to files | 4 | Subject: [PATCH 07/11] tests/meson.build: use relative path to refer to files |
5 | 5 | ||
6 | Fix error like: | 6 | Fix error like: |
7 | Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long | 7 | Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long |
@@ -12,16 +12,15 @@ filename too long. Fixed by using relative path to refer to files | |||
12 | Upstream-Status: Submitted [send to qemu-devel] | 12 | Upstream-Status: Submitted [send to qemu-devel] |
13 | 13 | ||
14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
15 | |||
16 | --- | 15 | --- |
17 | tests/unit/meson.build | 4 ++-- | 16 | tests/unit/meson.build | 4 ++-- |
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | 17 | 1 file changed, 2 insertions(+), 2 deletions(-) |
19 | 18 | ||
20 | Index: qemu-8.0.0/tests/unit/meson.build | 19 | diff --git a/tests/unit/meson.build b/tests/unit/meson.build |
21 | =================================================================== | 20 | index 228a21d03c..272fb4c6ca 100644 |
22 | --- qemu-8.0.0.orig/tests/unit/meson.build | 21 | --- a/tests/unit/meson.build |
23 | +++ qemu-8.0.0/tests/unit/meson.build | 22 | +++ b/tests/unit/meson.build |
24 | @@ -46,7 +46,7 @@ tests = { | 23 | @@ -47,7 +47,7 @@ tests = { |
25 | 'test-keyval': [testqapi], | 24 | 'test-keyval': [testqapi], |
26 | 'test-logging': [], | 25 | 'test-logging': [], |
27 | 'test-uuid': [], | 26 | 'test-uuid': [], |
@@ -30,7 +29,7 @@ Index: qemu-8.0.0/tests/unit/meson.build | |||
30 | 'test-qapi-util': [], | 29 | 'test-qapi-util': [], |
31 | 'test-interval-tree': [], | 30 | 'test-interval-tree': [], |
32 | 'test-xs-node': [qom], | 31 | 'test-xs-node': [qom], |
33 | @@ -136,7 +136,7 @@ if have_system | 32 | @@ -138,7 +138,7 @@ if have_system |
34 | 'test-util-sockets': ['socket-helpers.c'], | 33 | 'test-util-sockets': ['socket-helpers.c'], |
35 | 'test-base64': [], | 34 | 'test-base64': [], |
36 | 'test-bufferiszero': [], | 35 | 'test-bufferiszero': [], |
@@ -39,3 +38,6 @@ Index: qemu-8.0.0/tests/unit/meson.build | |||
39 | 'test-vmstate': [migration, io], | 38 | 'test-vmstate': [migration, io], |
40 | 'test-yank': ['socket-helpers.c', qom, io, chardev] | 39 | 'test-yank': ['socket-helpers.c', qom, io, chardev] |
41 | } | 40 | } |
41 | -- | ||
42 | 2.44.0 | ||
43 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch index 4de6cc2445..2e28590e11 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ebf4bb2f51da83af0c61480414cfa156f7308b34 Mon Sep 17 00:00:00 2001 | 1 | From 21b159a11bbcb1eeb26f12456e4c3fd62a06cbec Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 21 Mar 2022 10:09:38 -0700 | 3 | Date: Mon, 21 Mar 2022 10:09:38 -0700 |
4 | Subject: [PATCH 09/12] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux | 4 | Subject: [PATCH 08/11] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux |
5 | systems | 5 | systems |
6 | 6 | ||
7 | linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures | 7 | linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures |
@@ -13,15 +13,14 @@ Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/qemu-devel/202 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | Cc: Zhang Yi <yi.z.zhang@linux.intel.com> | 14 | Cc: Zhang Yi <yi.z.zhang@linux.intel.com> |
15 | Cc: Michael S. Tsirkin <mst@redhat.com> | 15 | Cc: Michael S. Tsirkin <mst@redhat.com> |
16 | |||
17 | --- | 16 | --- |
18 | util/mmap-alloc.c | 10 +++++++--- | 17 | util/mmap-alloc.c | 10 +++++++--- |
19 | 1 file changed, 7 insertions(+), 3 deletions(-) | 18 | 1 file changed, 7 insertions(+), 3 deletions(-) |
20 | 19 | ||
21 | Index: qemu-8.0.0/util/mmap-alloc.c | 20 | diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c |
22 | =================================================================== | 21 | index ed14f9c64d..038f5b4b55 100644 |
23 | --- qemu-8.0.0.orig/util/mmap-alloc.c | 22 | --- a/util/mmap-alloc.c |
24 | +++ qemu-8.0.0/util/mmap-alloc.c | 23 | +++ b/util/mmap-alloc.c |
25 | @@ -10,14 +10,18 @@ | 24 | @@ -10,14 +10,18 @@ |
26 | * later. See the COPYING file in the top-level directory. | 25 | * later. See the COPYING file in the top-level directory. |
27 | */ | 26 | */ |
@@ -44,3 +43,6 @@ Index: qemu-8.0.0/util/mmap-alloc.c | |||
44 | #include "qemu/mmap-alloc.h" | 43 | #include "qemu/mmap-alloc.h" |
45 | #include "qemu/host-utils.h" | 44 | #include "qemu/host-utils.h" |
46 | #include "qemu/cutils.h" | 45 | #include "qemu/cutils.h" |
46 | -- | ||
47 | 2.44.0 | ||
48 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta/recipes-devtools/qemu/qemu/0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch index ceae67be64..7577249d39 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-linux-user-Replace-use-of-lfs64-related-functions-an.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 71f14902256e3c3529710b713e1ea43100bf4c40 Mon Sep 17 00:00:00 2001 | 1 | From 23de30079dbf47a8026faddd550a9e181d609c8f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 17 Dec 2022 08:37:46 -0800 | 3 | Date: Sat, 17 Dec 2022 08:37:46 -0800 |
4 | Subject: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and | 4 | Subject: [PATCH 09/11] linux-user: Replace use of lfs64 related functions and |
5 | macros | 5 | macros |
6 | 6 | ||
7 | Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions | 7 | Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions |
@@ -16,11 +16,11 @@ Cc: Laurent Vivier <laurent@vivier.eu> | |||
16 | linux-user/syscall.c | 153 +++++++++++-------------------------------- | 16 | linux-user/syscall.c | 153 +++++++++++-------------------------------- |
17 | 1 file changed, 39 insertions(+), 114 deletions(-) | 17 | 1 file changed, 39 insertions(+), 114 deletions(-) |
18 | 18 | ||
19 | Index: qemu-8.0.0/linux-user/syscall.c | 19 | diff --git a/linux-user/syscall.c b/linux-user/syscall.c |
20 | =================================================================== | 20 | index 18f09f1f07..1b7c50a2a7 100644 |
21 | --- qemu-8.0.0.orig/linux-user/syscall.c | 21 | --- a/linux-user/syscall.c |
22 | +++ qemu-8.0.0/linux-user/syscall.c | 22 | +++ b/linux-user/syscall.c |
23 | @@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, | 23 | @@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff, |
24 | */ | 24 | */ |
25 | #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__) | 25 | #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__) |
26 | /* Similarly for fcntl. Note that callers must always: | 26 | /* Similarly for fcntl. Note that callers must always: |
@@ -31,7 +31,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
31 | * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts. | 31 | * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts. |
32 | */ | 32 | */ |
33 | #ifdef __NR_fcntl64 | 33 | #ifdef __NR_fcntl64 |
34 | @@ -6813,13 +6813,13 @@ static int target_to_host_fcntl_cmd(int | 34 | @@ -6739,13 +6739,13 @@ static int target_to_host_fcntl_cmd(int cmd) |
35 | ret = cmd; | 35 | ret = cmd; |
36 | break; | 36 | break; |
37 | case TARGET_F_GETLK: | 37 | case TARGET_F_GETLK: |
@@ -48,7 +48,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
48 | break; | 48 | break; |
49 | case TARGET_F_GETOWN: | 49 | case TARGET_F_GETOWN: |
50 | ret = F_GETOWN; | 50 | ret = F_GETOWN; |
51 | @@ -6833,17 +6833,6 @@ static int target_to_host_fcntl_cmd(int | 51 | @@ -6759,17 +6759,6 @@ static int target_to_host_fcntl_cmd(int cmd) |
52 | case TARGET_F_SETSIG: | 52 | case TARGET_F_SETSIG: |
53 | ret = F_SETSIG; | 53 | ret = F_SETSIG; |
54 | break; | 54 | break; |
@@ -66,7 +66,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
66 | case TARGET_F_SETLEASE: | 66 | case TARGET_F_SETLEASE: |
67 | ret = F_SETLEASE; | 67 | ret = F_SETLEASE; |
68 | break; | 68 | break; |
69 | @@ -6895,8 +6884,8 @@ static int target_to_host_fcntl_cmd(int | 69 | @@ -6821,8 +6810,8 @@ static int target_to_host_fcntl_cmd(int cmd) |
70 | * them to 5, 6 and 7 before making the syscall(). Since we make the | 70 | * them to 5, 6 and 7 before making the syscall(). Since we make the |
71 | * syscall directly, adjust to what is supported by the kernel. | 71 | * syscall directly, adjust to what is supported by the kernel. |
72 | */ | 72 | */ |
@@ -77,7 +77,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
77 | } | 77 | } |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | @@ -6929,55 +6918,11 @@ static int host_to_target_flock(int type | 80 | @@ -6855,55 +6844,11 @@ static int host_to_target_flock(int type) |
81 | return type; | 81 | return type; |
82 | } | 82 | } |
83 | 83 | ||
@@ -136,7 +136,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
136 | abi_short l_type; | 136 | abi_short l_type; |
137 | abi_short l_whence; | 137 | abi_short l_whence; |
138 | abi_llong l_start; | 138 | abi_llong l_start; |
139 | @@ -6985,10 +6930,10 @@ struct target_oabi_flock64 { | 139 | @@ -6911,10 +6856,10 @@ struct target_oabi_flock64 { |
140 | abi_int l_pid; | 140 | abi_int l_pid; |
141 | } QEMU_PACKED; | 141 | } QEMU_PACKED; |
142 | 142 | ||
@@ -149,7 +149,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
149 | int l_type; | 149 | int l_type; |
150 | 150 | ||
151 | if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { | 151 | if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { |
152 | @@ -7009,10 +6954,10 @@ static inline abi_long copy_from_user_oa | 152 | @@ -6935,10 +6880,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, |
153 | return 0; | 153 | return 0; |
154 | } | 154 | } |
155 | 155 | ||
@@ -163,7 +163,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
163 | short l_type; | 163 | short l_type; |
164 | 164 | ||
165 | if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { | 165 | if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { |
166 | @@ -7030,10 +6975,10 @@ static inline abi_long copy_to_user_oabi | 166 | @@ -6956,10 +6901,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr, |
167 | } | 167 | } |
168 | #endif | 168 | #endif |
169 | 169 | ||
@@ -176,7 +176,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
176 | int l_type; | 176 | int l_type; |
177 | 177 | ||
178 | if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { | 178 | if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { |
179 | @@ -7054,10 +6999,10 @@ static inline abi_long copy_from_user_fl | 179 | @@ -6980,10 +6925,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl, |
180 | return 0; | 180 | return 0; |
181 | } | 181 | } |
182 | 182 | ||
@@ -190,7 +190,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
190 | short l_type; | 190 | short l_type; |
191 | 191 | ||
192 | if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { | 192 | if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { |
193 | @@ -7076,7 +7021,7 @@ static inline abi_long copy_to_user_floc | 193 | @@ -7002,7 +6947,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr, |
194 | 194 | ||
195 | static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) | 195 | static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) |
196 | { | 196 | { |
@@ -199,7 +199,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
199 | #ifdef F_GETOWN_EX | 199 | #ifdef F_GETOWN_EX |
200 | struct f_owner_ex fox; | 200 | struct f_owner_ex fox; |
201 | struct target_f_owner_ex *target_fox; | 201 | struct target_f_owner_ex *target_fox; |
202 | @@ -7089,6 +7034,7 @@ static abi_long do_fcntl(int fd, int cmd | 202 | @@ -7015,6 +6960,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) |
203 | 203 | ||
204 | switch(cmd) { | 204 | switch(cmd) { |
205 | case TARGET_F_GETLK: | 205 | case TARGET_F_GETLK: |
@@ -207,7 +207,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
207 | ret = copy_from_user_flock(&fl64, arg); | 207 | ret = copy_from_user_flock(&fl64, arg); |
208 | if (ret) { | 208 | if (ret) { |
209 | return ret; | 209 | return ret; |
210 | @@ -7098,32 +7044,11 @@ static abi_long do_fcntl(int fd, int cmd | 210 | @@ -7024,32 +6970,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) |
211 | ret = copy_to_user_flock(arg, &fl64); | 211 | ret = copy_to_user_flock(arg, &fl64); |
212 | } | 212 | } |
213 | break; | 213 | break; |
@@ -241,7 +241,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
241 | if (ret) { | 241 | if (ret) { |
242 | return ret; | 242 | return ret; |
243 | } | 243 | } |
244 | @@ -7348,7 +7273,7 @@ static inline abi_long target_truncate64 | 244 | @@ -7278,7 +7203,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1 |
245 | arg2 = arg3; | 245 | arg2 = arg3; |
246 | arg3 = arg4; | 246 | arg3 = arg4; |
247 | } | 247 | } |
@@ -250,7 +250,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
250 | } | 250 | } |
251 | #endif | 251 | #endif |
252 | 252 | ||
253 | @@ -7362,7 +7287,7 @@ static inline abi_long target_ftruncate6 | 253 | @@ -7292,7 +7217,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1, |
254 | arg2 = arg3; | 254 | arg2 = arg3; |
255 | arg3 = arg4; | 255 | arg3 = arg4; |
256 | } | 256 | } |
@@ -259,7 +259,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
259 | } | 259 | } |
260 | #endif | 260 | #endif |
261 | 261 | ||
262 | @@ -8598,7 +8523,7 @@ static int do_getdents(abi_long dirfd, a | 262 | @@ -8667,7 +8592,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) |
263 | void *tdirp; | 263 | void *tdirp; |
264 | int hlen, hoff, toff; | 264 | int hlen, hoff, toff; |
265 | int hreclen, treclen; | 265 | int hreclen, treclen; |
@@ -268,7 +268,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
268 | 268 | ||
269 | hdirp = g_try_malloc(count); | 269 | hdirp = g_try_malloc(count); |
270 | if (!hdirp) { | 270 | if (!hdirp) { |
271 | @@ -8651,7 +8576,7 @@ static int do_getdents(abi_long dirfd, a | 271 | @@ -8720,7 +8645,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) |
272 | * Return what we have, resetting the file pointer to the | 272 | * Return what we have, resetting the file pointer to the |
273 | * location of the first record not returned. | 273 | * location of the first record not returned. |
274 | */ | 274 | */ |
@@ -277,7 +277,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
277 | break; | 277 | break; |
278 | } | 278 | } |
279 | 279 | ||
280 | @@ -8685,7 +8610,7 @@ static int do_getdents64(abi_long dirfd, | 280 | @@ -8754,7 +8679,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) |
281 | void *tdirp; | 281 | void *tdirp; |
282 | int hlen, hoff, toff; | 282 | int hlen, hoff, toff; |
283 | int hreclen, treclen; | 283 | int hreclen, treclen; |
@@ -286,7 +286,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
286 | 286 | ||
287 | hdirp = g_try_malloc(count); | 287 | hdirp = g_try_malloc(count); |
288 | if (!hdirp) { | 288 | if (!hdirp) { |
289 | @@ -8727,7 +8652,7 @@ static int do_getdents64(abi_long dirfd, | 289 | @@ -8796,7 +8721,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) |
290 | * Return what we have, resetting the file pointer to the | 290 | * Return what we have, resetting the file pointer to the |
291 | * location of the first record not returned. | 291 | * location of the first record not returned. |
292 | */ | 292 | */ |
@@ -295,7 +295,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
295 | break; | 295 | break; |
296 | } | 296 | } |
297 | 297 | ||
298 | @@ -11158,7 +11083,7 @@ static abi_long do_syscall1(CPUArchState | 298 | @@ -11527,7 +11452,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, |
299 | return -TARGET_EFAULT; | 299 | return -TARGET_EFAULT; |
300 | } | 300 | } |
301 | } | 301 | } |
@@ -304,7 +304,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
304 | unlock_user(p, arg2, ret); | 304 | unlock_user(p, arg2, ret); |
305 | return ret; | 305 | return ret; |
306 | case TARGET_NR_pwrite64: | 306 | case TARGET_NR_pwrite64: |
307 | @@ -11175,7 +11100,7 @@ static abi_long do_syscall1(CPUArchState | 307 | @@ -11544,7 +11469,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, |
308 | return -TARGET_EFAULT; | 308 | return -TARGET_EFAULT; |
309 | } | 309 | } |
310 | } | 310 | } |
@@ -313,7 +313,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
313 | unlock_user(p, arg2, 0); | 313 | unlock_user(p, arg2, 0); |
314 | return ret; | 314 | return ret; |
315 | #endif | 315 | #endif |
316 | @@ -11998,14 +11923,14 @@ static abi_long do_syscall1(CPUArchState | 316 | @@ -12404,14 +12329,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, |
317 | case TARGET_NR_fcntl64: | 317 | case TARGET_NR_fcntl64: |
318 | { | 318 | { |
319 | int cmd; | 319 | int cmd; |
@@ -333,7 +333,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
333 | } | 333 | } |
334 | #endif | 334 | #endif |
335 | 335 | ||
336 | @@ -12015,7 +11940,7 @@ static abi_long do_syscall1(CPUArchState | 336 | @@ -12421,7 +12346,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, |
337 | } | 337 | } |
338 | 338 | ||
339 | switch(arg2) { | 339 | switch(arg2) { |
@@ -342,7 +342,7 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
342 | ret = copyfrom(&fl, arg3); | 342 | ret = copyfrom(&fl, arg3); |
343 | if (ret) { | 343 | if (ret) { |
344 | break; | 344 | break; |
345 | @@ -12026,8 +11951,8 @@ static abi_long do_syscall1(CPUArchState | 345 | @@ -12432,8 +12357,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, |
346 | } | 346 | } |
347 | break; | 347 | break; |
348 | 348 | ||
@@ -353,3 +353,6 @@ Index: qemu-8.0.0/linux-user/syscall.c | |||
353 | ret = copyfrom(&fl, arg3); | 353 | ret = copyfrom(&fl, arg3); |
354 | if (ret) { | 354 | if (ret) { |
355 | break; | 355 | break; |
356 | -- | ||
357 | 2.44.0 | ||
358 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/fixedmeson.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch index 9047f66dc3..98ce85a8cf 100644 --- a/meta/recipes-devtools/qemu/qemu/fixedmeson.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch | |||
@@ -1,10 +1,18 @@ | |||
1 | From e12a93174f9b652604dda8d8464b9559b62b29d5 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com> | ||
3 | Date: Wed, 22 May 2024 14:02:55 +0200 | ||
4 | Subject: [PATCH 10/11] configure: lookup meson exutable from PATH | ||
5 | |||
1 | Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] | 6 | Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] |
7 | --- | ||
8 | configure | 7 +------ | ||
9 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
2 | 10 | ||
3 | Index: qemu-8.2.0/configure | 11 | diff --git a/configure b/configure |
4 | =================================================================== | 12 | index 3cd736b139..482a1f8ef3 100755 |
5 | --- qemu-8.2.0.orig/configure | 13 | --- a/configure |
6 | +++ qemu-8.2.0/configure | 14 | +++ b/configure |
7 | @@ -955,12 +955,7 @@ fi | 15 | @@ -956,12 +956,7 @@ fi |
8 | $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ | 16 | $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ |
9 | ${source_path}/pythondeps.toml meson || exit 1 | 17 | ${source_path}/pythondeps.toml meson || exit 1 |
10 | 18 | ||
@@ -18,3 +26,6 @@ Index: qemu-8.2.0/configure | |||
18 | 26 | ||
19 | # Conditionally ensure Sphinx is installed. | 27 | # Conditionally ensure Sphinx is installed. |
20 | 28 | ||
29 | -- | ||
30 | 2.44.0 | ||
31 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch b/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch deleted file mode 100644 index 6caf35b634..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | CVE: CVE-2022-1050 | ||
2 | Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20220403095234.2210-1-yuval.shaia.ml@gmail.com/] | ||
3 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
4 | |||
5 | From dbdef95c272e8f3ec037c3db4197c66002e30995 Mon Sep 17 00:00:00 2001 | ||
6 | From: Yuval Shaia <yuval.shaia.ml@gmail.com> | ||
7 | Date: Sun, 3 Apr 2022 12:52:34 +0300 | ||
8 | Subject: [PATCH] hw/pvrdma: Protect against buggy or malicious guest driver | ||
9 | |||
10 | Guest driver might execute HW commands when shared buffers are not yet | ||
11 | allocated. | ||
12 | This could happen on purpose (malicious guest) or because of some other | ||
13 | guest/host address mapping error. | ||
14 | We need to protect againts such case. | ||
15 | |||
16 | Fixes: CVE-2022-1050 | ||
17 | |||
18 | Reported-by: Raven <wxhusst@gmail.com> | ||
19 | Signed-off-by: Yuval Shaia <yuval.shaia.ml@gmail.com> | ||
20 | --- | ||
21 | hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++ | ||
22 | 1 file changed, 6 insertions(+) | ||
23 | |||
24 | Index: qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c | ||
25 | =================================================================== | ||
26 | --- qemu-8.0.0.orig/hw/rdma/vmw/pvrdma_cmd.c | ||
27 | +++ qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c | ||
28 | @@ -782,6 +782,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev) | ||
29 | goto out; | ||
30 | } | ||
31 | |||
32 | + if (!dsr_info->dsr) { | ||
33 | + /* Buggy or malicious guest driver */ | ||
34 | + rdma_error_report("Exec command without dsr, req or rsp buffers"); | ||
35 | + goto out; | ||
36 | + } | ||
37 | + | ||
38 | if (dsr_info->req->hdr.cmd >= sizeof(cmd_handlers) / | ||
39 | sizeof(struct cmd_handler)) { | ||
40 | rdma_error_report("Unsupported command"); | ||
diff --git a/meta/recipes-devtools/qemu/qemu/0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch b/meta/recipes-devtools/qemu/qemu/0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch deleted file mode 100644 index cc53b1eedd..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0011-linux-user-workaround-for-missing-MAP_FIXED_NOREPLAC.patch +++ /dev/null | |||
@@ -1,282 +0,0 @@ | |||
1 | From fa9bcabe2387bb230ef82d62827ad6f93b8a1e61 Mon Sep 17 00:00:00 2001 | ||
2 | From: Frederic Konrad <fkonrad@amd.com> | ||
3 | Date: Wed, 17 Jan 2024 18:15:06 +0000 | ||
4 | Subject: [PATCH 1/2] linux-user/*: workaround for missing MAP_FIXED_NOREPLACE | ||
5 | |||
6 | QEMU v8.1.0 recently requires MAP_FIXED_NOREPLACE flags implementation for mmap. | ||
7 | |||
8 | This is missing from ubuntu 18.04, thus this patch catches the mmap calls which | ||
9 | could use that new flag and forwards them to mmap when MAP_FIXED_NOREPLACE | ||
10 | flag isn't set or emulates them by checking the returned address w.r.t the | ||
11 | requested address. | ||
12 | |||
13 | Signed-off-by: Frederic Konrad <fkonrad@amd.com> | ||
14 | Signed-off-by: Francisco Iglesias <francisco.iglesias@amd.com> | ||
15 | |||
16 | Upstream-Status: Inappropriate [OE specific] | ||
17 | |||
18 | The upstream only supports the last two major releases of an OS. The ones | ||
19 | they have declared all have kernel 4.17 or newer. | ||
20 | |||
21 | See: | ||
22 | https://xilinx.slack.com/archives/D04G2647CTV/p1705074697942019 | ||
23 | |||
24 | https://www.qemu.org/docs/master/about/build-platforms.html | ||
25 | |||
26 | The project aims to support the most recent major version at all times for up | ||
27 | to five years after its initial release. Support for the previous major | ||
28 | version will be dropped 2 years after the new major version is released or | ||
29 | when the vendor itself drops support, whichever comes first. | ||
30 | |||
31 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
32 | --- | ||
33 | linux-user/elfload.c | 7 +++-- | ||
34 | linux-user/meson.build | 1 + | ||
35 | linux-user/mmap-fixed.c | 63 +++++++++++++++++++++++++++++++++++++++++ | ||
36 | linux-user/mmap-fixed.h | 39 +++++++++++++++++++++++++ | ||
37 | linux-user/mmap.c | 31 +++++++++++--------- | ||
38 | linux-user/syscall.c | 1 + | ||
39 | 6 files changed, 125 insertions(+), 17 deletions(-) | ||
40 | create mode 100644 linux-user/mmap-fixed.c | ||
41 | create mode 100644 linux-user/mmap-fixed.h | ||
42 | |||
43 | Index: qemu-8.2.1/linux-user/elfload.c | ||
44 | =================================================================== | ||
45 | --- qemu-8.2.1.orig/linux-user/elfload.c | ||
46 | +++ qemu-8.2.1/linux-user/elfload.c | ||
47 | @@ -22,6 +22,7 @@ | ||
48 | #include "qemu/error-report.h" | ||
49 | #include "target_signal.h" | ||
50 | #include "accel/tcg/debuginfo.h" | ||
51 | +#include "mmap-fixed.h" | ||
52 | |||
53 | #ifdef TARGET_ARM | ||
54 | #include "target/arm/cpu-features.h" | ||
55 | @@ -2765,9 +2766,9 @@ static abi_ulong create_elf_tables(abi_u | ||
56 | static int pgb_try_mmap(uintptr_t addr, uintptr_t addr_last, bool keep) | ||
57 | { | ||
58 | size_t size = addr_last - addr + 1; | ||
59 | - void *p = mmap((void *)addr, size, PROT_NONE, | ||
60 | - MAP_ANONYMOUS | MAP_PRIVATE | | ||
61 | - MAP_NORESERVE | MAP_FIXED_NOREPLACE, -1, 0); | ||
62 | + void *p = mmap_fixed_noreplace((void *)addr, size, PROT_NONE, | ||
63 | + MAP_ANONYMOUS | MAP_PRIVATE | | ||
64 | + MAP_NORESERVE | MAP_FIXED_NOREPLACE, -1, 0); | ||
65 | int ret; | ||
66 | |||
67 | if (p == MAP_FAILED) { | ||
68 | Index: qemu-8.2.1/linux-user/meson.build | ||
69 | =================================================================== | ||
70 | --- qemu-8.2.1.orig/linux-user/meson.build | ||
71 | +++ qemu-8.2.1/linux-user/meson.build | ||
72 | @@ -14,6 +14,7 @@ linux_user_ss.add(files( | ||
73 | 'linuxload.c', | ||
74 | 'main.c', | ||
75 | 'mmap.c', | ||
76 | + 'mmap-fixed.c', | ||
77 | 'signal.c', | ||
78 | 'strace.c', | ||
79 | 'syscall.c', | ||
80 | Index: qemu-8.2.1/linux-user/mmap-fixed.c | ||
81 | =================================================================== | ||
82 | --- /dev/null | ||
83 | +++ qemu-8.2.1/linux-user/mmap-fixed.c | ||
84 | @@ -0,0 +1,63 @@ | ||
85 | +/* | ||
86 | + * Workaround for MAP_FIXED_NOREPLACE | ||
87 | + * | ||
88 | + * Copyright (c) 2024, Advanced Micro Devices, Inc. | ||
89 | + * Developed by Fred Konrad <fkonrad@amd.com> | ||
90 | + * | ||
91 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
92 | + * of this software and associated documentation files (the "Software"), to deal | ||
93 | + * in the Software without restriction, including without limitation the rights | ||
94 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
95 | + * copies of the Software, and to permit persons to whom the Software is | ||
96 | + * furnished to do so, subject to the following conditions: | ||
97 | + * | ||
98 | + * The above copyright notice and this permission notice shall be included in | ||
99 | + * all copies or substantial portions of the Software. | ||
100 | + * | ||
101 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
102 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
103 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
104 | + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
105 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
106 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
107 | + * THE SOFTWARE. | ||
108 | + */ | ||
109 | + | ||
110 | +#include <sys/mman.h> | ||
111 | +#include <errno.h> | ||
112 | + | ||
113 | +#ifndef MAP_FIXED_NOREPLACE | ||
114 | +#include "mmap-fixed.h" | ||
115 | + | ||
116 | +void *mmap_fixed_noreplace(void *addr, size_t len, int prot, int flags, | ||
117 | + int fd, off_t offset) | ||
118 | +{ | ||
119 | + void *retaddr; | ||
120 | + | ||
121 | + if (!(flags & MAP_FIXED_NOREPLACE)) { | ||
122 | + /* General case, use the regular mmap. */ | ||
123 | + return mmap(addr, len, prot, flags, fd, offset); | ||
124 | + } | ||
125 | + | ||
126 | + /* Since MAP_FIXED_NOREPLACE is not implemented, try to emulate it. */ | ||
127 | + flags = flags & ~(MAP_FIXED_NOREPLACE | MAP_FIXED); | ||
128 | + retaddr = mmap(addr, len, prot, flags, fd, offset); | ||
129 | + if ((retaddr == addr) || (retaddr == MAP_FAILED)) { | ||
130 | + /* | ||
131 | + * Either the map worked and we get the good address so it can be | ||
132 | + * returned, or it failed and would have failed the same with | ||
133 | + * MAP_FIXED*, in which case return MAP_FAILED. | ||
134 | + */ | ||
135 | + return retaddr; | ||
136 | + } else { | ||
137 | + /* | ||
138 | + * Page has been mapped but not at the requested address.. unmap it and | ||
139 | + * return EEXIST. | ||
140 | + */ | ||
141 | + munmap(retaddr, len); | ||
142 | + errno = EEXIST; | ||
143 | + return MAP_FAILED; | ||
144 | + } | ||
145 | +} | ||
146 | + | ||
147 | +#endif | ||
148 | Index: qemu-8.2.1/linux-user/mmap-fixed.h | ||
149 | =================================================================== | ||
150 | --- /dev/null | ||
151 | +++ qemu-8.2.1/linux-user/mmap-fixed.h | ||
152 | @@ -0,0 +1,39 @@ | ||
153 | +/* | ||
154 | + * Workaround for MAP_FIXED_NOREPLACE | ||
155 | + * | ||
156 | + * Copyright (c) 2024, Advanced Micro Devices, Inc. | ||
157 | + * Developed by Fred Konrad <fkonrad@amd.com> | ||
158 | + * | ||
159 | + * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
160 | + * of this software and associated documentation files (the "Software"), to deal | ||
161 | + * in the Software without restriction, including without limitation the rights | ||
162 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
163 | + * copies of the Software, and to permit persons to whom the Software is | ||
164 | + * furnished to do so, subject to the following conditions: | ||
165 | + * | ||
166 | + * The above copyright notice and this permission notice shall be included in | ||
167 | + * all copies or substantial portions of the Software. | ||
168 | + * | ||
169 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
170 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
171 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
172 | + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
173 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
174 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
175 | + * THE SOFTWARE. | ||
176 | + */ | ||
177 | + | ||
178 | +#ifndef MMAP_FIXED_H | ||
179 | +#define MMAP_FIXED_H | ||
180 | + | ||
181 | +#ifndef MAP_FIXED_NOREPLACE | ||
182 | +#define MAP_FIXED_NOREPLACE 0x100000 | ||
183 | + | ||
184 | +void *mmap_fixed_noreplace(void *addr, size_t len, int prot, int flags, | ||
185 | + int fd, off_t offset); | ||
186 | + | ||
187 | +#else /* MAP_FIXED_NOREPLACE */ | ||
188 | +#define mmap_fixed_noreplace mmap | ||
189 | +#endif /* MAP_FIXED_NOREPLACE */ | ||
190 | + | ||
191 | +#endif /* MMAP_FIXED_H */ | ||
192 | Index: qemu-8.2.1/linux-user/mmap.c | ||
193 | =================================================================== | ||
194 | --- qemu-8.2.1.orig/linux-user/mmap.c | ||
195 | +++ qemu-8.2.1/linux-user/mmap.c | ||
196 | @@ -25,6 +25,7 @@ | ||
197 | #include "user-mmap.h" | ||
198 | #include "target_mman.h" | ||
199 | #include "qemu/interval-tree.h" | ||
200 | +#include "mmap-fixed.h" | ||
201 | |||
202 | #ifdef TARGET_ARM | ||
203 | #include "target/arm/cpu-features.h" | ||
204 | @@ -273,7 +274,7 @@ int target_mprotect(abi_ulong start, abi | ||
205 | static int do_munmap(void *addr, size_t len) | ||
206 | { | ||
207 | if (reserved_va) { | ||
208 | - void *ptr = mmap(addr, len, PROT_NONE, | ||
209 | + void *ptr = mmap_fixed_noreplace(addr, len, PROT_NONE, | ||
210 | MAP_FIXED | MAP_ANONYMOUS | ||
211 | | MAP_PRIVATE | MAP_NORESERVE, -1, 0); | ||
212 | return ptr == addr ? 0 : -1; | ||
213 | @@ -319,9 +320,9 @@ static bool mmap_frag(abi_ulong real_sta | ||
214 | * outside of the fragment we need to map. Allocate a new host | ||
215 | * page to cover, discarding whatever else may have been present. | ||
216 | */ | ||
217 | - void *p = mmap(host_start, qemu_host_page_size, | ||
218 | - target_to_host_prot(prot), | ||
219 | - flags | MAP_ANONYMOUS, -1, 0); | ||
220 | + void *p = mmap_fixed_noreplace(host_start, qemu_host_page_size, | ||
221 | + target_to_host_prot(prot), | ||
222 | + flags | MAP_ANONYMOUS, -1, 0); | ||
223 | if (p != host_start) { | ||
224 | if (p != MAP_FAILED) { | ||
225 | munmap(p, qemu_host_page_size); | ||
226 | @@ -420,8 +421,9 @@ abi_ulong mmap_find_vma(abi_ulong start, | ||
227 | * - mremap() with MREMAP_FIXED flag | ||
228 | * - shmat() with SHM_REMAP flag | ||
229 | */ | ||
230 | - ptr = mmap(g2h_untagged(addr), size, PROT_NONE, | ||
231 | - MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, -1, 0); | ||
232 | + ptr = mmap_fixed_noreplace(g2h_untagged(addr), size, PROT_NONE, | ||
233 | + MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, | ||
234 | + -1, 0); | ||
235 | |||
236 | /* ENOMEM, if host address space has no memory */ | ||
237 | if (ptr == MAP_FAILED) { | ||
238 | @@ -615,16 +617,16 @@ abi_long target_mmap(abi_ulong start, ab | ||
239 | * especially important if qemu_host_page_size > | ||
240 | * qemu_real_host_page_size. | ||
241 | */ | ||
242 | - p = mmap(g2h_untagged(start), host_len, host_prot, | ||
243 | - flags | MAP_FIXED | MAP_ANONYMOUS, -1, 0); | ||
244 | + p = mmap_fixed_noreplace(g2h_untagged(start), host_len, host_prot, | ||
245 | + flags | MAP_FIXED | MAP_ANONYMOUS, -1, 0); | ||
246 | if (p == MAP_FAILED) { | ||
247 | goto fail; | ||
248 | } | ||
249 | /* update start so that it points to the file position at 'offset' */ | ||
250 | host_start = (uintptr_t)p; | ||
251 | if (!(flags & MAP_ANONYMOUS)) { | ||
252 | - p = mmap(g2h_untagged(start), len, host_prot, | ||
253 | - flags | MAP_FIXED, fd, host_offset); | ||
254 | + p = mmap_fixed_noreplace(g2h_untagged(start), len, host_prot, | ||
255 | + flags | MAP_FIXED, fd, host_offset); | ||
256 | if (p == MAP_FAILED) { | ||
257 | munmap(g2h_untagged(start), host_len); | ||
258 | goto fail; | ||
259 | @@ -749,8 +751,9 @@ abi_long target_mmap(abi_ulong start, ab | ||
260 | len1 = real_last - real_start + 1; | ||
261 | want_p = g2h_untagged(real_start); | ||
262 | |||
263 | - p = mmap(want_p, len1, target_to_host_prot(target_prot), | ||
264 | - flags, fd, offset1); | ||
265 | + p = mmap_fixed_noreplace(want_p, len1, | ||
266 | + target_to_host_prot(target_prot), | ||
267 | + flags, fd, offset1); | ||
268 | if (p != want_p) { | ||
269 | if (p != MAP_FAILED) { | ||
270 | munmap(p, len1); | ||
271 | Index: qemu-8.2.1/linux-user/syscall.c | ||
272 | =================================================================== | ||
273 | --- qemu-8.2.1.orig/linux-user/syscall.c | ||
274 | +++ qemu-8.2.1/linux-user/syscall.c | ||
275 | @@ -145,6 +145,7 @@ | ||
276 | #include "qapi/error.h" | ||
277 | #include "fd-trans.h" | ||
278 | #include "cpu_loop-common.h" | ||
279 | +#include "mmap-fixed.h" | ||
280 | |||
281 | #ifndef CLONE_IO | ||
282 | #define CLONE_IO 0x80000000 /* Clone io context */ | ||
diff --git a/meta/recipes-devtools/qemu/qemu/no-pip.patch b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch index 92b2edbe9f..c7bb9b1b47 100644 --- a/meta/recipes-devtools/qemu/qemu/no-pip.patch +++ b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch | |||
@@ -1,4 +1,8 @@ | |||
1 | qemu: Ensure pip and the python venv aren't used for meson | 1 | From a93c2a6b2c9db9c4bd30298da43c37c5e5c6236e Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Wed, 22 May 2024 13:58:23 +0200 | ||
4 | Subject: [PATCH 11/11] qemu: Ensure pip and the python venv aren't used for | ||
5 | meson | ||
2 | 6 | ||
3 | Qemu wants to use a supported python version and a specific meson version | 7 | Qemu wants to use a supported python version and a specific meson version |
4 | to "help" users and uses pip and creates a venv to do this. This is a nightmare | 8 | to "help" users and uses pip and creates a venv to do this. This is a nightmare |
@@ -21,12 +25,15 @@ as it stands is a workaround. | |||
21 | 25 | ||
22 | Upstream-Status: Inappropriate [oe specific] | 26 | Upstream-Status: Inappropriate [oe specific] |
23 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 27 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
28 | --- | ||
29 | configure | 4 ++-- | ||
30 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
24 | 31 | ||
25 | Index: qemu-8.2.0/configure | 32 | diff --git a/configure b/configure |
26 | =================================================================== | 33 | index 482a1f8ef3..0da4bf3e4d 100755 |
27 | --- qemu-8.2.0.orig/configure | 34 | --- a/configure |
28 | +++ qemu-8.2.0/configure | 35 | +++ b/configure |
29 | @@ -937,7 +937,7 @@ python="$(command -v "$python")" | 36 | @@ -938,14 +938,14 @@ python="$(command -v "$python")" |
30 | echo "python determined to be '$python'" | 37 | echo "python determined to be '$python'" |
31 | echo "python version: $($python --version)" | 38 | echo "python version: $($python --version)" |
32 | 39 | ||
@@ -35,11 +42,14 @@ Index: qemu-8.2.0/configure | |||
35 | if test "$?" -ne 0 ; then | 42 | if test "$?" -ne 0 ; then |
36 | error_exit "python venv creation failed" | 43 | error_exit "python venv creation failed" |
37 | fi | 44 | fi |
38 | @@ -945,6 +945,7 @@ fi | 45 | |
39 | # Suppress writing compiled files | 46 | # Suppress writing compiled files |
40 | python="$python -B" | 47 | python="$python -B" |
41 | mkvenv="$python ${source_path}/python/scripts/mkvenv.py" | 48 | -mkvenv="$python ${source_path}/python/scripts/mkvenv.py" |
42 | +mkvenv=true | 49 | +mkvenv=true |
43 | 50 | ||
44 | # Finish preparing the virtual environment using vendored .whl files | 51 | # Finish preparing the virtual environment using vendored .whl files |
45 | 52 | ||
53 | -- | ||
54 | 2.44.0 | ||
55 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch b/meta/recipes-devtools/qemu/qemu/0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch deleted file mode 100644 index 48034a4680..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 5c73e53997df800a742f9cd7355f3045861984bb Mon Sep 17 00:00:00 2001 | ||
2 | From: Frederic Konrad <fkonrad@amd.com> | ||
3 | Date: Thu, 18 Jan 2024 10:43:44 +0000 | ||
4 | Subject: [PATCH 2/2] linux-user/*: workaround for missing MAP_SHARED_VALIDATE | ||
5 | |||
6 | QEMU v8.1.0 recently requires MAP_SHARED_VALIDATE flags implementation for mmap. | ||
7 | |||
8 | This is missing from the Ubuntu 18.04 compiler but looks like to be in the | ||
9 | kernel source. | ||
10 | |||
11 | Signed-off-by: Frederic Konrad <fkonrad@amd.com> | ||
12 | Signed-off-by: Francisco Iglesias <francisco.iglesias@amd.com> | ||
13 | |||
14 | Upstream-Status: Inappropriate [OE specific] | ||
15 | |||
16 | The upstream only supports the last two major releases of an OS. The ones | ||
17 | they have declared all have kernel 4.17 or newer. | ||
18 | |||
19 | See: | ||
20 | https://xilinx.slack.com/archives/D04G2647CTV/p1705074697942019 | ||
21 | |||
22 | https://www.qemu.org/docs/master/about/build-platforms.html | ||
23 | |||
24 | The project aims to support the most recent major version at all times for up | ||
25 | to five years after its initial release. Support for the previous major | ||
26 | version will be dropped 2 years after the new major version is released or | ||
27 | when the vendor itself drops support, whichever comes first. | ||
28 | |||
29 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
30 | --- | ||
31 | linux-user/mmap-fixed.h | 4 ++++ | ||
32 | 1 file changed, 4 insertions(+) | ||
33 | |||
34 | diff --git a/linux-user/mmap-fixed.h b/linux-user/mmap-fixed.h | ||
35 | index ef6eef5114..ec86586c1f 100644 | ||
36 | --- a/linux-user/mmap-fixed.h | ||
37 | +++ b/linux-user/mmap-fixed.h | ||
38 | @@ -26,6 +26,10 @@ | ||
39 | #ifndef MMAP_FIXED_H | ||
40 | #define MMAP_FIXED_H | ||
41 | |||
42 | +#ifndef MAP_SHARED_VALIDATE | ||
43 | +#define MAP_SHARED_VALIDATE 0x03 | ||
44 | +#endif | ||
45 | + | ||
46 | #ifndef MAP_FIXED_NOREPLACE | ||
47 | #define MAP_FIXED_NOREPLACE 0x100000 | ||
48 | |||
49 | -- | ||
50 | 2.34.1 | ||
51 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/4a8579ad8629b57a43daa62e46cc7af6e1078116.patch b/meta/recipes-devtools/qemu/qemu/4a8579ad8629b57a43daa62e46cc7af6e1078116.patch deleted file mode 100644 index 5ad859ebe6..0000000000 --- a/meta/recipes-devtools/qemu/qemu/4a8579ad8629b57a43daa62e46cc7af6e1078116.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 4a8579ad8629b57a43daa62e46cc7af6e1078116 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Henderson <richard.henderson@linaro.org> | ||
3 | Date: Tue, 13 Feb 2024 10:20:27 -1000 | ||
4 | Subject: [PATCH] linux-user: Split out do_munmap | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.com/rth7680/qemu/-/commit/4a8579ad8629b57a43daa62e46cc7af6e1078116] | ||
10 | |||
11 | Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
12 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
13 | --- | ||
14 | linux-user/mmap.c | 23 ++++++++++++++++------- | ||
15 | 1 file changed, 16 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/linux-user/mmap.c b/linux-user/mmap.c | ||
18 | index 1bbfeb25b14..8ebcca44444 100644 | ||
19 | --- a/linux-user/mmap.c | ||
20 | +++ b/linux-user/mmap.c | ||
21 | @@ -267,6 +267,21 @@ int target_mprotect(abi_ulong start, abi_ulong len, int target_prot) | ||
22 | return ret; | ||
23 | } | ||
24 | |||
25 | +/* | ||
26 | + * Perform munmap on behalf of the target, with host parameters. | ||
27 | + * If reserved_va, we must replace the memory reservation. | ||
28 | + */ | ||
29 | +static int do_munmap(void *addr, size_t len) | ||
30 | +{ | ||
31 | + if (reserved_va) { | ||
32 | + void *ptr = mmap(addr, len, PROT_NONE, | ||
33 | + MAP_FIXED | MAP_ANONYMOUS | ||
34 | + | MAP_PRIVATE | MAP_NORESERVE, -1, 0); | ||
35 | + return ptr == addr ? 0 : -1; | ||
36 | + } | ||
37 | + return munmap(addr, len); | ||
38 | +} | ||
39 | + | ||
40 | /* map an incomplete host page */ | ||
41 | static bool mmap_frag(abi_ulong real_start, abi_ulong start, abi_ulong last, | ||
42 | int prot, int flags, int fd, off_t offset) | ||
43 | @@ -854,13 +869,7 @@ static int mmap_reserve_or_unmap(abi_ulong start, abi_ulong len) | ||
44 | real_len = real_last - real_start + 1; | ||
45 | host_start = g2h_untagged(real_start); | ||
46 | |||
47 | - if (reserved_va) { | ||
48 | - void *ptr = mmap(host_start, real_len, PROT_NONE, | ||
49 | - MAP_FIXED | MAP_ANONYMOUS | ||
50 | - | MAP_PRIVATE | MAP_NORESERVE, -1, 0); | ||
51 | - return ptr == host_start ? 0 : -1; | ||
52 | - } | ||
53 | - return munmap(host_start, real_len); | ||
54 | + return do_munmap(host_start, real_len); | ||
55 | } | ||
56 | |||
57 | int target_munmap(abi_ulong start, abi_ulong len) | ||
58 | -- | ||
59 | GitLab | ||
60 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch deleted file mode 100644 index 732cb6af18..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2023-6683.patch +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | From 405484b29f6548c7b86549b0f961b906337aa68a Mon Sep 17 00:00:00 2001 | ||
2 | From: Fiona Ebner <f.ebner@proxmox.com> | ||
3 | Date: Wed, 24 Jan 2024 11:57:48 +0100 | ||
4 | Subject: [PATCH] ui/clipboard: mark type as not available when there is no | ||
5 | data | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | With VNC, a client can send a non-extended VNC_MSG_CLIENT_CUT_TEXT | ||
11 | message with len=0. In qemu_clipboard_set_data(), the clipboard info | ||
12 | will be updated setting data to NULL (because g_memdup(data, size) | ||
13 | returns NULL when size is 0). If the client does not set the | ||
14 | VNC_ENCODING_CLIPBOARD_EXT feature when setting up the encodings, then | ||
15 | the 'request' callback for the clipboard peer is not initialized. | ||
16 | Later, because data is NULL, qemu_clipboard_request() can be reached | ||
17 | via vdagent_chr_write() and vdagent_clipboard_recv_request() and | ||
18 | there, the clipboard owner's 'request' callback will be attempted to | ||
19 | be called, but that is a NULL pointer. | ||
20 | |||
21 | In particular, this can happen when using the KRDC (22.12.3) VNC | ||
22 | client. | ||
23 | |||
24 | Another scenario leading to the same issue is with two clients (say | ||
25 | noVNC and KRDC): | ||
26 | |||
27 | The noVNC client sets the extension VNC_FEATURE_CLIPBOARD_EXT and | ||
28 | initializes its cbpeer. | ||
29 | |||
30 | The KRDC client does not, but triggers a vnc_client_cut_text() (note | ||
31 | it's not the _ext variant)). There, a new clipboard info with it as | ||
32 | the 'owner' is created and via qemu_clipboard_set_data() is called, | ||
33 | which in turn calls qemu_clipboard_update() with that info. | ||
34 | |||
35 | In qemu_clipboard_update(), the notifier for the noVNC client will be | ||
36 | called, i.e. vnc_clipboard_notify() and also set vs->cbinfo for the | ||
37 | noVNC client. The 'owner' in that clipboard info is the clipboard peer | ||
38 | for the KRDC client, which did not initialize the 'request' function. | ||
39 | That sounds correct to me, it is the owner of that clipboard info. | ||
40 | |||
41 | Then when noVNC sends a VNC_MSG_CLIENT_CUT_TEXT message (it did set | ||
42 | the VNC_FEATURE_CLIPBOARD_EXT feature correctly, so a check for it | ||
43 | passes), that clipboard info is passed to qemu_clipboard_request() and | ||
44 | the original segfault still happens. | ||
45 | |||
46 | Fix the issue by handling updates with size 0 differently. In | ||
47 | particular, mark in the clipboard info that the type is not available. | ||
48 | |||
49 | While at it, switch to g_memdup2(), because g_memdup() is deprecated. | ||
50 | |||
51 | Cc: qemu-stable@nongnu.org | ||
52 | Fixes: CVE-2023-6683 | ||
53 | Reported-by: Markus Frank <m.frank@proxmox.com> | ||
54 | Suggested-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
55 | Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> | ||
56 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
57 | Tested-by: Markus Frank <m.frank@proxmox.com> | ||
58 | Message-ID: <20240124105749.204610-1-f.ebner@proxmox.com> | ||
59 | |||
60 | CVE: CVE-2023-6683 | ||
61 | |||
62 | Upstream-Status: Backport [https://github.com/qemu/qemu/commit/405484b29f6548c7b86549b0f961b906337aa68a] | ||
63 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | ||
64 | |||
65 | --- | ||
66 | ui/clipboard.c | 12 +++++++++--- | ||
67 | 1 file changed, 9 insertions(+), 3 deletions(-) | ||
68 | |||
69 | diff --git a/ui/clipboard.c b/ui/clipboard.c | ||
70 | index 3d14bffaf80f..b3f6fa3c9e1f 100644 | ||
71 | --- a/ui/clipboard.c | ||
72 | +++ b/ui/clipboard.c | ||
73 | @@ -163,9 +163,15 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, | ||
74 | } | ||
75 | |||
76 | g_free(info->types[type].data); | ||
77 | - info->types[type].data = g_memdup(data, size); | ||
78 | - info->types[type].size = size; | ||
79 | - info->types[type].available = true; | ||
80 | + if (size) { | ||
81 | + info->types[type].data = g_memdup2(data, size); | ||
82 | + info->types[type].size = size; | ||
83 | + info->types[type].available = true; | ||
84 | + } else { | ||
85 | + info->types[type].data = NULL; | ||
86 | + info->types[type].size = 0; | ||
87 | + info->types[type].available = false; | ||
88 | + } | ||
89 | |||
90 | if (update) { | ||
91 | qemu_clipboard_update(info); | ||
diff --git a/meta/recipes-devtools/qemu/qemu_8.2.1.bb b/meta/recipes-devtools/qemu/qemu_9.0.0.bb index dc1352232e..dc1352232e 100644 --- a/meta/recipes-devtools/qemu/qemu_8.2.1.bb +++ b/meta/recipes-devtools/qemu/qemu_9.0.0.bb | |||
diff --git a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb index 97b44ad2e5..6d0e7883ad 100644 --- a/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +++ b/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb | |||
@@ -2,7 +2,8 @@ SUMMARY = "QEMU wrapper script" | |||
2 | HOMEPAGE = "http://qemu.org" | 2 | HOMEPAGE = "http://qemu.org" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | 4 | ||
5 | S = "${WORKDIR}" | 5 | S = "${WORKDIR}/sources" |
6 | UNPACKDIR = "${S}" | ||
6 | 7 | ||
7 | DEPENDS += "qemu-native" | 8 | DEPENDS += "qemu-native" |
8 | 9 | ||
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 3374f4dfbf..1d90d3d84d 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -67,7 +67,7 @@ DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptes | |||
67 | PACKAGE_WRITE_DEPS += "ptest-runner" | 67 | PACKAGE_WRITE_DEPS += "ptest-runner" |
68 | 68 | ||
69 | do_install_ptest() { | 69 | do_install_ptest() { |
70 | install ${WORKDIR}/test.sh ${D}${PTEST_PATH} | 70 | install ${UNPACKDIR}/test.sh ${D}${PTEST_PATH} |
71 | mkdir ${D}${PTEST_PATH}/test | 71 | mkdir ${D}${PTEST_PATH}/test |
72 | install ${S}/test/* ${D}${PTEST_PATH}/test | 72 | install ${S}/test/* ${D}${PTEST_PATH}/test |
73 | # mail needs a MTA, and the patch-wrapper is disabled | 73 | # mail needs a MTA, and the patch-wrapper is disabled |
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service index b6b81d5c1a..1ce19abcaf 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service | |||
@@ -7,7 +7,7 @@ Before=sysinit.target | |||
7 | [Service] | 7 | [Service] |
8 | Type=oneshot | 8 | Type=oneshot |
9 | ExecStart=#SBINDIR#/run-postinsts | 9 | ExecStart=#SBINDIR#/run-postinsts |
10 | ExecStartPost=#BASE_BINDIR#/systemctl --no-reload disable run-postinsts.service | 10 | ExecStartPost=#BASE_BINDIR#/systemctl disable run-postinsts.service |
11 | RemainAfterExit=yes | 11 | RemainAfterExit=yes |
12 | TimeoutSec=0 | 12 | TimeoutSec=0 |
13 | 13 | ||
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index e3d63df852..f571e61921 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | |||
@@ -8,7 +8,8 @@ SRC_URI = "file://run-postinsts \ | |||
8 | file://run-postinsts.init \ | 8 | file://run-postinsts.init \ |
9 | file://run-postinsts.service" | 9 | file://run-postinsts.service" |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}/sources" |
12 | UNPACKDIR = "${S}" | ||
12 | 13 | ||
13 | inherit allarch systemd update-rc.d | 14 | inherit allarch systemd update-rc.d |
14 | 15 | ||
diff --git a/meta/recipes-devtools/rust/cargo_1.75.0.bb b/meta/recipes-devtools/rust/cargo_1.75.0.bb index 50b7e7c7b4..123032cdf7 100644 --- a/meta/recipes-devtools/rust/cargo_1.75.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.75.0.bb | |||
@@ -22,7 +22,7 @@ inherit cargo pkgconfig | |||
22 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=${TARGET_DBGSRC_DIR}" | 22 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=${TARGET_DBGSRC_DIR}" |
23 | 23 | ||
24 | do_cargo_setup_snapshot () { | 24 | do_cargo_setup_snapshot () { |
25 | ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig | 25 | ${UNPACKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig |
26 | # Need to use uninative's loader if enabled/present since the library paths | 26 | # Need to use uninative's loader if enabled/present since the library paths |
27 | # are used internally by rust and result in symbol mismatches if we don't | 27 | # are used internally by rust and result in symbol mismatches if we don't |
28 | if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then | 28 | if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then |
diff --git a/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch b/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch new file mode 100644 index 0000000000..a6ee867605 --- /dev/null +++ b/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 065d7c263091118437465d714d8a29dbb6296921 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 13 May 2024 14:57:54 +0200 | ||
4 | Subject: [PATCH] cargo: do not write host information into compilation unit | ||
5 | hashes | ||
6 | |||
7 | This breaks reproducibility in cross-builds where the cross-target | ||
8 | can be the same, but build hosts are different, as seen with | ||
9 | "rustc --version -v": | ||
10 | ... | ||
11 | host: x86_64-unknown-linux-gnu | ||
12 | |||
13 | vs. | ||
14 | |||
15 | host: aarch64-unknown-linux-gnu | ||
16 | |||
17 | This can possibly be improved by only hashing host info if the build | ||
18 | is a native one (e.g. there's no --target option passed to cargo | ||
19 | invocation) but I'm not sure how. | ||
20 | |||
21 | Upstream-Status: Inappropriate [reported at https://github.com/rust-lang/cargo/issues/13922] | ||
22 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
23 | --- | ||
24 | .../src/cargo/core/compiler/context/compilation_files.rs | 4 ++-- | ||
25 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs b/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs | ||
28 | index d83dbf10c..b2ad8d9f3 100644 | ||
29 | --- a/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs | ||
30 | +++ b/src/tools/cargo/src/cargo/core/compiler/context/compilation_files.rs | ||
31 | @@ -652,7 +652,7 @@ fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher) { | ||
32 | if vers.pre.is_empty() || bcx.config.cli_unstable().separate_nightlies { | ||
33 | // For stable, keep the artifacts separate. This helps if someone is | ||
34 | // testing multiple versions, to avoid recompiles. | ||
35 | - bcx.rustc().verbose_version.hash(hasher); | ||
36 | + //bcx.rustc().verbose_version.hash(hasher); | ||
37 | return; | ||
38 | } | ||
39 | // On "nightly"/"beta"/"dev"/etc, keep each "channel" separate. Don't hash | ||
40 | @@ -665,7 +665,7 @@ fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher) { | ||
41 | // Keep "host" since some people switch hosts to implicitly change | ||
42 | // targets, (like gnu vs musl or gnu vs msvc). In the future, we may want | ||
43 | // to consider hashing `unit.kind.short_name()` instead. | ||
44 | - bcx.rustc().host.hash(hasher); | ||
45 | + //bcx.rustc().host.hash(hasher); | ||
46 | // None of the other lines are important. Currently they are: | ||
47 | // binary: rustc <-- or "rustdoc" | ||
48 | // commit-hash: 38114ff16e7856f98b2b4be7ab4cd29b38bed59a | ||
49 | -- | ||
50 | 2.39.2 | ||
51 | |||
diff --git a/meta/recipes-devtools/rust/files/cargo-path.patch b/meta/recipes-devtools/rust/files/cargo-path.patch deleted file mode 100644 index 9a50c40220..0000000000 --- a/meta/recipes-devtools/rust/files/cargo-path.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Fix the cargo binary path error and ensure that it is fetched | ||
2 | during rustc bootstrap in rust oe-selftest. | ||
3 | |||
4 | ====================================================================== | ||
5 | ERROR: test_cargoflags (bootstrap_test.BuildBootstrap) | ||
6 | ---------------------------------------------------------------------- | ||
7 | Traceback (most recent call last): | ||
8 | File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py", line 157, in test_cargoflags | ||
9 | args, _ = self.build_args(env={"CARGOFLAGS": "--timings"}) | ||
10 | File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py", line 154, in build_args | ||
11 | return build.build_bootstrap_cmd(env), env | ||
12 | File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap.py", line 960, in build_bootstrap_cmd | ||
13 | raise Exception("no cargo executable found at `{}`".format( | ||
14 | Exception: no cargo executable found at `/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/build/x86_64-unknown-linux-gnu/stage0/bin/cargo` | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/rust-lang/rust/pull/120125] | ||
17 | |||
18 | Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> | ||
19 | --- | ||
20 | diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py | ||
21 | --- a/src/bootstrap/bootstrap.py | ||
22 | +++ b/src/bootstrap/bootstrap.py | ||
23 | @@ -954,9 +954,11 @@ | ||
24 | if "RUSTFLAGS_BOOTSTRAP" in env: | ||
25 | env["RUSTFLAGS"] += " " + env["RUSTFLAGS_BOOTSTRAP"] | ||
26 | |||
27 | - env["PATH"] = os.path.join(self.bin_root(), "bin") + \ | ||
28 | - os.pathsep + env["PATH"] | ||
29 | - if not os.path.isfile(self.cargo()): | ||
30 | + cargo_bin_path = os.path.join(self.bin_root(), "bin", "cargo") | ||
31 | + if not os.path.isfile(cargo_bin_path): | ||
32 | + cargo_bin_path = os.getenv("RUST_TARGET_PATH") + "rust-snapshot/bin/cargo" | ||
33 | + env["PATH"] = os.path.dirname(cargo_bin_path) + os.pathsep + env["PATH"] | ||
34 | + else: | ||
35 | raise Exception("no cargo executable found at `{}`".format( | ||
36 | self.cargo())) | ||
37 | args = [self.cargo(), "build", "--manifest-path", | ||
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index f59fee7cdd..f962437d6b 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc | |||
@@ -12,7 +12,8 @@ DEPENDS += "virtual/${SDK_PREFIX}gcc virtual/nativesdk-libc virtual/nativesdk-${ | |||
12 | 12 | ||
13 | SRC_URI += "file://target-rust-ccld.c" | 13 | SRC_URI += "file://target-rust-ccld.c" |
14 | LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7" | 14 | LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7" |
15 | S = "${WORKDIR}" | 15 | S = "${WORKDIR}/sources" |
16 | UNPACKDIR = "${S}" | ||
16 | 17 | ||
17 | # Need to use our SDK's sh here, see #14878 | 18 | # Need to use our SDK's sh here, see #14878 |
18 | create_sdk_wrapper () { | 19 | create_sdk_wrapper () { |
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index b14221b6cb..20ef5e82bc 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc | |||
@@ -7,12 +7,12 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n | |||
7 | file://rv32-missing-syscalls.patch;patchdir=${RUSTSRC} \ | 7 | file://rv32-missing-syscalls.patch;patchdir=${RUSTSRC} \ |
8 | file://rv32-rustix-libc-backend.patch;patchdir=${RUSTSRC} \ | 8 | file://rv32-rustix-libc-backend.patch;patchdir=${RUSTSRC} \ |
9 | file://rv32-cargo-rustix-0.38.19-fix.patch;patchdir=${RUSTSRC} \ | 9 | file://rv32-cargo-rustix-0.38.19-fix.patch;patchdir=${RUSTSRC} \ |
10 | file://cargo-path.patch;patchdir=${RUSTSRC} \ | ||
11 | file://custom-target-cfg.patch;patchdir=${RUSTSRC} \ | 10 | file://custom-target-cfg.patch;patchdir=${RUSTSRC} \ |
12 | file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ | 11 | file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ |
13 | file://target-build-value.patch;patchdir=${RUSTSRC} \ | 12 | file://target-build-value.patch;patchdir=${RUSTSRC} \ |
14 | file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} \ | 13 | file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} \ |
15 | file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ | 14 | file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ |
15 | file://0001-cargo-do-not-write-host-information-into-compilation.patch;patchdir=${RUSTSRC} \ | ||
16 | " | 16 | " |
17 | SRC_URI[rust.sha256sum] = "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" | 17 | SRC_URI[rust.sha256sum] = "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" |
18 | 18 | ||
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb b/meta/recipes-devtools/rust/rust_1.75.0.bb index 76e1fe2d84..c66c14cc5a 100644 --- a/meta/recipes-devtools/rust/rust_1.75.0.bb +++ b/meta/recipes-devtools/rust/rust_1.75.0.bb | |||
@@ -11,6 +11,11 @@ DEPENDS += "file-native python3-native" | |||
11 | DEPENDS:append:class-native = " rust-llvm-native" | 11 | DEPENDS:append:class-native = " rust-llvm-native" |
12 | DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm" | 12 | DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm" |
13 | 13 | ||
14 | # native rust uses cargo/rustc from binary snapshots to bootstrap | ||
15 | # but everything else should use our native builds | ||
16 | DEPENDS:append:class-target = " cargo-native rust-native" | ||
17 | DEPENDS:append:class-nativesdk = " cargo-native rust-native" | ||
18 | |||
14 | DEPENDS += "rust-llvm (=${PV})" | 19 | DEPENDS += "rust-llvm (=${PV})" |
15 | 20 | ||
16 | RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" | 21 | RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" |
@@ -35,8 +40,6 @@ RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-co | |||
35 | # own vendoring. | 40 | # own vendoring. |
36 | CARGO_DISABLE_BITBAKE_VENDORING = "1" | 41 | CARGO_DISABLE_BITBAKE_VENDORING = "1" |
37 | 42 | ||
38 | # We can't use RUST_BUILD_SYS here because that may be "musl" if | ||
39 | # TCLIBC="musl". Snapshots are always -unknown-linux-gnu | ||
40 | setup_cargo_environment () { | 43 | setup_cargo_environment () { |
41 | # The first step is to build bootstrap and some early stage tools, | 44 | # The first step is to build bootstrap and some early stage tools, |
42 | # these are build for the same target as the snapshot, e.g. | 45 | # these are build for the same target as the snapshot, e.g. |
@@ -48,14 +51,14 @@ setup_cargo_environment () { | |||
48 | inherit rust-target-config | 51 | inherit rust-target-config |
49 | 52 | ||
50 | do_rust_setup_snapshot () { | 53 | do_rust_setup_snapshot () { |
51 | for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do | 54 | for installer in "${UNPACKDIR}/rust-snapshot-components/"*"/install.sh"; do |
52 | "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig | 55 | "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig |
53 | done | 56 | done |
54 | 57 | ||
55 | # Some versions of rust (e.g. 1.18.0) tries to find cargo in stage0/bin/cargo | 58 | # Some versions of rust (e.g. 1.18.0) tries to find cargo in stage0/bin/cargo |
56 | # and fail without it there. | 59 | # and fail without it there. |
57 | mkdir -p ${RUSTSRC}/build/${BUILD_SYS} | 60 | mkdir -p ${RUSTSRC}/build/${RUST_BUILD_SYS} |
58 | ln -sf ${WORKDIR}/rust-snapshot/ ${RUSTSRC}/build/${BUILD_SYS}/stage0 | 61 | ln -sf ${WORKDIR}/rust-snapshot/ ${RUSTSRC}/build/${RUST_BUILD_SYS}/stage0 |
59 | 62 | ||
60 | # Need to use uninative's loader if enabled/present since the library paths | 63 | # Need to use uninative's loader if enabled/present since the library paths |
61 | # are used internally by rust and result in symbol mismatches if we don't | 64 | # are used internally by rust and result in symbol mismatches if we don't |
@@ -70,6 +73,11 @@ addtask do_test_compile after do_configure do_rust_gen_targets | |||
70 | do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot" | 73 | do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot" |
71 | do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER" | 74 | do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER" |
72 | 75 | ||
76 | RUSTC_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/rustc" | ||
77 | CARGO_BOOTSTRAP = "${STAGING_BINDIR_NATIVE}/cargo" | ||
78 | RUSTC_BOOTSTRAP:class-native = "${WORKDIR}/rust-snapshot/bin/rustc" | ||
79 | CARGO_BOOTSTRAP:class-native = "${WORKDIR}/rust-snapshot/bin/cargo" | ||
80 | |||
73 | python do_configure() { | 81 | python do_configure() { |
74 | import json | 82 | import json |
75 | import configparser | 83 | import configparser |
@@ -141,12 +149,11 @@ python do_configure() { | |||
141 | config.add_section("build") | 149 | config.add_section("build") |
142 | config.set("build", "submodules", e(False)) | 150 | config.set("build", "submodules", e(False)) |
143 | config.set("build", "docs", e(False)) | 151 | config.set("build", "docs", e(False)) |
144 | config.set("build", "tools", ["rust-demangler",]) | ||
145 | 152 | ||
146 | rustc = d.expand("${WORKDIR}/rust-snapshot/bin/rustc") | 153 | rustc = d.getVar('RUSTC_BOOTSTRAP') |
147 | config.set("build", "rustc", e(rustc)) | 154 | config.set("build", "rustc", e(rustc)) |
148 | 155 | ||
149 | cargo = d.expand("${WORKDIR}/rust-snapshot/bin/cargo") | 156 | cargo = d.getVar('CARGO_BOOTSTRAP') |
150 | config.set("build", "cargo", e(cargo)) | 157 | config.set("build", "cargo", e(cargo)) |
151 | 158 | ||
152 | config.set("build", "vendor", e(True)) | 159 | config.set("build", "vendor", e(True)) |
diff --git a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch index 76ca7a76a8..86dcd97713 100644 --- a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +++ b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 470399f3636c412b74f9daf6ae430b13c3126f02 Mon Sep 17 00:00:00 2001 | 1 | From ec543417b8e1df7c71dfc4728313849d9ab669a6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 15 Dec 2022 15:54:27 -0800 | 3 | Date: Thu, 15 Dec 2022 15:54:27 -0800 |
4 | Subject: [PATCH] configure: Use autoconf macro to detect largefile support | 4 | Subject: [PATCH] configure: Use autoconf macro to detect largefile support |
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 1 file changed, 2 insertions(+) | 13 | 1 file changed, 2 insertions(+) |
14 | 14 | ||
15 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
16 | index 4797b42dd..7d57fb254 100644 | 16 | index 36fff90..9e40ab5 100644 |
17 | --- a/configure.ac | 17 | --- a/configure.ac |
18 | +++ b/configure.ac | 18 | +++ b/configure.ac |
19 | @@ -43,6 +43,8 @@ AC_PROG_INSTALL | 19 | @@ -42,6 +42,8 @@ AC_PROG_INSTALL |
20 | AC_PROG_RANLIB | 20 | AC_PROG_RANLIB |
21 | AC_PROG_LN_S | 21 | AC_PROG_LN_S |
22 | 22 | ||
diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch index c4c176e6bc..9cdb7c6134 100644 --- a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 | 1 | From d5f681c2de834110de260f4d071c7bc1fb0d7564 Mon Sep 17 00:00:00 2001 |
2 | From: Jeremy Puhlman <jpuhlman@mvista.com> | 2 | From: Jeremy Puhlman <jpuhlman@mvista.com> |
3 | Date: Wed, 11 Mar 2020 19:56:55 +0000 | 3 | Date: Wed, 11 Mar 2020 19:56:55 +0000 |
4 | Subject: [PATCH] strace: fix reproducibilty issues | 4 | Subject: [PATCH] strace: fix reproducibilty issues |
@@ -13,7 +13,7 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | |||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh | 15 | diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh |
16 | index 5e1e7c9..1e65eac 100755 | 16 | index 8f47651..65267db 100755 |
17 | --- a/tests/gen_tests.sh | 17 | --- a/tests/gen_tests.sh |
18 | +++ b/tests/gen_tests.sh | 18 | +++ b/tests/gen_tests.sh |
19 | @@ -46,7 +46,7 @@ while read -r name arg0 args; do { | 19 | @@ -46,7 +46,7 @@ while read -r name arg0 args; do { |
@@ -25,7 +25,7 @@ index 5e1e7c9..1e65eac 100755 | |||
25 | 25 | ||
26 | case "$arg0" in | 26 | case "$arg0" in |
27 | +*) | 27 | +*) |
28 | @@ -80,7 +80,7 @@ while read -r name arg0 args; do { | 28 | @@ -91,7 +91,7 @@ while read -r name arg0 args; do { |
29 | 29 | ||
30 | if [ -n "$names" ]; then | 30 | if [ -n "$names" ]; then |
31 | { | 31 | { |
@@ -34,6 +34,3 @@ index 5e1e7c9..1e65eac 100755 | |||
34 | printf 'GEN_TESTS =' | 34 | printf 'GEN_TESTS =' |
35 | printf ' %s.gen.test' $names | 35 | printf ' %s.gen.test' $names |
36 | echo | 36 | echo |
37 | -- | ||
38 | 2.24.1 | ||
39 | |||
diff --git a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch index 0cabdfe99f..fc6ed7ac4d 100644 --- a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +++ b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 579b2ebe52d4b97f954e6188df2d07e137820075 Mon Sep 17 00:00:00 2001 | 1 | From 1891db87da3b204c512f47155aaa4e692008f1bf Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 15 Dec 2022 15:56:13 -0800 | 3 | Date: Thu, 15 Dec 2022 15:56:13 -0800 |
4 | Subject: [PATCH] tests: Replace off64_t with off_t | 4 | Subject: [PATCH] tests: Replace off64_t with off_t |
@@ -10,9 +10,12 @@ Upstream-Status: Submitted [https://github.com/strace/strace/pull/230] | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | --- | 11 | --- |
12 | tests/readahead.c | 2 +- | 12 | tests/readahead.c | 2 +- |
13 | tests/sync_file_range.c | 4 ++-- | ||
13 | tests/sync_file_range2.c | 4 ++-- | 14 | tests/sync_file_range2.c | 4 ++-- |
14 | 2 files changed, 3 insertions(+), 3 deletions(-) | 15 | 3 files changed, 5 insertions(+), 5 deletions(-) |
15 | 16 | ||
17 | diff --git a/tests/readahead.c b/tests/readahead.c | ||
18 | index 1072378..b9597e6 100644 | ||
16 | --- a/tests/readahead.c | 19 | --- a/tests/readahead.c |
17 | +++ b/tests/readahead.c | 20 | +++ b/tests/readahead.c |
18 | @@ -42,7 +42,7 @@ static const int fds[] = { | 21 | @@ -42,7 +42,7 @@ static const int fds[] = { |
@@ -24,29 +27,33 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
24 | -0x8000000000000000LL, | 27 | -0x8000000000000000LL, |
25 | -0x5060708090a0b0c0LL, | 28 | -0x5060708090a0b0c0LL, |
26 | -1LL, | 29 | -1LL, |
27 | --- a/tests/sync_file_range2.c | 30 | diff --git a/tests/sync_file_range.c b/tests/sync_file_range.c |
28 | +++ b/tests/sync_file_range2.c | 31 | index e93ab6c..dc76865 100644 |
32 | --- a/tests/sync_file_range.c | ||
33 | +++ b/tests/sync_file_range.c | ||
29 | @@ -20,8 +20,8 @@ int | 34 | @@ -20,8 +20,8 @@ int |
30 | main(void) | 35 | main(void) |
31 | { | 36 | { |
32 | const int fd = -1; | 37 | const int fd = -1; |
33 | - const off64_t offset = 0xdeadbeefbadc0ded; | 38 | - const off64_t offset = 0xdeadbeefbadc0dedULL; |
34 | - const off64_t nbytes = 0xfacefeedcafef00d; | 39 | - const off64_t nbytes = 0xfacefeedcafef00dULL; |
35 | + const off_t offset = 0xdeadbeefbadc0ded; | 40 | + const off_t offset = 0xdeadbeefbadc0dedULL; |
36 | + const off_t nbytes = 0xfacefeedcafef00d; | 41 | + const off_t nbytes = 0xfacefeedcafef00dULL; |
37 | const unsigned int flags = -1; | 42 | const unsigned int flags = -1; |
38 | 43 | ||
39 | int rc = sync_file_range(fd, offset, nbytes, flags); | 44 | int rc = sync_file_range(fd, offset, nbytes, flags); |
40 | --- a/tests/sync_file_range.c | 45 | diff --git a/tests/sync_file_range2.c b/tests/sync_file_range2.c |
41 | +++ b/tests/sync_file_range.c | 46 | index b8dc712..e4b003c 100644 |
47 | --- a/tests/sync_file_range2.c | ||
48 | +++ b/tests/sync_file_range2.c | ||
42 | @@ -20,8 +20,8 @@ int | 49 | @@ -20,8 +20,8 @@ int |
43 | main(void) | 50 | main(void) |
44 | { | 51 | { |
45 | const int fd = -1; | 52 | const int fd = -1; |
46 | - const off64_t offset = 0xdeadbeefbadc0dedULL; | 53 | - const off64_t offset = 0xdeadbeefbadc0ded; |
47 | - const off64_t nbytes = 0xfacefeedcafef00dULL; | 54 | - const off64_t nbytes = 0xfacefeedcafef00d; |
48 | + const off_t offset = 0xdeadbeefbadc0dedULL; | 55 | + const off_t offset = 0xdeadbeefbadc0ded; |
49 | + const off_t nbytes = 0xfacefeedcafef00dULL; | 56 | + const off_t nbytes = 0xfacefeedcafef00d; |
50 | const unsigned int flags = -1; | 57 | const unsigned int flags = -1; |
51 | 58 | ||
52 | int rc = sync_file_range(fd, offset, nbytes, flags); | 59 | int rc = sync_file_range(fd, offset, nbytes, flags); |
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 9af7737662..3e50bf40f0 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1f50e0a09d828be8f5b1f28db9af0b12492a1553 Mon Sep 17 00:00:00 2001 | 1 | From 245f6322cf64e562d3227dfac26ce93c905b0380 Mon Sep 17 00:00:00 2001 |
2 | From: Gabriel Barbu <gabriel.barbu@enea.com> | 2 | From: Gabriel Barbu <gabriel.barbu@enea.com> |
3 | Date: Thu, 25 Jul 2013 15:28:33 +0200 | 3 | Date: Thu, 25 Jul 2013 15:28:33 +0200 |
4 | Subject: [PATCH] strace: Add ptest | 4 | Subject: [PATCH] strace: Add ptest |
@@ -8,16 +8,15 @@ Upstream-Status: Inappropriate | |||
8 | Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> | 8 | Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> |
9 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | 9 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> |
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | tests/Makefile.am | 20 ++++++++++++++++++++ | 12 | tests/Makefile.am | 20 ++++++++++++++++++++ |
14 | 1 file changed, 20 insertions(+) | 13 | 1 file changed, 20 insertions(+) |
15 | 14 | ||
16 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 15 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
17 | index 55566ee..a7ae6f9 100644 | 16 | index ef68898..735b73d 100644 |
18 | --- a/tests/Makefile.am | 17 | --- a/tests/Makefile.am |
19 | +++ b/tests/Makefile.am | 18 | +++ b/tests/Makefile.am |
20 | @@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ | 19 | @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ |
21 | MPERS_NAME = | 20 | MPERS_NAME = |
22 | MPERS_CC_FLAGS = | 21 | MPERS_CC_FLAGS = |
23 | ARCH_MFLAGS = | 22 | ARCH_MFLAGS = |
@@ -25,7 +24,7 @@ index 55566ee..a7ae6f9 100644 | |||
25 | AM_CFLAGS = $(WARN_CFLAGS) | 24 | AM_CFLAGS = $(WARN_CFLAGS) |
26 | bundled_CPPFLAGS = | 25 | bundled_CPPFLAGS = |
27 | if USE_BUNDLED_HEADERS | 26 | if USE_BUNDLED_HEADERS |
28 | @@ -703,3 +704,22 @@ BUILT_SOURCES = ksysent.h | 27 | @@ -889,3 +890,22 @@ BUILT_SOURCES = ksysent.h |
29 | CLEANFILES = ksysent.h | 28 | CLEANFILES = ksysent.h |
30 | 29 | ||
31 | include ../src/scno.am | 30 | include ../src/scno.am |
diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch index 4e86ccadc5..14ea469c59 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 | 1 | From cf77d301faf96cc892c6df0e19fccbf5853f249d Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 29 May 2019 00:10:32 +0100 | 3 | Date: Wed, 29 May 2019 00:10:32 +0100 |
4 | Subject: [PATCH] strace: Tweak ptest disk space management | 4 | Subject: [PATCH] strace: Tweak ptest disk space management |
@@ -9,16 +9,15 @@ using around 600MB of disk space and running our ptest images out of space. | |||
9 | RP 2019/5/29 | 9 | RP 2019/5/29 |
10 | 10 | ||
11 | Upstream-Status: Inappropriate [specific to OE image space issues] | 11 | Upstream-Status: Inappropriate [specific to OE image space issues] |
12 | |||
13 | --- | 12 | --- |
14 | tests/gen_tests.sh | 1 + | 13 | tests/gen_tests.sh | 1 + |
15 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
16 | 15 | ||
17 | diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh | 16 | diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh |
18 | index 3540204..5e1e7c9 100755 | 17 | index ce1467e..8f47651 100755 |
19 | --- a/tests/gen_tests.sh | 18 | --- a/tests/gen_tests.sh |
20 | +++ b/tests/gen_tests.sh | 19 | +++ b/tests/gen_tests.sh |
21 | @@ -62,6 +62,7 @@ while read -r name arg0 args; do { | 20 | @@ -73,6 +73,7 @@ while read -r name arg0 args; do { |
22 | $hdr | 21 | $hdr |
23 | . "\${srcdir=.}/init.sh" | 22 | . "\${srcdir=.}/init.sh" |
24 | run_strace_match_diff $arg0 $args | 23 | run_strace_match_diff $arg0 $args |
diff --git a/meta/recipes-devtools/strace/strace/skip-load.patch b/meta/recipes-devtools/strace/strace/skip-load.patch index b1acfda5d8..fe737d8f9a 100644 --- a/meta/recipes-devtools/strace/strace/skip-load.patch +++ b/meta/recipes-devtools/strace/strace/skip-load.patch | |||
@@ -1,9 +1,13 @@ | |||
1 | From 3af7272a3435fc79e5da729155480a346ccf2d44 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Mon, 31 Jan 2022 17:40:13 +0000 | ||
4 | Subject: [PATCH] strace: skip a number of load-sensitive tests | ||
5 | |||
1 | Skip tests which are known to be unreliable under load, typically because they | 6 | Skip tests which are known to be unreliable under load, typically because they |
2 | care about timing. | 7 | care about timing. |
3 | 8 | ||
4 | Upstream-Status: Inappropriate | 9 | Upstream-Status: Inappropriate |
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
6 | |||
7 | --- | 11 | --- |
8 | tests/clock_nanosleep.gen.test | 1 + | 12 | tests/clock_nanosleep.gen.test | 1 + |
9 | tests/delay.test | 1 + | 13 | tests/delay.test | 1 + |
@@ -44,6 +48,3 @@ index 8299737..d89c7df 100755 | |||
44 | 48 | ||
45 | r_opt="${1:--r}" | 49 | r_opt="${1:--r}" |
46 | 50 | ||
47 | -- | ||
48 | 2.25.1 | ||
49 | |||
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index a16ede95c2..429588d218 100644 --- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch +++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4cd26cfaec255ec87f22abe886e0be89312a9671 Mon Sep 17 00:00:00 2001 | 1 | From 920ff2e0e838fae4fe49bf8e8fa093d5b2485677 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Mon, 18 Jan 2016 11:01:00 -0800 | 3 | Date: Mon, 18 Jan 2016 11:01:00 -0800 |
4 | Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk | 4 | Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk |
@@ -11,22 +11,24 @@ from #!/bin/gawk to #!/usr/bin/gawk. Fixes missing RDPENDS QA tests: | |||
11 | Upstream-Status: Inappropriate [configuration] | 11 | Upstream-Status: Inappropriate [configuration] |
12 | 12 | ||
13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 13 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
14 | |||
15 | --- | 14 | --- |
16 | src/mpers.awk | 2 +- | 15 | src/mpers.awk | 2 +- |
16 | tests-m32/caps-abbrev.awk | 2 +- | ||
17 | tests-m32/caps.awk | 2 +- | 17 | tests-m32/caps.awk | 2 +- |
18 | tests-m32/match.awk | 2 +- | 18 | tests-m32/match.awk | 2 +- |
19 | tests-m32/rt_sigaction.awk | 2 +- | 19 | tests-m32/rt_sigaction.awk | 2 +- |
20 | tests-mx32/caps-abbrev.awk | 2 +- | ||
20 | tests-mx32/caps.awk | 2 +- | 21 | tests-mx32/caps.awk | 2 +- |
21 | tests-mx32/match.awk | 2 +- | 22 | tests-mx32/match.awk | 2 +- |
22 | tests-mx32/rt_sigaction.awk | 2 +- | 23 | tests-mx32/rt_sigaction.awk | 2 +- |
24 | tests/caps-abbrev.awk | 2 +- | ||
23 | tests/caps.awk | 2 +- | 25 | tests/caps.awk | 2 +- |
24 | tests/match.awk | 2 +- | 26 | tests/match.awk | 2 +- |
25 | tests/rt_sigaction.awk | 2 +- | 27 | tests/rt_sigaction.awk | 2 +- |
26 | 10 files changed, 10 insertions(+), 10 deletions(-) | 28 | 13 files changed, 13 insertions(+), 13 deletions(-) |
27 | 29 | ||
28 | diff --git a/src/mpers.awk b/src/mpers.awk | 30 | diff --git a/src/mpers.awk b/src/mpers.awk |
29 | index 25a212f..b2ff53f 100644 | 31 | index 425ab65..33ece5c 100644 |
30 | --- a/src/mpers.awk | 32 | --- a/src/mpers.awk |
31 | +++ b/src/mpers.awk | 33 | +++ b/src/mpers.awk |
32 | @@ -1,4 +1,4 @@ | 34 | @@ -1,4 +1,4 @@ |
@@ -35,6 +37,16 @@ index 25a212f..b2ff53f 100644 | |||
35 | # | 37 | # |
36 | # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> | 38 | # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com> |
37 | # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@strace.io> | 39 | # Copyright (c) 2015-2016 Dmitry V. Levin <ldv@strace.io> |
40 | diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk | ||
41 | index e8393fd..76c4e51 100644 | ||
42 | --- a/tests-m32/caps-abbrev.awk | ||
43 | +++ b/tests-m32/caps-abbrev.awk | ||
44 | @@ -1,4 +1,4 @@ | ||
45 | -#!/bin/gawk | ||
46 | +#!/usr/bin/gawk | ||
47 | # | ||
48 | # This file is part of caps strace test. | ||
49 | # | ||
38 | diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk | 50 | diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk |
39 | index 69500ec..e5dfd87 100644 | 51 | index 69500ec..e5dfd87 100644 |
40 | --- a/tests-m32/caps.awk | 52 | --- a/tests-m32/caps.awk |
@@ -65,6 +77,16 @@ index dce78f5..573d9ea 100644 | |||
65 | # | 77 | # |
66 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> | 78 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> |
67 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> | 79 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |
80 | diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk | ||
81 | index e8393fd..76c4e51 100644 | ||
82 | --- a/tests-mx32/caps-abbrev.awk | ||
83 | +++ b/tests-mx32/caps-abbrev.awk | ||
84 | @@ -1,4 +1,4 @@ | ||
85 | -#!/bin/gawk | ||
86 | +#!/usr/bin/gawk | ||
87 | # | ||
88 | # This file is part of caps strace test. | ||
89 | # | ||
68 | diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk | 90 | diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk |
69 | index 69500ec..e5dfd87 100644 | 91 | index 69500ec..e5dfd87 100644 |
70 | --- a/tests-mx32/caps.awk | 92 | --- a/tests-mx32/caps.awk |
@@ -95,6 +117,16 @@ index dce78f5..573d9ea 100644 | |||
95 | # | 117 | # |
96 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> | 118 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> |
97 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> | 119 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |
120 | diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk | ||
121 | index e8393fd..76c4e51 100644 | ||
122 | --- a/tests/caps-abbrev.awk | ||
123 | +++ b/tests/caps-abbrev.awk | ||
124 | @@ -1,4 +1,4 @@ | ||
125 | -#!/bin/gawk | ||
126 | +#!/usr/bin/gawk | ||
127 | # | ||
128 | # This file is part of caps strace test. | ||
129 | # | ||
98 | diff --git a/tests/caps.awk b/tests/caps.awk | 130 | diff --git a/tests/caps.awk b/tests/caps.awk |
99 | index 69500ec..e5dfd87 100644 | 131 | index 69500ec..e5dfd87 100644 |
100 | --- a/tests/caps.awk | 132 | --- a/tests/caps.awk |
@@ -125,33 +157,3 @@ index dce78f5..573d9ea 100644 | |||
125 | # | 157 | # |
126 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> | 158 | # Copyright (c) 2014-2015 Dmitry V. Levin <ldv@strace.io> |
127 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> | 159 | # Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com> |
128 | diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk | ||
129 | index c00023b..a56cd56 100644 | ||
130 | --- a/tests-m32/caps-abbrev.awk | ||
131 | +++ b/tests-m32/caps-abbrev.awk | ||
132 | @@ -1,4 +1,4 @@ | ||
133 | -#!/bin/gawk | ||
134 | +#!/usr/bin/gawk | ||
135 | # | ||
136 | # This file is part of caps strace test. | ||
137 | # | ||
138 | diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk | ||
139 | index c00023b..a56cd56 100644 | ||
140 | --- a/tests-mx32/caps-abbrev.awk | ||
141 | +++ b/tests-mx32/caps-abbrev.awk | ||
142 | @@ -1,4 +1,4 @@ | ||
143 | -#!/bin/gawk | ||
144 | +#!/usr/bin/gawk | ||
145 | # | ||
146 | # This file is part of caps strace test. | ||
147 | # | ||
148 | diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk | ||
149 | index c00023b..a56cd56 100644 | ||
150 | --- a/tests/caps-abbrev.awk | ||
151 | +++ b/tests/caps-abbrev.awk | ||
152 | @@ -1,4 +1,4 @@ | ||
153 | -#!/bin/gawk | ||
154 | +#!/usr/bin/gawk | ||
155 | # | ||
156 | # This file is part of caps strace test. | ||
157 | # | ||
diff --git a/meta/recipes-devtools/strace/strace_6.8.bb b/meta/recipes-devtools/strace/strace_6.9.bb index b22c57b45d..bb9f8e42ba 100644 --- a/meta/recipes-devtools/strace/strace_6.8.bb +++ b/meta/recipes-devtools/strace/strace_6.9.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ | |||
15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ | 15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ |
16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ | 16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149" | 18 | SRC_URI[sha256sum] = "da189e990a82e3ca3a5a4631012f7ecfd489dab459854d82d8caf6a865c1356a" |
19 | 19 | ||
20 | inherit autotools ptest | 20 | inherit autotools ptest |
21 | 21 | ||
@@ -47,10 +47,6 @@ do_install_ptest() { | |||
47 | sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile | 47 | sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile |
48 | } | 48 | } |
49 | 49 | ||
50 | RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed" | 50 | RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed locale-base-en-us" |
51 | |||
52 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ | ||
53 | locale-base-en-us.iso-8859-1 \ | ||
54 | " | ||
55 | 51 | ||
56 | BBCLASSEXTEND = "native" | 52 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Define-portable-basename-function.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Define-portable-basename-function.patch new file mode 100644 index 0000000000..dc4c44c6af --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-Define-portable-basename-function.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 4b19c32791fb8a8663b3335f8a3675a2bbabe688 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 May 2024 18:40:36 -0700 | ||
4 | Subject: [PATCH] Define portable basename function | ||
5 | |||
6 | Newer version of musl have removed prototype for basename in string.h [1] | ||
7 | which now makes it fail to compile with GCC14+ compiler therefore | ||
8 | define local basename utility function. | ||
9 | |||
10 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/systemd/systemd-bootchart/pull/53] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/conf-files.c | 14 ++++++++++++-- | ||
16 | 1 file changed, 12 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/conf-files.c b/src/conf-files.c | ||
19 | index 5dd2d7d..b932bb2 100644 | ||
20 | --- a/src/conf-files.c | ||
21 | +++ b/src/conf-files.c | ||
22 | @@ -35,6 +35,16 @@ | ||
23 | #include "strv.h" | ||
24 | #include "util.h" | ||
25 | |||
26 | +/*** | ||
27 | + * basename is implemented differently across different C libraries. This | ||
28 | + * implementation matches the one provided by the GNU libc, and does not | ||
29 | + * modify its input parameter. | ||
30 | +***/ | ||
31 | +static const char *sbc_basename(const char *path) { | ||
32 | + const char *base = strrchr(path, '/'); | ||
33 | + return base ? base + 1 : path; | ||
34 | +} | ||
35 | + | ||
36 | static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) { | ||
37 | _cleanup_closedir_ DIR *dir = NULL; | ||
38 | const char *dirpath; | ||
39 | @@ -63,7 +73,7 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char | ||
40 | if (!p) | ||
41 | return -ENOMEM; | ||
42 | |||
43 | - r = hashmap_put(h, basename(p), p); | ||
44 | + r = hashmap_put(h, sbc_basename(p), p); | ||
45 | if (r == -EEXIST) { | ||
46 | log_debug("Skipping overridden file: %s.", p); | ||
47 | free(p); | ||
48 | @@ -84,7 +94,7 @@ static int base_cmp(const void *a, const void *b) { | ||
49 | |||
50 | s1 = *(char * const *)a; | ||
51 | s2 = *(char * const *)b; | ||
52 | - return strcmp(basename(s1), basename(s2)); | ||
53 | + return strcmp(sbc_basename(s1), sbc_basename(s2)); | ||
54 | } | ||
55 | |||
56 | static int conf_files_list_strv_internal(char ***strv, const char *suffix, const char *root, char **dirs) { | ||
57 | -- | ||
58 | 2.45.1 | ||
59 | |||
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb index 25544029d5..3c3c84ff4a 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb | |||
@@ -17,6 +17,7 @@ SRC_URI:append:libc-musl = " \ | |||
17 | file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ | 17 | file://0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ |
18 | file://0002-musl-does-not-provide-printf-h.patch \ | 18 | file://0002-musl-does-not-provide-printf-h.patch \ |
19 | file://0003-musl-does-not-provide-canonicalize_file_name.patch \ | 19 | file://0003-musl-does-not-provide-canonicalize_file_name.patch \ |
20 | file://0001-Define-portable-basename-function.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | 23 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch index e7af5efecc..832a1c3d6e 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch | |||
@@ -10,11 +10,9 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | |||
10 | tests/vg_regtest.in | 1 + | 10 | tests/vg_regtest.in | 1 + |
11 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+) |
12 | 12 | ||
13 | diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in | ||
14 | index 909af3be8..f2799c4e3 100755 | ||
15 | --- a/tests/vg_regtest.in | 13 | --- a/tests/vg_regtest.in |
16 | +++ b/tests/vg_regtest.in | 14 | +++ b/tests/vg_regtest.in |
17 | @@ -403,6 +403,7 @@ sub mysystem($) | 15 | @@ -401,6 +401,7 @@ sub mysystem($) |
18 | exit 1; | 16 | exit 1; |
19 | } | 17 | } |
20 | } | 18 | } |
@@ -22,6 +20,3 @@ index 909af3be8..f2799c4e3 100755 | |||
22 | } | 20 | } |
23 | # if $keepunfiltered, copies $1 to $1.unfiltered.out | 21 | # if $keepunfiltered, copies $1 to $1.unfiltered.out |
24 | # renames $0 tp $1 | 22 | # renames $0 tp $1 |
25 | -- | ||
26 | 2.17.0 | ||
27 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch new file mode 100644 index 0000000000..63a1a58c04 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From b17b6d7d3a65c14f91f090f3f4f9898d6fa3a9e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 10 May 2024 16:27:34 -0700 | ||
4 | Subject: [PATCH] configure: Drop setting mcpu=cortex-a8 on arm | ||
5 | |||
6 | The -march settings from environment expresses the flags | ||
7 | appropriately, moreover, this conflicts when using armhf | ||
8 | without neon [1] | ||
9 | |||
10 | [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928224 | ||
11 | |||
12 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | configure.ac | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index 39d8b6d..d61b3a6 100755 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -275,13 +275,13 @@ case "${host_cpu}" in | ||
23 | |||
24 | armv8*) | ||
25 | AC_MSG_RESULT([ok (${host_cpu})]) | ||
26 | - VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8" | ||
27 | + VGCONF_PLATFORM_ARM_ARCH="-marm" | ||
28 | ARCH_MAX="arm" | ||
29 | ;; | ||
30 | |||
31 | armv7*) | ||
32 | AC_MSG_RESULT([ok (${host_cpu})]) | ||
33 | - VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8" | ||
34 | + VGCONF_PLATFORM_ARM_ARCH="-marm" | ||
35 | ARCH_MAX="arm" | ||
36 | ;; | ||
37 | |||
38 | -- | ||
39 | 2.45.0 | ||
40 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch index 256ddb0c34..eba569c884 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch | |||
@@ -18,11 +18,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | docs/Makefile.am | 2 +- | 18 | docs/Makefile.am | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/docs/Makefile.am b/docs/Makefile.am | ||
22 | index d4250e8..c500306 100644 | ||
23 | --- a/docs/Makefile.am | 21 | --- a/docs/Makefile.am |
24 | +++ b/docs/Makefile.am | 22 | +++ b/docs/Makefile.am |
25 | @@ -192,7 +192,7 @@ valid-manpages: $(MANPAGES_XML_FILES) | 23 | @@ -194,7 +194,7 @@ valid-manpages: $(MANPAGES_XML_FILES) |
26 | touch $@; \ | 24 | touch $@; \ |
27 | fi | 25 | fi |
28 | 26 | ||
@@ -31,6 +29,3 @@ index d4250e8..c500306 100644 | |||
31 | 29 | ||
32 | # The text version of the FAQ. | 30 | # The text version of the FAQ. |
33 | FAQ.txt: | 31 | FAQ.txt: |
34 | -- | ||
35 | 2.34.1 | ||
36 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch index 073713c139..7996fa6e8f 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | |||
@@ -19,30 +19,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
19 | none/tests/arm/Makefile.am | 18 +++++++++--------- | 19 | none/tests/arm/Makefile.am | 18 +++++++++--------- |
20 | 3 files changed, 15 insertions(+), 15 deletions(-) | 20 | 3 files changed, 15 insertions(+), 15 deletions(-) |
21 | 21 | ||
22 | diff --git a/Makefile.all.am b/Makefile.all.am | ||
23 | index 02059a3..c7c4700 100644 | ||
24 | --- a/Makefile.all.am | ||
25 | +++ b/Makefile.all.am | ||
26 | @@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g | ||
27 | |||
28 | AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ | ||
29 | AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ | ||
30 | - $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 | ||
31 | + $(AM_CFLAGS_BASE) -marm | ||
32 | AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ | ||
33 | - -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) | ||
34 | + -marm $(AM_CFLAGS_PSO_BASE) | ||
35 | AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ | ||
36 | - -marm -mcpu=cortex-a8 -g | ||
37 | + -marm -g | ||
38 | |||
39 | AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ | ||
40 | AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) | ||
41 | diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am | ||
42 | index df82169..07eb66a 100644 | ||
43 | --- a/helgrind/tests/Makefile.am | 22 | --- a/helgrind/tests/Makefile.am |
44 | +++ b/helgrind/tests/Makefile.am | 23 | +++ b/helgrind/tests/Makefile.am |
45 | @@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN | 24 | @@ -223,9 +223,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN |
46 | endif | 25 | endif |
47 | 26 | ||
48 | if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX | 27 | if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX |
@@ -55,11 +34,9 @@ index df82169..07eb66a 100644 | |||
55 | else | 34 | else |
56 | annotate_hbefore_CFLAGS = $(AM_CFLAGS) | 35 | annotate_hbefore_CFLAGS = $(AM_CFLAGS) |
57 | tc07_hbl1_CFLAGS = $(AM_CFLAGS) | 36 | tc07_hbl1_CFLAGS = $(AM_CFLAGS) |
58 | diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am | ||
59 | index 024eb6d..ccecb90 100644 | ||
60 | --- a/none/tests/arm/Makefile.am | 37 | --- a/none/tests/arm/Makefile.am |
61 | +++ b/none/tests/arm/Makefile.am | 38 | +++ b/none/tests/arm/Makefile.am |
62 | @@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ | 39 | @@ -56,10 +56,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_N |
63 | # need special helping w.r.t -mfpu and -mfloat-abi, though. | 40 | # need special helping w.r.t -mfpu and -mfloat-abi, though. |
64 | # Also force -O0 since -O takes hundreds of MB of memory | 41 | # Also force -O0 since -O takes hundreds of MB of memory |
65 | # for v6intThumb.c. | 42 | # for v6intThumb.c. |
@@ -71,11 +48,11 @@ index 024eb6d..ccecb90 100644 | |||
71 | -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb | 48 | -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb |
72 | +v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb | 49 | +v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb |
73 | 50 | ||
74 | v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm | 51 | v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a |
75 | v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb | 52 | v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a |
76 | @@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \ | 53 | @@ -74,23 +74,23 @@ v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 |
77 | v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \ | 54 | |
78 | -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb | 55 | vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mfpu=neon |
79 | 56 | ||
80 | -vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ | 57 | -vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ |
81 | +vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \ | 58 | +vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \ |
@@ -103,6 +80,3 @@ index 024eb6d..ccecb90 100644 | |||
103 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3 | 80 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3 |
104 | 81 | ||
105 | vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm | 82 | vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm |
106 | -- | ||
107 | 2.12.2 | ||
108 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch index 15fbbe954f..29a9e95a90 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch | |||
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
17 | 17 | ||
18 | --- a/config.h.in | 18 | --- a/config.h.in |
19 | +++ b/config.h.in | 19 | +++ b/config.h.in |
20 | @@ -301,6 +301,9 @@ | 20 | @@ -424,6 +424,9 @@ |
21 | /* Define to 1 if you have the <sys/sysnvl.h> header file. */ | 21 | /* Define to 1 if you have the <sys/sysnvl.h> header file. */ |
22 | #undef HAVE_SYS_SYSNVL_H | 22 | #undef HAVE_SYS_SYSNVL_H |
23 | 23 | ||
@@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | 29 | ||
30 | --- a/configure.ac | 30 | --- a/configure.ac |
31 | +++ b/configure.ac | 31 | +++ b/configure.ac |
32 | @@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([ \ | 32 | @@ -4881,6 +4881,7 @@ AC_CHECK_HEADERS([ \ |
33 | sys/syscall.h \ | 33 | sys/syscall.h \ |
34 | sys/sysnvl.h \ | 34 | sys/sysnvl.h \ |
35 | sys/time.h \ | 35 | sys/time.h \ |
@@ -39,7 +39,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
39 | 39 | ||
40 | --- a/memcheck/tests/linux/timerfd-syscall.c | 40 | --- a/memcheck/tests/linux/timerfd-syscall.c |
41 | +++ b/memcheck/tests/linux/timerfd-syscall.c | 41 | +++ b/memcheck/tests/linux/timerfd-syscall.c |
42 | @@ -45,6 +45,9 @@ | 42 | @@ -42,6 +42,9 @@ |
43 | #if defined(HAVE_SYS_TIME_H) | 43 | #if defined(HAVE_SYS_TIME_H) |
44 | #include <sys/time.h> | 44 | #include <sys/time.h> |
45 | #endif | 45 | #endif |
@@ -49,7 +49,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
49 | #if defined(HAVE_SYS_TYPES_H) | 49 | #if defined(HAVE_SYS_TYPES_H) |
50 | #include <sys/types.h> | 50 | #include <sys/types.h> |
51 | #endif | 51 | #endif |
52 | @@ -54,7 +57,8 @@ | 52 | @@ -51,7 +54,8 @@ |
53 | * timerfd_* system call numbers introduced in 2.6.23. These constants are | 53 | * timerfd_* system call numbers introduced in 2.6.23. These constants are |
54 | * not yet in the glibc 2.7 headers, that is why they are defined here. | 54 | * not yet in the glibc 2.7 headers, that is why they are defined here. |
55 | */ | 55 | */ |
@@ -59,7 +59,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
59 | #if defined(__x86_64__) | 59 | #if defined(__x86_64__) |
60 | #define __NR_timerfd_create 283 | 60 | #define __NR_timerfd_create 283 |
61 | #elif defined(__i386__) | 61 | #elif defined(__i386__) |
62 | @@ -67,8 +71,10 @@ | 62 | @@ -64,8 +68,10 @@ |
63 | #error Cannot detect your architecture! | 63 | #error Cannot detect your architecture! |
64 | #endif | 64 | #endif |
65 | #endif | 65 | #endif |
@@ -71,7 +71,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
71 | #if defined(__x86_64__) | 71 | #if defined(__x86_64__) |
72 | #define __NR_timerfd_settime 286 | 72 | #define __NR_timerfd_settime 286 |
73 | #define __NR_timerfd_gettime 287 | 73 | #define __NR_timerfd_gettime 287 |
74 | @@ -85,7 +91,7 @@ | 74 | @@ -82,7 +88,7 @@ |
75 | #error Cannot detect your architecture! | 75 | #error Cannot detect your architecture! |
76 | #endif | 76 | #endif |
77 | #endif | 77 | #endif |
@@ -80,7 +80,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
80 | 80 | ||
81 | 81 | ||
82 | /* Definitions from include/linux/timerfd.h */ | 82 | /* Definitions from include/linux/timerfd.h */ |
83 | @@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr, | 83 | @@ -124,6 +130,7 @@ void set_timespec(struct timespec *tmr, |
84 | tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); | 84 | tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); |
85 | } | 85 | } |
86 | 86 | ||
@@ -88,7 +88,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
88 | int timerfd_create(int clockid, int flags) | 88 | int timerfd_create(int clockid, int flags) |
89 | { | 89 | { |
90 | return syscall(__NR_timerfd_create, clockid, flags); | 90 | return syscall(__NR_timerfd_create, clockid, flags); |
91 | @@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim | 91 | @@ -139,6 +146,7 @@ int timerfd_gettime(int ufc, struct itim |
92 | { | 92 | { |
93 | return syscall(__NR_timerfd_gettime, ufc, otmr); | 93 | return syscall(__NR_timerfd_gettime, ufc, otmr); |
94 | } | 94 | } |
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch new file mode 100644 index 0000000000..2d28bcb6c4 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 8e907753625faba3284925983ef8e83f8491aa76 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 10 May 2024 17:44:47 -0700 | ||
4 | Subject: [PATCH] tests/arm: Use -O instead of -O0 | ||
5 | |||
6 | GCC-14 fails to compile the testcase with -O2 [1] | ||
7 | therefore workaround it by using -O1, which works | ||
8 | and for OE/cross-compiling it is fine, -O0 is used | ||
9 | to make these tests compile natively on an arm target | ||
10 | and gcc would take less memory compiling with -O0 | ||
11 | -O would take a bit more memory but in cross compiling | ||
12 | we have enough of it on build host. | ||
13 | |||
14 | [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115042 | ||
15 | Upstream-Status: Inappropriate [WORKAROUND] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | none/tests/arm/Makefile.am | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | --- a/none/tests/arm/Makefile.am | ||
22 | +++ b/none/tests/arm/Makefile.am | ||
23 | @@ -57,9 +57,9 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_N | ||
24 | # Also force -O0 since -O takes hundreds of MB of memory | ||
25 | # for v6intThumb.c. | ||
26 | v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm | ||
27 | -v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb | ||
28 | +v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O -mthumb | ||
29 | |||
30 | -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb | ||
31 | +v6media_CFLAGS = $(AM_CFLAGS) -g -O -mthumb | ||
32 | |||
33 | v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a | ||
34 | v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch deleted file mode 100644 index 80a8e3a10b..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 027b649fdb831868e71be01cafdacc49a5f419ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Fri, 17 Nov 2023 14:01:21 +0100 | ||
4 | Subject: [PATCH 1/4] valgrind-monitor.py regular expressions should use raw | ||
5 | strings | ||
6 | |||
7 | With python 3.12 gdb will produce the following SyntaxWarning when | ||
8 | loading valgrind-monitor-def.py: | ||
9 | |||
10 | /usr/share/gdb/auto-load/valgrind-monitor-def.py:214: | ||
11 | SyntaxWarning: invalid escape sequence '\[' | ||
12 | if re.fullmatch("^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
13 | |||
14 | In a future python version this will become an SyntaxError. | ||
15 | |||
16 | Use a raw strings for the regular expression. | ||
17 | |||
18 | https://bugs.kde.org/show_bug.cgi?id=476708 | ||
19 | (cherry picked from commit 0fbfbe05028ad18efda786a256a2738d2c231ed4) | ||
20 | |||
21 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=027b649fdb831868e71be01cafdacc49a5f419ab] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | NEWS | 13 +++++++++++++ | ||
25 | coregrind/m_gdbserver/valgrind-monitor-def.py | 2 +- | ||
26 | 2 files changed, 14 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/NEWS b/NEWS | ||
29 | index f11da4be8..ee5b4ff11 100644 | ||
30 | --- a/NEWS | ||
31 | +++ b/NEWS | ||
32 | @@ -1,3 +1,16 @@ | ||
33 | +Branch 3.22 | ||
34 | +~~~~~~~~~~~ | ||
35 | + | ||
36 | +* ==================== FIXED BUGS ==================== | ||
37 | + | ||
38 | +The following bugs have been fixed or resolved on this branch. | ||
39 | + | ||
40 | +476708 valgrind-monitor.py regular expressions should use raw strings | ||
41 | + | ||
42 | +To see details of a given bug, visit | ||
43 | + https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
44 | +where XXXXXX is the bug number as listed above. | ||
45 | + | ||
46 | Release 3.22.0 (31 Oct 2023) | ||
47 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
48 | |||
49 | diff --git a/coregrind/m_gdbserver/valgrind-monitor-def.py b/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
50 | index b4e7b992d..d74b1590c 100644 | ||
51 | --- a/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
52 | +++ b/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
53 | @@ -211,7 +211,7 @@ class Valgrind_ADDR_LEN_opt(Valgrind_Command): | ||
54 | For compatibility reason with the Valgrind gdbserver monitor command, | ||
55 | we detect and accept usages such as 0x1234ABCD[10].""" | ||
56 | def invoke(self, arg_str : str, from_tty : bool) -> None: | ||
57 | - if re.fullmatch("^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
58 | + if re.fullmatch(r"^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
59 | arg_str = arg_str.replace("[", " ") | ||
60 | arg_str = arg_str.replace("]", " ") | ||
61 | eval_execute_2(self, arg_str, | ||
62 | -- | ||
63 | 2.44.0 | ||
64 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch b/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch deleted file mode 100644 index 5759fa039a..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | From 1d00e5ce0fb069911c4b525ec38289fb5d9021b0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Floyd <pjfloyd@wanadoo.fr> | ||
3 | Date: Sat, 18 Nov 2023 08:49:34 +0100 | ||
4 | Subject: [PATCH 2/4] Bug 476548 - valgrind 3.22.0 fails on assertion when | ||
5 | loading debuginfo file produced by mold | ||
6 | |||
7 | (cherry picked from commit 9ea4ae66707a4dcc6f4328e11911652e4418c585) | ||
8 | |||
9 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=1d00e5ce0fb069911c4b525ec38289fb5d9021b0] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | NEWS | 2 ++ | ||
13 | coregrind/m_debuginfo/image.c | 14 +++++++++ | ||
14 | coregrind/m_debuginfo/priv_image.h | 4 +++ | ||
15 | coregrind/m_debuginfo/readelf.c | 49 ++++++++++++++++++++++++++++-- | ||
16 | 4 files changed, 66 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/NEWS b/NEWS | ||
19 | index ee5b4ff11..6cd13429a 100644 | ||
20 | --- a/NEWS | ||
21 | +++ b/NEWS | ||
22 | @@ -5,6 +5,8 @@ Branch 3.22 | ||
23 | |||
24 | The following bugs have been fixed or resolved on this branch. | ||
25 | |||
26 | +476548 valgrind 3.22.0 fails on assertion when loading debuginfo | ||
27 | + file produced by mold | ||
28 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
29 | |||
30 | To see details of a given bug, visit | ||
31 | diff --git a/coregrind/m_debuginfo/image.c b/coregrind/m_debuginfo/image.c | ||
32 | index 02e509071..445f95555 100644 | ||
33 | --- a/coregrind/m_debuginfo/image.c | ||
34 | +++ b/coregrind/m_debuginfo/image.c | ||
35 | @@ -1221,6 +1221,20 @@ Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2) | ||
36 | } | ||
37 | } | ||
38 | |||
39 | +Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n) | ||
40 | +{ | ||
41 | + ensure_valid(img, off1, 1, "ML_(img_strcmp_c)"); | ||
42 | + while (n) { | ||
43 | + UChar c1 = get(img, off1); | ||
44 | + UChar c2 = *(const UChar*)str2; | ||
45 | + if (c1 < c2) return -1; | ||
46 | + if (c1 > c2) return 1; | ||
47 | + if (c1 == 0) return 0; | ||
48 | + off1++; str2++; --n; | ||
49 | + } | ||
50 | + return 0; | ||
51 | +} | ||
52 | + | ||
53 | UChar ML_(img_get_UChar)(DiImage* img, DiOffT offset) | ||
54 | { | ||
55 | ensure_valid(img, offset, 1, "ML_(img_get_UChar)"); | ||
56 | diff --git a/coregrind/m_debuginfo/priv_image.h b/coregrind/m_debuginfo/priv_image.h | ||
57 | index a49846f14..c91e49f01 100644 | ||
58 | --- a/coregrind/m_debuginfo/priv_image.h | ||
59 | +++ b/coregrind/m_debuginfo/priv_image.h | ||
60 | @@ -115,6 +115,10 @@ Int ML_(img_strcmp)(DiImage* img, DiOffT off1, DiOffT off2); | ||
61 | cast to HChar before comparison. */ | ||
62 | Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2); | ||
63 | |||
64 | +/* Do strncmp of a C string in the image vs a normal one. Chars are | ||
65 | + cast to HChar before comparison. */ | ||
66 | +Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n); | ||
67 | + | ||
68 | /* Do strlen of a C string in the image. */ | ||
69 | SizeT ML_(img_strlen)(DiImage* img, DiOffT off); | ||
70 | |||
71 | diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c | ||
72 | index fb64ed976..46f8c8343 100644 | ||
73 | --- a/coregrind/m_debuginfo/readelf.c | ||
74 | +++ b/coregrind/m_debuginfo/readelf.c | ||
75 | @@ -2501,8 +2501,7 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di ) | ||
76 | di->rodata_avma += inrw1->bias; | ||
77 | di->rodata_bias = inrw1->bias; | ||
78 | di->rodata_debug_bias = inrw1->bias; | ||
79 | - } | ||
80 | - else { | ||
81 | + } else { | ||
82 | BAD(".rodata"); /* should not happen? */ | ||
83 | } | ||
84 | di->rodata_present = True; | ||
85 | @@ -2977,6 +2976,46 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di ) | ||
86 | return retval; | ||
87 | } | ||
88 | |||
89 | +static void find_rodata(Word i, Word shnum, DiImage* dimg, struct _DebugInfo* di, DiOffT shdr_dioff, | ||
90 | + UWord shdr_dent_szB, DiOffT shdr_strtab_dioff, PtrdiffT rw_dbias) | ||
91 | +{ | ||
92 | + ElfXX_Shdr a_shdr; | ||
93 | + ElfXX_Shdr a_extra_shdr; | ||
94 | + ML_(img_get)(&a_shdr, dimg, | ||
95 | + INDEX_BIS(shdr_dioff, i, shdr_dent_szB), | ||
96 | + sizeof(a_shdr)); | ||
97 | + if (di->rodata_present && | ||
98 | + 0 == ML_(img_strcmp_c)(dimg, shdr_strtab_dioff | ||
99 | + + a_shdr.sh_name, ".rodata")) { | ||
100 | + Word sh_size = a_shdr.sh_size; | ||
101 | + Word j; | ||
102 | + Word next_addr = a_shdr.sh_addr + a_shdr.sh_size; | ||
103 | + for (j = i + 1; j < shnum; ++j) { | ||
104 | + ML_(img_get)(&a_extra_shdr, dimg, | ||
105 | + INDEX_BIS(shdr_dioff, j, shdr_dent_szB), | ||
106 | + sizeof(a_shdr)); | ||
107 | + if (0 == ML_(img_strcmp_n)(dimg, shdr_strtab_dioff | ||
108 | + + a_extra_shdr.sh_name, ".rodata", 7)) { | ||
109 | + if (a_extra_shdr.sh_addr == | ||
110 | + VG_ROUNDUP(next_addr, a_extra_shdr.sh_addralign)) { | ||
111 | + sh_size = VG_ROUNDUP(sh_size, a_extra_shdr.sh_addralign) + a_extra_shdr.sh_size; | ||
112 | + } | ||
113 | + next_addr = a_extra_shdr.sh_addr + a_extra_shdr.sh_size; | ||
114 | + } else { | ||
115 | + break; | ||
116 | + } | ||
117 | + } | ||
118 | + vg_assert(di->rodata_size == sh_size); | ||
119 | + vg_assert(di->rodata_avma + a_shdr.sh_addr + rw_dbias); | ||
120 | + di->rodata_debug_svma = a_shdr.sh_addr; | ||
121 | + di->rodata_debug_bias = di->rodata_bias + | ||
122 | + di->rodata_svma - di->rodata_debug_svma; | ||
123 | + TRACE_SYMTAB("acquiring .rodata debug svma = %#lx .. %#lx\n", | ||
124 | + di->rodata_debug_svma, | ||
125 | + di->rodata_debug_svma + di->rodata_size - 1); | ||
126 | + TRACE_SYMTAB("acquiring .rodata debug bias = %#lx\n", (UWord)di->rodata_debug_bias); | ||
127 | + } | ||
128 | +} | ||
129 | Bool ML_(read_elf_debug) ( struct _DebugInfo* di ) | ||
130 | { | ||
131 | Word i, j; | ||
132 | @@ -3391,7 +3430,11 @@ Bool ML_(read_elf_debug) ( struct _DebugInfo* di ) | ||
133 | FIND(text, rx) | ||
134 | FIND(data, rw) | ||
135 | FIND(sdata, rw) | ||
136 | - FIND(rodata, rw) | ||
137 | + // https://bugs.kde.org/show_bug.cgi?id=476548 | ||
138 | + // special handling for rodata as adjacent | ||
139 | + // rodata sections may have been merged in ML_(read_elf_object) | ||
140 | + //FIND(rodata, rw) | ||
141 | + find_rodata(i, ehdr_dimg.e_shnum, dimg, di, shdr_dioff, shdr_dent_szB, shdr_strtab_dioff, rw_dbias); | ||
142 | FIND(bss, rw) | ||
143 | FIND(sbss, rw) | ||
144 | |||
145 | -- | ||
146 | 2.44.0 | ||
147 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch deleted file mode 100644 index 2a09ca52b7..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch +++ /dev/null | |||
@@ -1,221 +0,0 @@ | |||
1 | From a43e62dddcf51ec6578a90c5988a41e856b44b05 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Sat, 18 Nov 2023 21:17:02 +0100 | ||
4 | Subject: [PATCH 3/4] Add fchmodat2 syscall on linux | ||
5 | |||
6 | fchmodat2 is a new syscall on linux 6.6. It is a variant of fchmodat | ||
7 | that takes an extra flags argument. | ||
8 | |||
9 | https://bugs.kde.org/show_bug.cgi?id=477198 | ||
10 | |||
11 | (cherry picked from commit 372d09fd9a8d76847c81092ebff71c80fd6c145d) | ||
12 | |||
13 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=a43e62dddcf51ec6578a90c5988a41e856b44b05] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | NEWS | 1 + | ||
17 | coregrind/m_syswrap/priv_syswrap-linux.h | 3 +++ | ||
18 | coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ | ||
19 | coregrind/m_syswrap/syswrap-arm-linux.c | 2 ++ | ||
20 | coregrind/m_syswrap/syswrap-arm64-linux.c | 2 ++ | ||
21 | coregrind/m_syswrap/syswrap-linux.c | 11 +++++++++++ | ||
22 | coregrind/m_syswrap/syswrap-mips32-linux.c | 2 ++ | ||
23 | coregrind/m_syswrap/syswrap-mips64-linux.c | 1 + | ||
24 | coregrind/m_syswrap/syswrap-nanomips-linux.c | 1 + | ||
25 | coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ | ||
26 | coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ | ||
27 | coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ | ||
28 | coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ | ||
29 | include/vki/vki-scnums-shared-linux.h | 2 ++ | ||
30 | 14 files changed, 35 insertions(+) | ||
31 | |||
32 | diff --git a/NEWS b/NEWS | ||
33 | index 6cd13429a..da0f8c1aa 100644 | ||
34 | --- a/NEWS | ||
35 | +++ b/NEWS | ||
36 | @@ -8,6 +8,7 @@ The following bugs have been fixed or resolved on this branch. | ||
37 | 476548 valgrind 3.22.0 fails on assertion when loading debuginfo | ||
38 | file produced by mold | ||
39 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
40 | +477198 Add fchmodat2 syscall on linux | ||
41 | |||
42 | To see details of a given bug, visit | ||
43 | https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
44 | diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h | ||
45 | index 7c9decf5a..798c456c9 100644 | ||
46 | --- a/coregrind/m_syswrap/priv_syswrap-linux.h | ||
47 | +++ b/coregrind/m_syswrap/priv_syswrap-linux.h | ||
48 | @@ -331,6 +331,9 @@ DECL_TEMPLATE(linux, sys_openat2); | ||
49 | // Linux-specific (new in Linux 5.14) | ||
50 | DECL_TEMPLATE(linux, sys_memfd_secret); | ||
51 | |||
52 | +// Since Linux 6.6 | ||
53 | +DECL_TEMPLATE(linux, sys_fchmodat2); | ||
54 | + | ||
55 | /* --------------------------------------------------------------------- | ||
56 | Wrappers for sockets and ipc-ery. These are split into standalone | ||
57 | procedures because x86-linux hides them inside multiplexors | ||
58 | diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
59 | index 008600798..fe17d118b 100644 | ||
60 | --- a/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
61 | +++ b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
62 | @@ -886,6 +886,8 @@ static SyscallTableEntry syscall_table[] = { | ||
63 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
64 | |||
65 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
66 | + | ||
67 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
68 | }; | ||
69 | |||
70 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
71 | diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
72 | index 9a7a1e0d2..811931d3b 100644 | ||
73 | --- a/coregrind/m_syswrap/syswrap-arm-linux.c | ||
74 | +++ b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
75 | @@ -1059,6 +1059,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
76 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
77 | |||
78 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
79 | + | ||
80 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
81 | }; | ||
82 | |||
83 | |||
84 | diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
85 | index 6af7bab83..3307bc2ca 100644 | ||
86 | --- a/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
87 | +++ b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
88 | @@ -840,6 +840,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
89 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
90 | |||
91 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
92 | + | ||
93 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
94 | }; | ||
95 | |||
96 | |||
97 | diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c | ||
98 | index d571fc327..efa47f2e6 100644 | ||
99 | --- a/coregrind/m_syswrap/syswrap-linux.c | ||
100 | +++ b/coregrind/m_syswrap/syswrap-linux.c | ||
101 | @@ -6059,6 +6059,17 @@ PRE(sys_fchmodat) | ||
102 | PRE_MEM_RASCIIZ( "fchmodat(path)", ARG2 ); | ||
103 | } | ||
104 | |||
105 | +PRE(sys_fchmodat2) | ||
106 | +{ | ||
107 | + PRINT("sys_fchmodat2 ( %ld, %#" FMT_REGWORD "x(%s), %" FMT_REGWORD "u, %" | ||
108 | + FMT_REGWORD "u )", | ||
109 | + SARG1, ARG2, (HChar*)(Addr)ARG2, ARG3, ARG4); | ||
110 | + PRE_REG_READ4(long, "fchmodat2", | ||
111 | + int, dfd, const char *, path, vki_mode_t, mode, | ||
112 | + unsigned int, flags); | ||
113 | + PRE_MEM_RASCIIZ( "fchmodat2(pathname)", ARG2 ); | ||
114 | +} | ||
115 | + | ||
116 | PRE(sys_faccessat) | ||
117 | { | ||
118 | PRINT("sys_faccessat ( %ld, %#" FMT_REGWORD "x(%s), %ld )", | ||
119 | diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
120 | index 6268a00dd..74a1f6eac 100644 | ||
121 | --- a/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
122 | +++ b/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
123 | @@ -1143,6 +1143,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
124 | LINX_ (__NR_faccessat2, sys_faccessat2), // 439 | ||
125 | |||
126 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
127 | + | ||
128 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
129 | }; | ||
130 | |||
131 | SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) | ||
132 | diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
133 | index 6cdf25893..4e8508b7a 100644 | ||
134 | --- a/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
135 | +++ b/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
136 | @@ -820,6 +820,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
137 | LINXY (__NR_close_range, sys_close_range), | ||
138 | LINX_ (__NR_faccessat2, sys_faccessat2), | ||
139 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), | ||
140 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), | ||
141 | }; | ||
142 | |||
143 | SyscallTableEntry * ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
144 | diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
145 | index d724cde74..7859900c1 100644 | ||
146 | --- a/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
147 | +++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
148 | @@ -829,6 +829,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
149 | LINXY (__NR_close_range, sys_close_range), | ||
150 | LINX_ (__NR_faccessat2, sys_faccessat2), | ||
151 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), | ||
152 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), | ||
153 | }; | ||
154 | |||
155 | SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) | ||
156 | diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
157 | index c0cfef235..1e19116ee 100644 | ||
158 | --- a/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
159 | +++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
160 | @@ -1063,6 +1063,8 @@ static SyscallTableEntry syscall_table[] = { | ||
161 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
162 | |||
163 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
164 | + | ||
165 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
166 | }; | ||
167 | |||
168 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
169 | diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
170 | index f5976f30c..1097212a4 100644 | ||
171 | --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
172 | +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
173 | @@ -1032,6 +1032,8 @@ static SyscallTableEntry syscall_table[] = { | ||
174 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
175 | |||
176 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
177 | + | ||
178 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
179 | }; | ||
180 | |||
181 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
182 | diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
183 | index afba154e7..3588672c7 100644 | ||
184 | --- a/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
185 | +++ b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
186 | @@ -873,6 +873,8 @@ static SyscallTableEntry syscall_table[] = { | ||
187 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
188 | |||
189 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
190 | + | ||
191 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
192 | }; | ||
193 | |||
194 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
195 | diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
196 | index da4fd8fa2..58badc6b0 100644 | ||
197 | --- a/coregrind/m_syswrap/syswrap-x86-linux.c | ||
198 | +++ b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
199 | @@ -1658,6 +1658,8 @@ static SyscallTableEntry syscall_table[] = { | ||
200 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
201 | |||
202 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
203 | + | ||
204 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
205 | }; | ||
206 | |||
207 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
208 | diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h | ||
209 | index 542382b53..a4cd87149 100644 | ||
210 | --- a/include/vki/vki-scnums-shared-linux.h | ||
211 | +++ b/include/vki/vki-scnums-shared-linux.h | ||
212 | @@ -50,4 +50,6 @@ | ||
213 | |||
214 | #define __NR_memfd_secret 447 | ||
215 | |||
216 | +#define __NR_fchmodat2 452 | ||
217 | + | ||
218 | #endif | ||
219 | -- | ||
220 | 2.44.0 | ||
221 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch b/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch deleted file mode 100644 index 4e9185508a..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch +++ /dev/null | |||
@@ -1,137 +0,0 @@ | |||
1 | From 41ff9aa49f6c54c66d0e6b37f265fd9cb0176057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Floyd <pjfloyd@wanadoo.fr> | ||
3 | Date: Sun, 17 Dec 2023 14:18:51 +0100 | ||
4 | Subject: [PATCH 4/4] Bug 478624 - Valgrind incompatibility with binutils-2.42 | ||
5 | on x86 with new nop patterns (unhandled instruction bytes: 0x2E 0x8D 0xB4 | ||
6 | 0x26) | ||
7 | |||
8 | It was a bit of a struggle to get the testcase to build | ||
9 | with both clang and gcc (oddly enough gcc was more difficult) so | ||
10 | I just resorted to using .byte arrays. | ||
11 | |||
12 | (cherry picked from commit d35005cef8ad8207542738812705ceabf137d7e0) | ||
13 | |||
14 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=41ff9aa49f6c54c66d0e6b37f265fd9cb0176057] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | .gitignore | 1 + | ||
18 | NEWS | 2 ++ | ||
19 | VEX/priv/guest_x86_toIR.c | 22 +++++++++++++- | ||
20 | none/tests/x86/Makefile.am | 2 ++ | ||
21 | none/tests/x86/gnu_binutils_nop.c | 34 ++++++++++++++++++++++ | ||
22 | none/tests/x86/gnu_binutils_nop.stderr.exp | 0 | ||
23 | none/tests/x86/gnu_binutils_nop.vgtest | 2 ++ | ||
24 | 7 files changed, 62 insertions(+), 1 deletion(-) | ||
25 | create mode 100644 none/tests/x86/gnu_binutils_nop.c | ||
26 | create mode 100644 none/tests/x86/gnu_binutils_nop.stderr.exp | ||
27 | create mode 100644 none/tests/x86/gnu_binutils_nop.vgtest | ||
28 | |||
29 | --- a/NEWS | ||
30 | +++ b/NEWS | ||
31 | @@ -9,6 +9,8 @@ The following bugs have been fixed or re | ||
32 | file produced by mold | ||
33 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
34 | 477198 Add fchmodat2 syscall on linux | ||
35 | +478624 Valgrind incompatibility with binutils-2.42 on x86 with new nop patterns | ||
36 | + (unhandled instruction bytes: 0x2E 0x8D 0xB4 0x26) | ||
37 | |||
38 | To see details of a given bug, visit | ||
39 | https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
40 | --- a/VEX/priv/guest_x86_toIR.c | ||
41 | +++ b/VEX/priv/guest_x86_toIR.c | ||
42 | @@ -8198,7 +8198,7 @@ DisResult disInstr_X86_WRK ( | ||
43 | delta += 5; | ||
44 | goto decode_success; | ||
45 | } | ||
46 | - /* Don't barf on recent binutils padding, | ||
47 | + /* Don't barf on recent (2010) binutils padding, | ||
48 | all variants of which are: nopw %cs:0x0(%eax,%eax,1) | ||
49 | 66 2e 0f 1f 84 00 00 00 00 00 | ||
50 | 66 66 2e 0f 1f 84 00 00 00 00 00 | ||
51 | @@ -8222,6 +8222,26 @@ DisResult disInstr_X86_WRK ( | ||
52 | goto decode_success; | ||
53 | } | ||
54 | } | ||
55 | + | ||
56 | + /* bug478624 GNU binutils uses a leal of esi into itself with | ||
57 | + a zero offset and CS prefix as an 8 byte no-op (Dec 2023). | ||
58 | + Since the CS prefix is hardly ever used we don't do much | ||
59 | + to decode it, just a few cases for conditional branches. | ||
60 | + So add handling here with other pseudo-no-ops. | ||
61 | + */ | ||
62 | + if (code[0] == 0x2E && code[1] == 0x8D) { | ||
63 | + if (code[2] == 0x74 && code[3] == 0x26 && code[4] == 0x00) { | ||
64 | + DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); | ||
65 | + delta += 5; | ||
66 | + goto decode_success; | ||
67 | + } | ||
68 | + if (code[2] == 0xB4 && code[3] == 0x26 && code[4] == 0x00 | ||
69 | + && code[5] == 0x00 && code[6] == 0x00 && code[7] == 0x00) { | ||
70 | + DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); | ||
71 | + delta += 8; | ||
72 | + goto decode_success; | ||
73 | + } | ||
74 | + } | ||
75 | |||
76 | // Intel CET requires the following opcodes to be treated as NOPs | ||
77 | // with any prefix and ModRM, SIB and disp combination: | ||
78 | --- a/none/tests/x86/Makefile.am | ||
79 | +++ b/none/tests/x86/Makefile.am | ||
80 | @@ -52,6 +52,7 @@ EXTRA_DIST = \ | ||
81 | fxtract.stdout.exp fxtract.stderr.exp fxtract.vgtest \ | ||
82 | fxtract.stdout.exp-older-glibc \ | ||
83 | getseg.stdout.exp getseg.stderr.exp getseg.vgtest \ | ||
84 | + gnu_binutils_nop.stderr.exp gnu_binutils_nop.vgtest \ | ||
85 | incdec_alt.stdout.exp incdec_alt.stderr.exp incdec_alt.vgtest \ | ||
86 | int.stderr.exp int.stdout.exp int.disabled \ | ||
87 | $(addsuffix .stderr.exp,$(INSN_TESTS)) \ | ||
88 | @@ -100,6 +101,7 @@ check_PROGRAMS = \ | ||
89 | fpu_lazy_eflags \ | ||
90 | fxtract \ | ||
91 | getseg \ | ||
92 | + gnu_binutils_nop \ | ||
93 | incdec_alt \ | ||
94 | $(INSN_TESTS) \ | ||
95 | int \ | ||
96 | --- /dev/null | ||
97 | +++ b/none/tests/x86/gnu_binutils_nop.c | ||
98 | @@ -0,0 +1,34 @@ | ||
99 | +int main(void) | ||
100 | +{ | ||
101 | + // GNU binutils uses various opcodes as alternatives for nop | ||
102 | + // the idea is that it is faster to execute one large opcode | ||
103 | + // with no side-effects than multiple repetitions of the | ||
104 | + // single byte 'nop'. This gives more choice when code | ||
105 | + // needs to be padded. | ||
106 | + | ||
107 | + // the following is based on | ||
108 | + // https://sourceware.org/cgit/binutils-gdb/tree/gas/config/tc-i386.c#n1256 | ||
109 | + | ||
110 | + // one byte | ||
111 | + __asm__ __volatile__("nop"); | ||
112 | + // two bytes | ||
113 | + __asm__ __volatile__("xchg %ax,%ax"); | ||
114 | + // three bytes | ||
115 | + //__asm__ __volatile__("leal 0(%esi),%esi"); | ||
116 | + __asm__ __volatile__(".byte 0x8d,0x76,0x00"); | ||
117 | + // four bytes | ||
118 | + //__asm__ __volatile__("leal 0(%esi,%eiz),%esi"); | ||
119 | + __asm__ __volatile__(".byte 0x8d,0x74,0x26,0x00"); | ||
120 | + // five bytes | ||
121 | + //__asm__ __volatile__("leal %cs:0(%esi,%eiz),%esi"); | ||
122 | + __asm__ __volatile__(".byte 0x2e,0x8d,0x74,0x26,0x00"); | ||
123 | + // six bytes | ||
124 | + //__asm__ __volatile__("leal 0L(%esi),%esi"); | ||
125 | + __asm__ __volatile__(".byte 0x8d,0xb6,0x00,0x00,0x00,0x00"); | ||
126 | + // seven bytes | ||
127 | + //__asm__ __volatile__("leal 0L(%esi,%eiz),%esi"); | ||
128 | + __asm__ __volatile__(".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); | ||
129 | + // eight bytes | ||
130 | + //__asm__ __volatile__("leal %cs:0L(%esi,%eiz),%esi"); | ||
131 | + __asm__ __volatile__(".byte 0x2e,0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); | ||
132 | +} | ||
133 | --- /dev/null | ||
134 | +++ b/none/tests/x86/gnu_binutils_nop.vgtest | ||
135 | @@ -0,0 +1,2 @@ | ||
136 | +prog: gnu_binutils_nop | ||
137 | +vgopts: -q | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch index 51cd3532d3..65de427d36 100644 --- a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch +++ b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch | |||
@@ -17,11 +17,9 @@ Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com> | |||
17 | VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ | 17 | VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ |
18 | 3 files changed, 42 insertions(+), 0 deletions(-) | 18 | 3 files changed, 42 insertions(+), 0 deletions(-) |
19 | 19 | ||
20 | diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h | ||
21 | index dd3c62e..11a34aa 100644 | ||
22 | --- a/VEX/priv/guest_ppc_defs.h | 20 | --- a/VEX/priv/guest_ppc_defs.h |
23 | +++ b/VEX/priv/guest_ppc_defs.h | 21 | +++ b/VEX/priv/guest_ppc_defs.h |
24 | @@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt ); | 22 | @@ -233,6 +233,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268 |
25 | 23 | ||
26 | extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); | 24 | extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); |
27 | 25 | ||
@@ -30,11 +28,9 @@ index dd3c62e..11a34aa 100644 | |||
30 | extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, | 28 | extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, |
31 | UInt vD_idx, UInt sh, | 29 | UInt vD_idx, UInt sh, |
32 | UInt shift_right ); | 30 | UInt shift_right ); |
33 | diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c | ||
34 | index 11aa428..b49ea3f 100644 | ||
35 | --- a/VEX/priv/guest_ppc_helpers.c | 31 | --- a/VEX/priv/guest_ppc_helpers.c |
36 | +++ b/VEX/priv/guest_ppc_helpers.c | 32 | +++ b/VEX/priv/guest_ppc_helpers.c |
37 | @@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void ) | 33 | @@ -118,6 +118,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void |
38 | # endif | 34 | # endif |
39 | } | 35 | } |
40 | 36 | ||
@@ -59,11 +55,9 @@ index 11aa428..b49ea3f 100644 | |||
59 | 55 | ||
60 | /* CALLED FROM GENERATED CODE */ | 56 | /* CALLED FROM GENERATED CODE */ |
61 | /* DIRTY HELPER (reads guest state, writes guest mem) */ | 57 | /* DIRTY HELPER (reads guest state, writes guest mem) */ |
62 | diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c | ||
63 | index f8d220d..37c8974 100644 | ||
64 | --- a/VEX/priv/guest_ppc_toIR.c | 58 | --- a/VEX/priv/guest_ppc_toIR.c |
65 | +++ b/VEX/priv/guest_ppc_toIR.c | 59 | +++ b/VEX/priv/guest_ppc_toIR.c |
66 | @@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr ) | 60 | @@ -11875,6 +11875,28 @@ static Bool dis_proc_ctl ( const VexAbiI |
67 | break; | 61 | break; |
68 | } | 62 | } |
69 | 63 | ||
@@ -92,5 +86,3 @@ index f8d220d..37c8974 100644 | |||
92 | default: | 86 | default: |
93 | vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); | 87 | vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); |
94 | return False; | 88 | return False; |
95 | -- | ||
96 | 1.7.0.4 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch index bde1241dc7..3ab339d215 100644 --- a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch +++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch | |||
@@ -17,19 +17,14 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
17 | VEX/priv/guest_s390_defs.h | 2 +- | 17 | VEX/priv/guest_s390_defs.h | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h | ||
21 | index 9054290..dab8002 100644 | ||
22 | --- a/VEX/priv/guest_s390_defs.h | 20 | --- a/VEX/priv/guest_s390_defs.h |
23 | +++ b/VEX/priv/guest_s390_defs.h | 21 | +++ b/VEX/priv/guest_s390_defs.h |
24 | @@ -284,7 +284,7 @@ typedef enum { | 22 | @@ -284,7 +284,7 @@ typedef enum { |
25 | S390_VEC_OP_VBPERM, | 23 | S390_VEC_OP_VCLFNL, |
26 | S390_VEC_OP_VMSL, | 24 | S390_VEC_OP_VCRNF, |
27 | S390_VEC_OP_LAST // supposed to be the last element in enum | 25 | S390_VEC_OP_LAST // supposed to be the last element in enum |
28 | -} s390x_vec_op_t; | 26 | -} s390x_vec_op_t; |
29 | +}; | 27 | +}; |
30 | 28 | ||
31 | /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one | 29 | /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one |
32 | ULong variable. | 30 | ULong variable. |
33 | -- | ||
34 | 2.29.2 | ||
35 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch index f15d04b173..afca874d02 100644 --- a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch +++ b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch | |||
@@ -22,11 +22,9 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
22 | none/tests/arm/Makefile.am | 6 ++++-- | 22 | none/tests/arm/Makefile.am | 6 ++++-- |
23 | 1 file changed, 4 insertions(+), 2 deletions(-) | 23 | 1 file changed, 4 insertions(+), 2 deletions(-) |
24 | 24 | ||
25 | diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am | ||
26 | index 4507a20..825290f 100644 | ||
27 | --- a/none/tests/arm/Makefile.am | 25 | --- a/none/tests/arm/Makefile.am |
28 | +++ b/none/tests/arm/Makefile.am | 26 | +++ b/none/tests/arm/Makefile.am |
29 | @@ -62,8 +62,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ | 27 | @@ -87,8 +87,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 |
30 | -mfpu=neon \ | 28 | -mfpu=neon \ |
31 | -mthumb | 29 | -mthumb |
32 | 30 | ||
@@ -39,6 +37,3 @@ index 4507a20..825290f 100644 | |||
39 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 | 37 | +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 |
40 | + | 38 | + |
41 | +vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm | 39 | +vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm |
42 | -- | ||
43 | 1.9.1 | ||
44 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch index d04297dca8..0895473fc0 100644 --- a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch +++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch | |||
@@ -16,11 +16,9 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
16 | coregrind/m_redir.c | 13 ++++++++++++- | 16 | coregrind/m_redir.c | 13 ++++++++++++- |
17 | 1 file changed, 12 insertions(+), 1 deletion(-) | 17 | 1 file changed, 12 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c | ||
20 | index ff35009..d7d6816 100644 | ||
21 | --- a/coregrind/m_redir.c | 19 | --- a/coregrind/m_redir.c |
22 | +++ b/coregrind/m_redir.c | 20 | +++ b/coregrind/m_redir.c |
23 | @@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt, | 21 | @@ -1307,7 +1307,18 @@ static void add_hardwired_spec (const H |
24 | spec->to_addr = to_addr; | 22 | spec->to_addr = to_addr; |
25 | spec->isWrap = False; | 23 | spec->isWrap = False; |
26 | spec->isGlobal = False; | 24 | spec->isGlobal = False; |
@@ -40,6 +38,3 @@ index ff35009..d7d6816 100644 | |||
40 | /* VARIABLE PARTS */ | 38 | /* VARIABLE PARTS */ |
41 | spec->mark = False; /* not significant */ | 39 | spec->mark = False; /* not significant */ |
42 | spec->done = False; /* not significant */ | 40 | spec->done = False; /* not significant */ |
43 | -- | ||
44 | 1.9.1 | ||
45 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb index 563d99f0e2..ad9e26cb6b 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
22 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ | 22 | file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ |
23 | file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ | 23 | file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ |
24 | file://avoid-neon-for-targets-which-don-t-support-it.patch \ | 24 | file://avoid-neon-for-targets-which-don-t-support-it.patch \ |
25 | file://0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch \ | ||
25 | file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ | 26 | file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ |
26 | file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ | 27 | file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ |
27 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ | 28 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ |
@@ -33,12 +34,9 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
33 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ | 34 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ |
34 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ | 35 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ |
35 | file://0001-docs-Disable-manual-validation.patch \ | 36 | file://0001-docs-Disable-manual-validation.patch \ |
36 | file://0001-valgrind-monitor.py-regular-expressions-should-use-r.patch \ | 37 | file://0001-tests-arm-Use-O-instead-of-O0.patch \ |
37 | file://0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch \ | ||
38 | file://0003-Add-fchmodat2-syscall-on-linux.patch \ | ||
39 | file://0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch \ | ||
40 | " | 38 | " |
41 | SRC_URI[sha256sum] = "c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c" | 39 | SRC_URI[sha256sum] = "c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d" |
42 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" | 40 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" |
43 | 41 | ||
44 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' | 42 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' |
@@ -196,9 +194,9 @@ do_install_ptest() { | |||
196 | 194 | ||
197 | # The scripts reference config.h so add it to the top ptest dir. | 195 | # The scripts reference config.h so add it to the top ptest dir. |
198 | cp ${B}/config.h ${D}${PTEST_PATH} | 196 | cp ${B}/config.h ${D}${PTEST_PATH} |
199 | install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} | 197 | install -D ${UNPACKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} |
200 | install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} | 198 | install -D ${UNPACKDIR}/remove-for-all ${D}${PTEST_PATH} |
201 | install -D ${WORKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH} | 199 | install -D ${UNPACKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH} |
202 | 200 | ||
203 | # Add an executable need by none/tests/bigcode | 201 | # Add an executable need by none/tests/bigcode |
204 | mkdir ${D}${PTEST_PATH}/perf | 202 | mkdir ${D}${PTEST_PATH}/perf |