Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 11.0.0/gentoo/
Date: Tue, 09 Feb 2021 22:10:25
Message-Id: 1612908598.c3fc0b5294ca9628fe7041b180f4c80d1591f82d.slyfox@gentoo
1 commit: c3fc0b5294ca9628fe7041b180f4c80d1591f82d
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 9 22:09:58 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 9 22:09:58 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=c3fc0b52
7
8 11.0.0: drop 30_all_fno-delayed-branch.patch (fixed upstream)
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 11.0.0/gentoo/30_all_fno-delayed-branch.patch | 40 ---------------------------
13 11.0.0/gentoo/README.history | 3 ++
14 2 files changed, 3 insertions(+), 40 deletions(-)
15
16 diff --git a/11.0.0/gentoo/30_all_fno-delayed-branch.patch b/11.0.0/gentoo/30_all_fno-delayed-branch.patch
17 deleted file mode 100644
18 index 879c69d..0000000
19 --- a/11.0.0/gentoo/30_all_fno-delayed-branch.patch
20 +++ /dev/null
21 @@ -1,40 +0,0 @@
22 -From 6d0d3ae914bf19706550a539ef304c5875535ffc Mon Sep 17 00:00:00 2001
23 -From: Sergei Trofimovich <siarheit@××××××.com>
24 -Date: Fri, 3 Jul 2020 22:50:33 +0100
25 -Subject: [PATCH] Disable -fdelayed-branch by default.
26 -
27 -From https://gcc.gnu.org/PR96015 / https://bugs.gentoo.org/729570.
28 -delayed branches are known to generate invalid code around
29 -__builtin_unreachable(); and mis-compiles python.
30 -
31 -Use blunt hammer and disable delayed slots until we have better fix.
32 -
33 -Reported-by: Jeroen Roovers
34 -Bug: https://gcc.gnu.org/PR96015
35 -Bug: https://bugs.gentoo.org/729570
36 -Signed-off-by: Sergei Trofimovich <siarheit@××××××.com>
37 ----
38 - gcc/opts.c | 9 ++++++++-
39 - 1 file changed, 8 insertions(+), 1 deletion(-)
40 -
41 ---- a/gcc/opts.c
42 -+++ b/gcc/opts.c
43 -@@ -458,7 +458,14 @@ static const struct default_options default_options_table[] =
44 - /* -O1 (and not -Og) optimizations. */
45 - { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fbranch_count_reg, NULL, 1 },
46 - #if DELAY_SLOTS
47 -- { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fdelayed_branch, NULL, 1 },
48 -+ /*
49 -+ * From https://gcc.gnu.org/PR96015 / https://bugs.gentoo.org/729570.
50 -+ * delayed branches are known to generate invalid code around
51 -+ * __builtin_unreachable(); and mis-compiles python.
52 -+ *
53 -+ * Use blunt hammer and disable delayed slots until we have better fix.
54 -+ */
55 -+ /* { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fdelayed_branch, NULL, 1 }, */
56 - #endif
57 - { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fdse, NULL, 1 },
58 - { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fif_conversion, NULL, 1 },
59 ---
60 -2.27.0
61 -
62
63 diff --git a/11.0.0/gentoo/README.history b/11.0.0/gentoo/README.history
64 index 5c5307a..91a0aed 100644
65 --- a/11.0.0/gentoo/README.history
66 +++ b/11.0.0/gentoo/README.history
67 @@ -1,3 +1,6 @@
68 +7 TODO
69 + - 30_all_fno-delayed-branch.patch
70 +
71 6 28 Jan 2021
72 - 07_all_i386_libgcc_note.GNU-stack.patch