1 |
commit: 066e26c95928de295cf822034de2d2cd05acf8af |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 6 19:19:13 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 6 19:19:30 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066e26c9 |
7 |
|
8 |
sys-devel/gcc: allow negative insn cost, bug #707958 |
9 |
|
10 |
Apply the patch right on stable ebuild to unblock catalyst builds for ia64. |
11 |
|
12 |
Reported-by: Matt Turner |
13 |
Bug: https://bugs.gentoo.org/707958 |
14 |
Package-Manager: Portage-2.3.87, Repoman-2.3.20 |
15 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
16 |
|
17 |
sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch | 29 +++++++++++++++++++++++ |
18 |
sys-devel/gcc/gcc-9.2.0-r2.ebuild | 7 +++++- |
19 |
sys-devel/gcc/gcc-9.2.0-r3.ebuild | 9 ++++++- |
20 |
3 files changed, 43 insertions(+), 2 deletions(-) |
21 |
|
22 |
diff --git a/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..7a6bebdf490 |
25 |
--- /dev/null |
26 |
+++ b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch |
27 |
@@ -0,0 +1,29 @@ |
28 |
+https://bugs.gentoo.org/707958 |
29 |
+https://gcc.gnu.org/PR88879 |
30 |
+ |
31 |
+Subject: [PATCH] sel-sched: allow negative insn priority (PR 88879) |
32 |
+From: Alexander Monakov <amonakov@××××××.ru> |
33 |
+ |
34 |
+ PR rtl-optimization/88879 |
35 |
+ * sel-sched.c (sel_target_adjust_priority): Remove assert. |
36 |
+ |
37 |
+From-SVN: r271039 |
38 |
+--- |
39 |
+ gcc/ChangeLog | 5 +++++ |
40 |
+ gcc/sel-sched.c | 2 -- |
41 |
+ 2 files changed, 5 insertions(+), 2 deletions(-) |
42 |
+ |
43 |
+--- a/gcc/sel-sched.c |
44 |
++++ b/gcc/sel-sched.c |
45 |
+@@ -3331,8 +3331,6 @@ sel_target_adjust_priority (expr_t expr) |
46 |
+ else |
47 |
+ new_priority = priority; |
48 |
+ |
49 |
+- gcc_assert (new_priority >= 0); |
50 |
+- |
51 |
+ /* If the priority has changed, adjust EXPR_PRIORITY_ADJ accordingly. */ |
52 |
+ EXPR_PRIORITY_ADJ (expr) = new_priority - EXPR_PRIORITY (expr); |
53 |
+ |
54 |
+-- |
55 |
+2.25.0 |
56 |
+ |
57 |
|
58 |
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild |
59 |
index e2638f44d60..97327a27655 100644 |
60 |
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild |
61 |
+++ b/sys-devel/gcc/gcc-9.2.0-r2.ebuild |
62 |
@@ -1,4 +1,4 @@ |
63 |
-# Copyright 1999-2019 Gentoo Authors |
64 |
+# Copyright 1999-2020 Gentoo Authors |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
|
67 |
EAPI="7" |
68 |
@@ -17,3 +17,8 @@ DEPEND="${RDEPEND} |
69 |
if [[ ${CATEGORY} != cross-* ]] ; then |
70 |
PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" |
71 |
fi |
72 |
+ |
73 |
+src_prepare() { |
74 |
+ toolchain_src_prepare |
75 |
+ eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch |
76 |
+} |
77 |
|
78 |
diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild |
79 |
index 107ecc45981..398613c13be 100644 |
80 |
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild |
81 |
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild |
82 |
@@ -1,4 +1,4 @@ |
83 |
-# Copyright 1999-2019 Gentoo Authors |
84 |
+# Copyright 1999-2020 Gentoo Authors |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
|
87 |
EAPI="7" |
88 |
@@ -14,6 +14,13 @@ DEPEND="${RDEPEND} |
89 |
elibc_glibc? ( >=sys-libs/glibc-2.13 ) |
90 |
>=${CATEGORY}/binutils-2.20" |
91 |
|
92 |
+PATCHES=("${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch) |
93 |
+ |
94 |
if [[ ${CATEGORY} != cross-* ]] ; then |
95 |
PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" |
96 |
fi |
97 |
+ |
98 |
+src_prepare() { |
99 |
+ toolchain_src_prepare |
100 |
+ eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch |
101 |
+} |