Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/riscv:master commit in: sys-devel/gcc/files/, sys-devel/gcc/files/awk/, sys-devel/gcc/
Date: Fri, 03 May 2019 21:55:17
Message-Id: 1556920425.c62d5eaeeb1fe3feeab8625dfbe37a4f524e48fc.dilfridge@gentoo
1 commit: c62d5eaeeb1fe3feeab8625dfbe37a4f524e48fc
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 3 21:53:45 2019 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri May 3 21:53:45 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=c62d5eae
7
8 sys-devel/gcc: moved to main tree
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 sys-devel/gcc/Manifest | 2 -
13 sys-devel/gcc/files/awk/fixlafiles.awk | 313 ---------------------
14 sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la | 334 -----------------------
15 sys-devel/gcc/files/c89 | 20 --
16 sys-devel/gcc/files/c99 | 21 --
17 sys-devel/gcc/files/fix_libtool_files.sh | 66 -----
18 sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch | 66 -----
19 sys-devel/gcc/files/gcc-8.3.0-norisc32.patch | 27 --
20 sys-devel/gcc/files/gcc-configure-LANG.patch | 64 -----
21 sys-devel/gcc/files/gcc-configure-texinfo.patch | 16 --
22 sys-devel/gcc/files/gcc-spec-env-r1.patch | 87 ------
23 sys-devel/gcc/files/gcc-spec-env.patch | 42 ---
24 sys-devel/gcc/gcc-8.3.0-r1.ebuild | 24 --
25 sys-devel/gcc/metadata.xml | 33 ---
26 14 files changed, 1115 deletions(-)
27
28 diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
29 deleted file mode 100644
30 index 179a22a..0000000
31 --- a/sys-devel/gcc/Manifest
32 +++ /dev/null
33 @@ -1,2 +0,0 @@
34 -DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
35 -DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
36
37 diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk b/sys-devel/gcc/files/awk/fixlafiles.awk
38 deleted file mode 100644
39 index ee71d15..0000000
40 --- a/sys-devel/gcc/files/awk/fixlafiles.awk
41 +++ /dev/null
42 @@ -1,313 +0,0 @@
43 -# Copyright 1999-2019 Gentoo Authors
44 -# Distributed under the terms of the GNU General Public License v2
45 -
46 -#
47 -# Helper functions
48 -#
49 -function printn(string) {
50 - printf("%s", string)
51 -}
52 -function einfo(string) {
53 - printf(" \033[32;01m*\033[0m %s\n", string)
54 -}
55 -function einfon(string) {
56 - printf(" \033[32;01m*\033[0m %s", string)
57 -}
58 -function ewarn(string) {
59 - printf(" \033[33;01m*\033[0m %s\n", string)
60 -}
61 -function ewarnn(string) {
62 - printf(" \033[33;01m*\033[0m %s", string)
63 -}
64 -function eerror(string) {
65 - printf(" \033[31;01m*\033[0m %s\n", string)
66 -}
67 -
68 -#
69 -# assert(condition, errmsg)
70 -# assert that a condition is true. Otherwise exit.
71 -#
72 -function assert(condition, string) {
73 - if (! condition) {
74 - printf("%s:%d: assertion failed: %s\n",
75 - FILENAME, FNR, string) > "/dev/stderr"
76 - _assert_exit = 1
77 - exit 1
78 - }
79 -}
80 -
81 -#
82 -# system(command, return)
83 -# wrapper that normalizes return codes ...
84 -#
85 -function dosystem(command, ret) {
86 - ret = 0
87 - ret = system(command)
88 - if (ret == 0)
89 - return 1
90 - else
91 - return 0
92 -}
93 -
94 -BEGIN {
95 - #
96 - # Get our variables from environment
97 - #
98 - OLDVER = ENVIRON["OLDVER"]
99 - OLDCHOST = ENVIRON["OLDCHOST"]
100 -
101 - if (OLDVER == "") {
102 - eerror("Could not get OLDVER!");
103 - exit 1
104 - }
105 -
106 - # Setup some sane defaults
107 - LIBCOUNT = 2
108 - HAVE_GCC34 = 0
109 - DIRLIST[1] = "/lib"
110 - DIRLIST[2] = "/usr/lib"
111 -
112 - #
113 - # Walk /etc/ld.so.conf to discover all our library paths
114 - #
115 - pipe = "cat /etc/ld.so.conf | sort 2>/dev/null"
116 - while(((pipe) | getline ldsoconf_data) > 0) {
117 - if (ldsoconf_data !~ /^[[:space:]]*#/) {
118 - if (ldsoconf_data == "") continue
119 -
120 - # Remove any trailing comments
121 - sub(/#.*$/, "", ldsoconf_data)
122 - # Remove any trailing spaces
123 - sub(/[[:space:]]+$/, "", ldsoconf_data)
124 -
125 - # If there's more than one path per line, split
126 - # it up as if they were sep lines
127 - split(ldsoconf_data, nodes, /[:,[:space:]]/)
128 -
129 - # Now add the rest from ld.so.conf
130 - for (x in nodes) {
131 - # wtf does this line do ?
132 - sub(/=.*/, "", nodes[x])
133 - # Prune trailing /
134 - sub(/\/$/, "", nodes[x])
135 -
136 - if (nodes[x] == "") continue
137 -
138 - #
139 - # Drop the directory if its a child directory of
140 - # one that was already added ...
141 - # For example, if we have:
142 - # /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
143 - # We really just want to save /usr/lib /usr/libexec
144 - #
145 - CHILD = 0
146 - for (y in DIRLIST) {
147 - if (nodes[x] ~ "^" DIRLIST[y] "(/|$)") {
148 - CHILD = 1
149 - break
150 - }
151 - }
152 - if (CHILD) continue
153 -
154 - DIRLIST[++LIBCOUNT] = nodes[x]
155 - }
156 - }
157 - }
158 - close(pipe)
159 -
160 - #
161 - # Get line from gcc's output containing CHOST
162 - #
163 - pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
164 - if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
165 - close(pipe)
166 -
167 - # If we fail to get the CHOST, see if we can get the CHOST
168 - # portage thinks we are using ...
169 - pipe = "/usr/bin/portageq envvar 'CHOST'"
170 - assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
171 - } else {
172 - # Check pre gcc-3.4.x versions
173 - CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
174 -
175 - if (CHOST == TMP_CHOST || CHOST == "") {
176 - # Check gcc-3.4.x or later
177 - CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
178 -
179 - if (CHOST == TMP_CHOST || CHOST == "")
180 - CHOST = ""
181 - else
182 - HAVE_GCC34 = 1
183 - }
184 - }
185 - close(pipe)
186 -
187 - if (CHOST == "") {
188 - eerror("Could not get gcc's CHOST!")
189 - exit 1
190 - }
191 -
192 - if (OLDCHOST != "")
193 - if (OLDCHOST == CHOST)
194 - OLDCHOST = ""
195 -
196 - GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/"
197 - GCCLIBPREFIX_NEW = "/usr/lib/gcc/"
198 -
199 - if (HAVE_GCC34)
200 - GCCLIBPREFIX = GCCLIBPREFIX_NEW
201 - else
202 - GCCLIBPREFIX = GCCLIBPREFIX_OLD
203 -
204 - GCCLIB = GCCLIBPREFIX CHOST
205 -
206 - if (OLDCHOST != "") {
207 - OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
208 - OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
209 - }
210 -
211 - # Get current gcc's version
212 - pipe = "gcc -dumpversion"
213 - assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
214 - close(pipe)
215 -
216 - if (NEWVER == "") {
217 - eerror("Could not get gcc's version!")
218 - exit 1
219 - }
220 -
221 - # Nothing to do ?
222 - if ((OLDVER == NEWVER) && (OLDCHOST == ""))
223 - exit 0
224 -
225 - #
226 - # Ok, now let's scan for the .la files and actually fix them up
227 - #
228 - for (x = 1; x <= LIBCOUNT; x++) {
229 - # Do nothing if the target dir is gcc's internal library path
230 - if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
231 - DIRLIST[x] ~ GCCLIBPREFIX_NEW)
232 - continue
233 -
234 - einfo(" [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
235 -
236 - pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
237 - while (((pipe) | getline la_files) > 0) {
238 -
239 - # Do nothing if the .la file is located in gcc's internal lib path
240 - if (la_files ~ GCCLIBPREFIX_OLD ||
241 - la_files ~ GCCLIBPREFIX_NEW)
242 - continue
243 -
244 - CHANGED = 0
245 - CHOST_CHANGED = 0
246 -
247 - # See if we need to fix the .la file
248 - while ((getline la_data < (la_files)) > 0) {
249 - if (OLDCHOST != "") {
250 - if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
251 - GCCLIB, la_data) > 0) ||
252 - (gsub(OLDGCCLIB2 "[/[:space:]]+",
253 - GCCLIB, la_data) > 0)) {
254 - CHANGED = 1
255 - CHOST_CHANGED = 1
256 - }
257 - }
258 - if (OLDVER != NEWVER) {
259 - if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
260 - GCCLIB "/" NEWVER, la_data) > 0) ||
261 - (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
262 - GCCLIB "/" NEWVER, la_data) > 0))
263 - CHANGED = 1
264 - }
265 - }
266 - close(la_files)
267 -
268 - # Do the actual changes in a second loop, as we can then
269 - # verify that CHOST_CHANGED among things is correct ...
270 - if (CHANGED) {
271 - ewarnn(" FIXING: " la_files " ...")
272 -
273 - if (CHANGED)
274 - printn("[")
275 -
276 - # Clear the temp file (removing rather than '>foo' is better
277 - # out of a security point of view?)
278 - dosystem("rm -f " la_files ".new")
279 -
280 - while ((getline la_data < (la_files)) > 0) {
281 - if (OLDCHOST != "") {
282 - tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
283 - GCCLIB "\\1", "g", la_data)
284 - tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
285 - GCCLIB "\\1", "g", tmpstr)
286 -
287 - if (la_data != tmpstr) {
288 - printn("c")
289 - la_data = tmpstr
290 - }
291 -
292 - if (CHOST_CHANGED > 0) {
293 - # We try to be careful about CHOST changes outside
294 - # the gcc library path (meaning we cannot match it
295 - # via /GCCLIBPREFIX CHOST/) ...
296 -
297 - # Catch:
298 - #
299 - # dependency_libs=' -L/usr/CHOST/{bin,lib}'
300 - #
301 - gsub("-L/usr/" OLDCHOST "/",
302 - "-L/usr/" CHOST "/", la_data)
303 - # Catch:
304 - #
305 - # dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
306 - #
307 - la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
308 - "\\1/" CHOST "/", "g", la_data)
309 - }
310 - }
311 -
312 - if (OLDVER != NEWVER) {
313 - # Catch:
314 - #
315 - # dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
316 - #
317 - tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
318 - GCCLIB "/" NEWVER "\\1", "g", la_data)
319 - tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
320 - GCCLIB "/" NEWVER "\\1", "g", tmpstr)
321 -
322 - if (la_data != tmpstr) {
323 - # Catch:
324 - #
325 - # dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
326 - #
327 - # in cases where we have gcc34
328 - tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
329 - GCCLIBPREFIX "\\1", "g", tmpstr)
330 - tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
331 - GCCLIBPREFIX "\\1", "g", tmpstr)
332 - printn("v")
333 - la_data = tmpstr
334 - }
335 - }
336 -
337 - print la_data >> (la_files ".new")
338 - }
339 -
340 - if (CHANGED)
341 - print "]"
342 -
343 - close(la_files)
344 - close(la_files ".new")
345 -
346 - assert(dosystem("mv -f " la_files ".new " la_files),
347 - "dosystem(\"mv -f " la_files ".new " la_files "\")")
348 - }
349 - }
350 -
351 - close(pipe)
352 - }
353 -}
354 -
355 -# vim:ts=4
356
357 diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la b/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
358 deleted file mode 100644
359 index 4265a54..0000000
360 --- a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
361 +++ /dev/null
362 @@ -1,334 +0,0 @@
363 -# Copyright 1999-2019 Gentoo Authors
364 -# Distributed under the terms of the GNU General Public License v2
365 -
366 -#
367 -# Helper functions
368 -#
369 -function printn(string) {
370 - printf("%s", string)
371 -}
372 -function einfo(string) {
373 - printf(" \033[32;01m*\033[0m %s\n", string)
374 -}
375 -function einfon(string) {
376 - printf(" \033[32;01m*\033[0m %s", string)
377 -}
378 -function ewarn(string) {
379 - printf(" \033[33;01m*\033[0m %s\n", string)
380 -}
381 -function ewarnn(string) {
382 - printf(" \033[33;01m*\033[0m %s", string)
383 -}
384 -function eerror(string) {
385 - printf(" \033[31;01m*\033[0m %s\n", string)
386 -}
387 -
388 -#
389 -# assert(condition, errmsg)
390 -# assert that a condition is true. Otherwise exit.
391 -#
392 -function assert(condition, string) {
393 - if (! condition) {
394 - printf("%s:%d: assertion failed: %s\n",
395 - FILENAME, FNR, string) > "/dev/stderr"
396 - _assert_exit = 1
397 - exit 1
398 - }
399 -}
400 -
401 -#
402 -# system(command, return)
403 -# wrapper that normalizes return codes ...
404 -#
405 -function dosystem(command, ret) {
406 - ret = 0
407 - ret = system(command)
408 - if (ret == 0)
409 - return 1
410 - else
411 - return 0
412 -}
413 -
414 -#
415 -# parse_ld_conf(config_file)
416 -#
417 -function parse_ld_conf(conf, pipe, ldsoconf_data, CHILD, y) {
418 - pipe = "cd /etc; cat " conf " | sort 2>/dev/null"
419 - while(((pipe) | getline ldsoconf_data) > 0) {
420 - if (ldsoconf_data ~ /^[[:space:]]*#/)
421 - continue
422 - if (ldsoconf_data == "")
423 - continue
424 -
425 - # Handle the "include" keyword
426 - if (ldsoconf_data ~ /^include /) {
427 - sub(/^include /, "", ldsoconf_data)
428 - parse_ld_conf(ldsoconf_data)
429 - continue
430 - }
431 -
432 - # Remove any trailing comments
433 - sub(/#.*$/, "", ldsoconf_data)
434 - # Remove any trailing spaces
435 - sub(/[[:space:]]+$/, "", ldsoconf_data)
436 - # Eat duplicate slashes
437 - sub(/\/\//, "/", ldsoconf_data)
438 - # Prune trailing /
439 - sub(/\/$/, "", ldsoconf_data)
440 -
441 - #
442 - # Drop the directory if its a child directory of
443 - # one that was already added ...
444 - # For example, if we have:
445 - # /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
446 - # We really just want to save /usr/lib /usr/libexec
447 - #
448 - CHILD = 0
449 - for (y in DIRLIST) {
450 - if (ldsoconf_data ~ "^" DIRLIST[y] "(/|$)") {
451 - CHILD = 1
452 - break
453 - }
454 - }
455 - if (CHILD) continue
456 -
457 - DIRLIST[++LIBCOUNT] = ldsoconf_data
458 - }
459 - close(pipe)
460 -}
461 -
462 -BEGIN {
463 - #
464 - # Get our variables from environment
465 - #
466 - OLDVER = ENVIRON["OLDVER"]
467 - OLDCHOST = ENVIRON["OLDCHOST"]
468 -
469 - if (OLDVER == "") {
470 - eerror("Could not get OLDVER!");
471 - exit 1
472 - }
473 -
474 - # Setup some sane defaults
475 - LIBCOUNT = 2
476 - HAVE_GCC34 = 0
477 - DIRLIST[1] = "/lib"
478 - DIRLIST[2] = "/usr/lib"
479 -
480 - #
481 - # Walk /etc/ld.so.conf to discover all our library paths
482 - #
483 - parse_ld_conf("/etc/ld.so.conf")
484 -
485 - #
486 - # Get line from gcc's output containing CHOST
487 - #
488 - pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
489 - if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
490 - close(pipe)
491 -
492 - # If we fail to get the CHOST, see if we can get the CHOST
493 - # portage thinks we are using ...
494 - pipe = "/usr/bin/portageq envvar 'CHOST'"
495 - assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
496 - } else {
497 - # Check pre gcc-3.4.x versions
498 - CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
499 -
500 - if (CHOST == TMP_CHOST || CHOST == "") {
501 - # Check gcc-3.4.x or later
502 - CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
503 -
504 - if (CHOST == TMP_CHOST || CHOST == "")
505 - CHOST = ""
506 - else
507 - HAVE_GCC34 = 1
508 - }
509 - }
510 - close(pipe)
511 -
512 - if (CHOST == "") {
513 - eerror("Could not get gcc's CHOST!")
514 - exit 1
515 - }
516 -
517 - if (OLDCHOST != "")
518 - if (OLDCHOST == CHOST)
519 - OLDCHOST = ""
520 -
521 - GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/"
522 - GCCLIBPREFIX_NEW = "/usr/lib/gcc/"
523 -
524 - if (HAVE_GCC34)
525 - GCCLIBPREFIX = GCCLIBPREFIX_NEW
526 - else
527 - GCCLIBPREFIX = GCCLIBPREFIX_OLD
528 -
529 - GCCLIB = GCCLIBPREFIX CHOST
530 -
531 - if (OLDCHOST != "") {
532 - OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
533 - OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
534 - }
535 -
536 - # Get current gcc's version
537 - pipe = "gcc -dumpversion"
538 - assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
539 - close(pipe)
540 -
541 - if (NEWVER == "") {
542 - eerror("Could not get gcc's version!")
543 - exit 1
544 - }
545 -
546 - # Nothing to do ?
547 - # NB: Do not check for (OLDVER == NEWVER) anymore, as we might need to
548 - # replace libstdc++.la ....
549 - if ((OLDVER == "") && (OLDCHOST == ""))
550 - exit 0
551 -
552 - #
553 - # Ok, now let's scan for the .la files and actually fix them up
554 - #
555 - for (x = 1; x <= LIBCOUNT; x++) {
556 - # Do nothing if the target dir is gcc's internal library path
557 - if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
558 - DIRLIST[x] ~ GCCLIBPREFIX_NEW)
559 - continue
560 -
561 - einfo(" [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
562 -
563 - pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
564 - while (((pipe) | getline la_files) > 0) {
565 -
566 - # Do nothing if the .la file is located in gcc's internal lib path
567 - if (la_files ~ GCCLIBPREFIX_OLD ||
568 - la_files ~ GCCLIBPREFIX_NEW)
569 - continue
570 -
571 - CHANGED = 0
572 - CHOST_CHANGED = 0
573 -
574 - # See if we need to fix the .la file
575 - while ((getline la_data < (la_files)) > 0) {
576 - if (OLDCHOST != "") {
577 - if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
578 - GCCLIB, la_data) > 0) ||
579 - (gsub(OLDGCCLIB2 "[/[:space:]]+",
580 - GCCLIB, la_data) > 0)) {
581 - CHANGED = 1
582 - CHOST_CHANGED = 1
583 - }
584 - }
585 - if (OLDVER != NEWVER) {
586 - if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
587 - GCCLIB "/" NEWVER, la_data) > 0) ||
588 - (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
589 - GCCLIB "/" NEWVER, la_data) > 0))
590 - CHANGED = 1
591 - }
592 - # We now check if we have libstdc++.la, as we remove the
593 - # libtool linker scripts for gcc ...
594 - # We do this last, as we only match the new paths
595 - if (gsub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la",
596 - "-lstdc++", la_data) > 0)
597 - CHANGED = 1
598 - }
599 - close(la_files)
600 -
601 - # Do the actual changes in a second loop, as we can then
602 - # verify that CHOST_CHANGED among things is correct ...
603 - if (CHANGED) {
604 - ewarnn(" FIXING: " la_files " ...[")
605 -
606 - # Clear the temp file (removing rather than '>foo' is better
607 - # out of a security point of view?)
608 - dosystem("rm -f " la_files ".new")
609 -
610 - while ((getline la_data < (la_files)) > 0) {
611 - if (OLDCHOST != "") {
612 - tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
613 - GCCLIB "\\1", "g", la_data)
614 - tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
615 - GCCLIB "\\1", "g", tmpstr)
616 -
617 - if (la_data != tmpstr) {
618 - printn("c")
619 - la_data = tmpstr
620 - }
621 -
622 - if (CHOST_CHANGED > 0) {
623 - # We try to be careful about CHOST changes outside
624 - # the gcc library path (meaning we cannot match it
625 - # via /GCCLIBPREFIX CHOST/) ...
626 -
627 - # Catch:
628 - #
629 - # dependency_libs=' -L/usr/CHOST/{bin,lib}'
630 - #
631 - gsub("-L/usr/" OLDCHOST "/",
632 - "-L/usr/" CHOST "/", la_data)
633 - # Catch:
634 - #
635 - # dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
636 - #
637 - la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
638 - "\\1/" CHOST "/", "g", la_data)
639 - }
640 - }
641 -
642 - if (OLDVER != NEWVER) {
643 - # Catch:
644 - #
645 - # dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
646 - #
647 - tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
648 - GCCLIB "/" NEWVER "\\1", "g", la_data)
649 - tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
650 - GCCLIB "/" NEWVER "\\1", "g", tmpstr)
651 -
652 - if (la_data != tmpstr) {
653 - # Catch:
654 - #
655 - # dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
656 - #
657 - # in cases where we have gcc34
658 - tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
659 - GCCLIBPREFIX "\\1", "g", tmpstr)
660 - tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
661 - GCCLIBPREFIX "\\1", "g", tmpstr)
662 - printn("v")
663 - la_data = tmpstr
664 - }
665 - }
666 -
667 - # We now check if we have libstdc++.la, as we remove the
668 - # libtool linker scripts for gcc and any referencese in any
669 - # libtool linker scripts.
670 - # We do this last, as we only match the new paths
671 - tmpstr = gensub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la",
672 - "-lstdc++", "g", la_data);
673 - if (la_data != tmpstr) {
674 - printn("l")
675 - la_data = tmpstr
676 - }
677 -
678 - print la_data >> (la_files ".new")
679 - }
680 -
681 - if (CHANGED)
682 - print "]"
683 -
684 - close(la_files)
685 - close(la_files ".new")
686 -
687 - assert(dosystem("mv -f " la_files ".new " la_files),
688 - "dosystem(\"mv -f " la_files ".new " la_files "\")")
689 - }
690 - }
691 -
692 - close(pipe)
693 - }
694 -}
695 -
696 -# vim:ts=4
697
698 diff --git a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89
699 deleted file mode 100644
700 index cee0325..0000000
701 --- a/sys-devel/gcc/files/c89
702 +++ /dev/null
703 @@ -1,20 +0,0 @@
704 -#! /bin/sh
705 -
706 -# Call the appropriate C compiler with options to accept ANSI/ISO C
707 -# The following options are the same (as of gcc-2.95):
708 -# -ansi
709 -# -std=c89
710 -# -std=iso9899:1990
711 -
712 -for i; do
713 - case "$i" in
714 - -ansi|-std=c89|-std=iso9899:1990)
715 - ;;
716 - -std=*)
717 - echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
718 - exit 1
719 - ;;
720 - esac
721 -done
722 -
723 -exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"
724
725 diff --git a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99
726 deleted file mode 100644
727 index c954209..0000000
728 --- a/sys-devel/gcc/files/c99
729 +++ /dev/null
730 @@ -1,21 +0,0 @@
731 -#! /bin/sh
732 -
733 -# Call the appropriate C compiler with options to accept ANSI/ISO C
734 -# The following options are the same (as of gcc-3.3):
735 -# -std=c99
736 -# -std=c9x
737 -# -std=iso9899:1999
738 -# -std=iso9899:199x
739 -
740 -for i; do
741 - case "$i" in
742 - -std=c9[9x]|-std=iso9899:199[9x])
743 - ;;
744 - -ansi|-std=*)
745 - echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
746 - exit 1
747 - ;;
748 - esac
749 -done
750 -
751 -exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}
752
753 diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
754 deleted file mode 100644
755 index c6c84e9..0000000
756 --- a/sys-devel/gcc/files/fix_libtool_files.sh
757 +++ /dev/null
758 @@ -1,66 +0,0 @@
759 -#!/bin/sh
760 -# Copyright 1999-2019 Gentoo Authors
761 -# Distributed under the terms of the GNU General Public License v2
762 -
763 -usage() {
764 -cat << "USAGE_END"
765 -Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
766 -
767 - Where <old-gcc-version> is the version number of the
768 - previous gcc version. For example, if you updated to
769 - gcc-3.2.1, and you had gcc-3.2 installed, run:
770 -
771 - # fix_libtool_files.sh 3.2
772 -
773 - If you updated to gcc-3.2.3, and the old CHOST was i586-pc-linux-gnu
774 - but you now have CHOST as i686-pc-linux-gnu, run:
775 -
776 - # fix_libtool_files.sh 3.2 --oldarch i586-pc-linux-gnu
777 -
778 - Note that if only the CHOST and not the version changed, you can run
779 - it with the current version and the '--oldarch <old-CHOST>' arguments,
780 - and it will do the expected:
781 -
782 - # fix_libtool_files.sh `gcc -dumpversion` --oldarch i586-pc-linux-gnu
783 -
784 -USAGE_END
785 - exit 1
786 -}
787 -
788 -case $2 in
789 ---oldarch) [ $# -ne 3 ] && usage ;;
790 -*) [ $# -ne 1 ] && usage ;;
791 -esac
792 -
793 -ARGV1=$1
794 -ARGV2=$2
795 -ARGV3=$3
796 -
797 -. /etc/profile || exit 1
798 -
799 -if [ ${EUID:-0} -ne 0 -a "${EPREFIX}" = '' ] ; then
800 - echo "${0##*/}: Must be root."
801 - exit 1
802 -fi
803 -
804 -# make sure the files come out sane
805 -umask 0022
806 -
807 -OLDCHOST=
808 -[ "${ARGV2}" = "--oldarch" ] && OLDCHOST=${ARGV3}
809 -
810 -AWKDIR="/usr/share/gcc-data"
811 -
812 -if [ ! -r "${AWKDIR}/fixlafiles.awk" ] ; then
813 - echo "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
814 - exit 1
815 -fi
816 -
817 -OLDVER=${ARGV1}
818 -
819 -export OLDVER OLDCHOST
820 -
821 -echo "Scanning libtool files for hardcoded gcc library paths..."
822 -exec gawk -f "${AWKDIR}/fixlafiles.awk"
823 -
824 -# vim:ts=4
825
826 diff --git a/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
827 deleted file mode 100644
828 index aed1ad0..0000000
829 --- a/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
830 +++ /dev/null
831 @@ -1,66 +0,0 @@
832 -From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001
833 -From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
834 -Date: Sat, 13 Dec 2014 11:24:37 +0000
835 -Subject: [PATCH] PR bootstrap/64023 * Makefile.tpl
836 - (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS to POSTSTAGE1_LDFLAGS and
837 - STAGE1_LIBS to POSTSTAGE1_LIBS. Add -B to libstdc++-v3/src/.libs and
838 - libstdc++-v3/libsupc++/.libs to CXX. * Makefile.in: Regenerated.
839 -
840 -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 138bc75d-0d04-0410-961f-82ee72b054a4
841 ----
842 - ChangeLog | 9 +++++++++
843 - Makefile.in | 6 +++++-
844 - Makefile.tpl | 6 +++++-
845 - 3 files changed, 19 insertions(+), 2 deletions(-)
846 -
847 -diff --git a/Makefile.in b/Makefile.in
848 -index ba5ae4c2ecb..8ffc313f157 100644
849 ---- a/Makefile.in
850 -+++ b/Makefile.in
851 -@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
852 - 'AS=$(COMPILER_AS_FOR_TARGET)' \
853 - 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
854 - 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
855 -- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
856 -+ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
857 -+ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
858 -+ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
859 - 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
860 - 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
861 - 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
862 -@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
863 - 'WINDRES=$$(WINDRES_FOR_TARGET)' \
864 - 'WINDMC=$$(WINDMC_FOR_TARGET)' \
865 - 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
866 -+ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
867 -+ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
868 - "TFLAGS=$$TFLAGS"
869 -
870 - TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
871 -diff --git a/Makefile.tpl b/Makefile.tpl
872 -index dcbc6b1b143..bb8227eaafa 100644
873 ---- a/Makefile.tpl
874 -+++ b/Makefile.tpl
875 -@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
876 - 'AS=$(COMPILER_AS_FOR_TARGET)' \
877 - 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
878 - 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
879 -- 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
880 -+ 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
881 -+ -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
882 -+ $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
883 - 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
884 - 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
885 - 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
886 -@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
887 - 'WINDRES=$$(WINDRES_FOR_TARGET)' \
888 - 'WINDMC=$$(WINDMC_FOR_TARGET)' \
889 - 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
890 -+ 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
891 -+ 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
892 - "TFLAGS=$$TFLAGS"
893 -
894 - TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
895 ---
896 -2.15.0
897 -
898
899 diff --git a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch b/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch
900 deleted file mode 100644
901 index 9315dc4..0000000
902 --- a/sys-devel/gcc/files/gcc-8.3.0-norisc32.patch
903 +++ /dev/null
904 @@ -1,27 +0,0 @@
905 -diff -ruN gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib gcc-8.3.0/gcc/config/riscv/t-linux-multilib
906 ---- gcc-8.3.0.orig/gcc/config/riscv/t-linux-multilib 2017-02-06 22:38:37.000000000 +0100
907 -+++ gcc-8.3.0/gcc/config/riscv/t-linux-multilib 2019-04-28 16:37:44.377841943 +0200
908 -@@ -20,21 +20,9 @@
909 - ilp32d \
910 - lp64 \
911 - lp64d
912 --MULTILIB_REQUIRED = march=rv32imac/mabi=ilp32 \
913 --march=rv32imafdc/mabi=ilp32d \
914 --march=rv64imac/mabi=lp64 \
915 -+MULTILIB_REQUIRED = march=rv64imac/mabi=lp64 \
916 - march=rv64imafdc/mabi=lp64d
917 --MULTILIB_REUSE = march.rv32imac/mabi.ilp32=march.rv32ima/mabi.ilp32 \
918 --march.rv32imac/mabi.ilp32=march.rv32imaf/mabi.ilp32 \
919 --march.rv32imac/mabi.ilp32=march.rv32imafd/mabi.ilp32 \
920 --march.rv32imac/mabi.ilp32=march.rv32imafc/mabi.ilp32 \
921 --march.rv32imac/mabi.ilp32=march.rv32imafdc/mabi.ilp32 \
922 --march.rv32imac/mabi.ilp32=march.rv32g/mabi.ilp32 \
923 --march.rv32imac/mabi.ilp32=march.rv32gc/mabi.ilp32 \
924 --march.rv32imafdc/mabi.ilp32d=march.rv32imafd/mabi.ilp32d \
925 --march.rv32imafdc/mabi.ilp32d=march.rv32gc/mabi.ilp32d \
926 --march.rv32imafdc/mabi.ilp32d=march.rv32g/mabi.ilp32d \
927 --march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
928 -+MULTILIB_REUSE = march.rv64imac/mabi.lp64=march.rv64ima/mabi.lp64 \
929 - march.rv64imac/mabi.lp64=march.rv64imaf/mabi.lp64 \
930 - march.rv64imac/mabi.lp64=march.rv64imafd/mabi.lp64 \
931 - march.rv64imac/mabi.lp64=march.rv64imafc/mabi.lp64 \
932
933 diff --git a/sys-devel/gcc/files/gcc-configure-LANG.patch b/sys-devel/gcc/files/gcc-configure-LANG.patch
934 deleted file mode 100644
935 index d1b1b03..0000000
936 --- a/sys-devel/gcc/files/gcc-configure-LANG.patch
937 +++ /dev/null
938 @@ -1,64 +0,0 @@
939 -The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
940 -option parsing, it may break.
941 -
942 -http://bugs.gentoo.org/103483
943 -
944 ---- configure
945 -+++ configure
946 -@@ -54,6 +54,19 @@
947 - infodir='${prefix}/info'
948 - mandir='${prefix}/man'
949 -
950 -+# NLS nuisances.
951 -+for as_var in \
952 -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
953 -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
954 -+ LC_TELEPHONE LC_TIME
955 -+do
956 -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
957 -+ eval $as_var=C; export $as_var
958 -+ else
959 -+ unset $as_var
960 -+ fi
961 -+done
962 -+
963 - # Initialize some other variables.
964 - subdirs=
965 - MFLAGS= MAKEFLAGS=
966 -@@ -452,16 +463,6 @@
967 - esac
968 - done
969 -
970 --# NLS nuisances.
971 --# Only set these to C if already set. These must not be set unconditionally
972 --# because not all systems understand e.g. LANG=C (notably SCO).
973 --# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
974 --# Non-C LC_CTYPE values break the ctype check.
975 --if test "${LANG+set}" = set; then LANG=C; export LANG; fi
976 --if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
977 --if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
978 --if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
979 --
980 - # confdefs.h avoids OS command line length limits that DEFS can exceed.
981 - rm -rf conftest* confdefs.h
982 - # AIX cpp loses on an empty file, so make sure it contains at least a newline.
983 -@@ -1850,6 +1850,19 @@
984 - # Compiler output produced by configure, useful for debugging
985 - # configure, is in ./config.log if it exists.
986 -
987 -+# NLS nuisances.
988 -+for as_var in \
989 -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
990 -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
991 -+ LC_TELEPHONE LC_TIME
992 -+do
993 -+ if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
994 -+ eval \$as_var=C; export \$as_var
995 -+ else
996 -+ unset \$as_var
997 -+ fi
998 -+done
999 -+
1000 - ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
1001 - for ac_option
1002 - do
1003
1004 diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch b/sys-devel/gcc/files/gcc-configure-texinfo.patch
1005 deleted file mode 100644
1006 index ddc098d..0000000
1007 --- a/sys-devel/gcc/files/gcc-configure-texinfo.patch
1008 +++ /dev/null
1009 @@ -1,16 +0,0 @@
1010 -Chances are quite good that the installed makeinfo is sufficient.
1011 -So ignore false positives where the makeinfo installed is so new
1012 -that it violates the cheesy version grep.
1013 -
1014 -http://bugs.gentoo.org/198182
1015 -
1016 ---- configure
1017 -+++ configure
1018 -@@ -3573,6 +3573,6 @@
1019 - :
1020 - else
1021 -- MAKEINFO="$MISSING makeinfo"
1022 -+ :
1023 - fi
1024 - ;;
1025 -
1026
1027 diff --git a/sys-devel/gcc/files/gcc-spec-env-r1.patch b/sys-devel/gcc/files/gcc-spec-env-r1.patch
1028 deleted file mode 100644
1029 index a589268..0000000
1030 --- a/sys-devel/gcc/files/gcc-spec-env-r1.patch
1031 +++ /dev/null
1032 @@ -1,87 +0,0 @@
1033 -2013-08-22 Magnus Granberg <zorry@g.o>
1034 -
1035 - * gcc/gcc.c (main): Add support for external spec file via the GCC_SPECS env var
1036 - and move the process of the user specifed specs.
1037 -
1038 - This allows us to easily control pie/ssp defaults with gcc-config profiles.
1039 - Original patch by Rob Holland
1040 - Extended to support multiple entries separated by ':' by Kevin F. Quinn
1041 - Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
1042 - Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by Magnus Granberg
1043 -
1044 ---- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100
1045 -+++ gcc-4.8-20130210-work/gcc/gcc.c 2013-07-26 02:32:14.625089864 +0200
1046 -@@ -6427,6 +6428,48 @@ main (int argc, char **argv)
1047 - do_option_spec (option_default_specs[i].name,
1048 - option_default_specs[i].spec);
1049 -
1050 -+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
1051 -+ /* Add specs listed in GCC_SPECS. Note; in the process of separating
1052 -+ * each spec listed, the string is overwritten at token boundaries
1053 -+ * (':') with '\0', an effect of strtok_r().
1054 -+ */
1055 -+ specs_file = getenv ("GCC_SPECS");
1056 -+ if (specs_file && (strlen(specs_file) > 0))
1057 -+ {
1058 -+ char *spec, *saveptr;
1059 -+ for (spec=strtok_r(specs_file,":",&saveptr);
1060 -+ spec!=NULL;
1061 -+ spec=strtok_r(NULL,":",&saveptr))
1062 -+ {
1063 -+ struct user_specs *user = (struct user_specs *)
1064 -+ xmalloc (sizeof (struct user_specs));
1065 -+ user->next = (struct user_specs *) 0;
1066 -+ user->filename = spec;
1067 -+ if (user_specs_tail)
1068 -+ user_specs_tail->next = user;
1069 -+ else
1070 -+ user_specs_head = user;
1071 -+ user_specs_tail = user;
1072 -+ }
1073 -+ }
1074 -+#endif
1075 -+ /* Process any user specified specs in the order given on the command
1076 -+ * line. */
1077 -+ for (uptr = user_specs_head; uptr; uptr = uptr->next)
1078 -+ {
1079 -+ char *filename = find_a_file (&startfile_prefixes, uptr->filename,
1080 -+ R_OK, true);
1081 -+ read_specs (filename ? filename : uptr->filename, false, true);
1082 -+ }
1083 -+ /* Process any user self specs. */
1084 -+ {
1085 -+ struct spec_list *sl;
1086 -+ for (sl = specs; sl; sl = sl->next)
1087 -+ if (sl->name_len == sizeof "self_spec" - 1
1088 -+ && !strcmp (sl->name, "self_spec"))
1089 -+ do_self_spec (*sl->ptr_spec);
1090 -+ }
1091 -+
1092 - /* Process DRIVER_SELF_SPECS, adding any new options to the end
1093 - of the command line. */
1094 -
1095 -@@ -6535,24 +6578,6 @@ main (int argc, char **argv)
1096 - PREFIX_PRIORITY_LAST, 0, 1);
1097 - }
1098 -
1099 -- /* Process any user specified specs in the order given on the command
1100 -- line. */
1101 -- for (uptr = user_specs_head; uptr; uptr = uptr->next)
1102 -- {
1103 -- char *filename = find_a_file (&startfile_prefixes, uptr->filename,
1104 -- R_OK, true);
1105 -- read_specs (filename ? filename : uptr->filename, false, true);
1106 -- }
1107 --
1108 -- /* Process any user self specs. */
1109 -- {
1110 -- struct spec_list *sl;
1111 -- for (sl = specs; sl; sl = sl->next)
1112 -- if (sl->name_len == sizeof "self_spec" - 1
1113 -- && !strcmp (sl->name, "self_spec"))
1114 -- do_self_spec (*sl->ptr_spec);
1115 -- }
1116 --
1117 - if (compare_debug)
1118 - {
1119 - enum save_temps save;
1120
1121 diff --git a/sys-devel/gcc/files/gcc-spec-env.patch b/sys-devel/gcc/files/gcc-spec-env.patch
1122 deleted file mode 100644
1123 index 57e7567..0000000
1124 --- a/sys-devel/gcc/files/gcc-spec-env.patch
1125 +++ /dev/null
1126 @@ -1,42 +0,0 @@
1127 - Add support for external spec file via the GCC_SPECS env var. This
1128 - allows us to easily control pie/ssp defaults with gcc-config profiles.
1129 -
1130 - Original patch by Rob Holland
1131 - Extended to support multiple entries separated by ':' by Kevin F. Quinn
1132 - Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
1133 -
1134 ---- gcc-4/gcc/gcc.c
1135 -+++ gcc-4/gcc/gcc.c
1136 -@@ -6482,6 +6482,32 @@
1137 -
1138 - /* Process any user specified specs in the order given on the command
1139 - line. */
1140 -+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
1141 -+ /* Add specs listed in GCC_SPECS. Note; in the process of separating
1142 -+ * each spec listed, the string is overwritten at token boundaries
1143 -+ * (':') with '\0', an effect of strtok_r().
1144 -+ */
1145 -+ specs_file = getenv ("GCC_SPECS");
1146 -+ if (specs_file && (strlen(specs_file) > 0))
1147 -+ {
1148 -+ char *spec, *saveptr;
1149 -+ for (spec=strtok_r(specs_file,":",&saveptr);
1150 -+ spec!=NULL;
1151 -+ spec=strtok_r(NULL,":",&saveptr))
1152 -+ {
1153 -+ struct user_specs *user = (struct user_specs *)
1154 -+ xmalloc (sizeof (struct user_specs));
1155 -+
1156 -+ user->next = (struct user_specs *) 0;
1157 -+ user->filename = spec;
1158 -+ if (user_specs_tail)
1159 -+ user_specs_tail->next = user;
1160 -+ else
1161 -+ user_specs_head = user;
1162 -+ user_specs_tail = user;
1163 -+ }
1164 -+ }
1165 -+#endif
1166 - for (uptr = user_specs_head; uptr; uptr = uptr->next)
1167 - {
1168 - char *filename = find_a_file (&startfile_prefixes, uptr->filename,
1169
1170 diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
1171 deleted file mode 100644
1172 index 85bf79a..0000000
1173 --- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
1174 +++ /dev/null
1175 @@ -1,24 +0,0 @@
1176 -# Copyright 1999-2019 Gentoo Authors
1177 -# Distributed under the terms of the GNU General Public License v2
1178 -
1179 -EAPI="6"
1180 -
1181 -PATCH_VER="1.1"
1182 -
1183 -inherit toolchain
1184 -
1185 -KEYWORDS="~riscv"
1186 -
1187 -RDEPEND=""
1188 -DEPEND="${RDEPEND}
1189 - elibc_glibc? ( >=sys-libs/glibc-2.13 )
1190 - >=${CATEGORY}/binutils-2.20"
1191 -
1192 -if [[ ${CATEGORY} != cross-* ]] ; then
1193 - PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
1194 -fi
1195 -
1196 -src_prepare() {
1197 - toolchain_src_prepare
1198 - eapply "${FILESDIR}/${PN}-8.3.0-norisc32.patch"
1199 -}
1200
1201 diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
1202 deleted file mode 100644
1203 index 8e530f9..0000000
1204 --- a/sys-devel/gcc/metadata.xml
1205 +++ /dev/null
1206 @@ -1,33 +0,0 @@
1207 -<?xml version="1.0" encoding="UTF-8"?>
1208 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1209 -<pkgmetadata>
1210 - <maintainer type="project">
1211 - <email>toolchain@g.o</email>
1212 - <name>Gentoo Toolchain Project</name>
1213 - </maintainer>
1214 - <use>
1215 - <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets
1216 - in gcc (Warning: significantly increases compile time!)</flag>
1217 - <flag name="go">Build the GCC Go language frontend.</flag>
1218 - <flag name="graphite">Add support for the framework for loop
1219 - optimizations based on a polyhedral intermediate representation</flag>
1220 - <flag name="jit">Enable libgccjit so other applications can embed gcc for Just-In-Time compilation.
1221 - This will slow down the compiler a bit as it forces all of the toolchain to be shared libs.</flag>
1222 - <flag name="libssp">Build SSP support into a dedicated library rather than use the
1223 - code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
1224 - <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag>
1225 - <flag name="objc">Build support for the Objective C code language</flag>
1226 - <flag name="objc++">Build support for the Objective C++ language</flag>
1227 - <flag name="objc-gc">Build support for the Objective C code language Garbage
1228 - Collector</flag>
1229 - <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
1230 - <flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
1231 - <flag name="ssp">Build packages with stack smashing protector on by default</flag>
1232 - <flag name="systemtap">enable systemtap static probe points</flag>
1233 - <flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag>
1234 - </use>
1235 - <upstream>
1236 - <remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
1237 - <remote-id type="sourceforge">dgcc</remote-id>
1238 - </upstream>
1239 -</pkgmetadata>