1 |
commit: dc2012eb0cdd942ced0fb98e4a6cdd52e4f4dfb3 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Nov 29 20:33:57 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Nov 29 20:33:57 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dc2012eb |
7 |
|
8 |
sys-devel/gcc: sync 7.x with upstream |
9 |
|
10 |
add patch for ICE with GRAPHITE |
11 |
|
12 |
sys-devel/gcc/Manifest | 2 - |
13 |
sys-devel/gcc/files/gcc-7.1.0-pr80706.patch | 119 ---------------------------- |
14 |
sys-devel/gcc/files/gcc-7.2.0-pr69728.patch | 26 ++++++ |
15 |
sys-devel/gcc/gcc-7.1.0-r1.ebuild | 32 -------- |
16 |
sys-devel/gcc/gcc-7.2.0.ebuild | 8 +- |
17 |
5 files changed, 30 insertions(+), 157 deletions(-) |
18 |
|
19 |
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest |
20 |
index 156bd96..1e19a7d 100644 |
21 |
--- a/sys-devel/gcc/Manifest |
22 |
+++ b/sys-devel/gcc/Manifest |
23 |
@@ -10,6 +10,4 @@ DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256 a3145faa6c81c0753ba754b735 |
24 |
DIST gcc-5.4.0.tar.bz2 95661481 SHA256 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b WHIRLPOOL ec81c8143e48bc8d9d0bbdc0fa3ca553c805193f53ac46c86127b54565894780dd97281485e396a130567464c753f043458c8e450018c957813f50ff90a40708 |
25 |
DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 SHA256 9c9b68c28e67be281c9bcec5d944b2a3439bab953dce08fd35a65b10f9dae3cd SHA512 e649e334eec4deb7c261d808ed460413d78a2a4a672823d214c1e173a13bc314ce898fbf3674a7c7fe3151a089384ee0a7dee479bc8d005a06b65b39216bdf75 WHIRLPOOL d7d9a80038fb939c26605d91eda9bc23070179bdf6ce597255c44f9d83f2603aae91d9890d2a445bce8c682708743021485f1415cea0b9b8f02dd9d982e36d3b |
26 |
DIST gcc-6.4.0.tar.xz 76156220 SHA256 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 WHIRLPOOL 136b282c6957877d2f463d83740fa65a4e7a346ac94e4baabea25cec41ae307f34409b1e518a22927821d564b8634a48978dc8e1d0b988999e924adcbf3f5cc9 |
27 |
-DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 SHA256 39d4a0c659cc361bd3c71fdc9b793bccfa2bce06ede65ac49b805d1e236fcc8e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30 WHIRLPOOL 9682649fff62b56683637d25a58d11928342d99e52b2269f42369fd1d691208a7645802cb0d609ac30e20593ecdceb8cb1ab9b216963afe14db1b17ed43d5eb7 |
28 |
-DIST gcc-7.1.0.tar.bz2 84303533 SHA256 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17 SHA512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec WHIRLPOOL 1dce5f89d4110bacd7f65140a1dee7b1a4898682e2ae8621832bda6f101354d226743acf77974b5e97d861c6eb6c47637138987dfb6ba222ad81b751e80ff6e6 |
29 |
DIST gcc-7.2.0.tar.xz 62312628 SHA256 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1 WHIRLPOOL 9503fb08731d94b5d79b182579f41992e9db16dba8a034cbfa8a2703a975185859e79c1e3f6094d14d08c7f5d7135c2ca5ffd8d6f7ae7820c20d4076fe5e9f65 |
30 |
|
31 |
diff --git a/sys-devel/gcc/files/gcc-7.1.0-pr80706.patch b/sys-devel/gcc/files/gcc-7.1.0-pr80706.patch |
32 |
deleted file mode 100644 |
33 |
index 73572b2..0000000 |
34 |
--- a/sys-devel/gcc/files/gcc-7.1.0-pr80706.patch |
35 |
+++ /dev/null |
36 |
@@ -1,119 +0,0 @@ |
37 |
---- branches/gcc-7-branch/gcc/config/i386/sync.md 2017/04/20 09:50:13 247016 |
38 |
-+++ branches/gcc-7-branch/gcc/config/i386/sync.md 2017/05/14 12:49:55 248032 |
39 |
-@@ -25,6 +25,9 @@ |
40 |
- UNSPEC_FILD_ATOMIC |
41 |
- UNSPEC_FIST_ATOMIC |
42 |
- |
43 |
-+ UNSPEC_LDX_ATOMIC |
44 |
-+ UNSPEC_STX_ATOMIC |
45 |
-+ |
46 |
- ;; __atomic support |
47 |
- UNSPEC_LDA |
48 |
- UNSPEC_STA |
49 |
-@@ -199,9 +202,8 @@ |
50 |
- } |
51 |
- else |
52 |
- { |
53 |
-- adjust_reg_mode (tmp, DImode); |
54 |
-- emit_move_insn (tmp, src); |
55 |
-- emit_move_insn (mem, tmp); |
56 |
-+ emit_insn (gen_loaddi_via_sse (tmp, src)); |
57 |
-+ emit_insn (gen_storedi_via_sse (mem, tmp)); |
58 |
- } |
59 |
- |
60 |
- if (mem != dst) |
61 |
-@@ -226,10 +228,12 @@ |
62 |
- "operands[5] = gen_lowpart (DFmode, operands[1]);") |
63 |
- |
64 |
- (define_peephole2 |
65 |
-- [(set (match_operand:DI 0 "sse_reg_operand") |
66 |
-- (match_operand:DI 1 "memory_operand")) |
67 |
-+ [(set (match_operand:DF 0 "sse_reg_operand") |
68 |
-+ (unspec:DF [(match_operand:DI 1 "memory_operand")] |
69 |
-+ UNSPEC_LDX_ATOMIC)) |
70 |
- (set (match_operand:DI 2 "memory_operand") |
71 |
-- (match_dup 0)) |
72 |
-+ (unspec:DI [(match_dup 0)] |
73 |
-+ UNSPEC_STX_ATOMIC)) |
74 |
- (set (match_operand:DF 3 "fp_register_operand") |
75 |
- (match_operand:DF 4 "memory_operand"))] |
76 |
- "!TARGET_64BIT |
77 |
-@@ -301,7 +305,9 @@ |
78 |
- rtx dst = operands[0], src = operands[1]; |
79 |
- rtx mem = operands[2], tmp = operands[3]; |
80 |
- |
81 |
-- if (!SSE_REG_P (src)) |
82 |
-+ if (SSE_REG_P (src)) |
83 |
-+ emit_move_insn (dst, src); |
84 |
-+ else |
85 |
- { |
86 |
- if (REG_P (src)) |
87 |
- { |
88 |
-@@ -313,16 +319,13 @@ |
89 |
- { |
90 |
- emit_insn (gen_loaddi_via_fpu (tmp, src)); |
91 |
- emit_insn (gen_storedi_via_fpu (dst, tmp)); |
92 |
-- DONE; |
93 |
- } |
94 |
- else |
95 |
- { |
96 |
-- adjust_reg_mode (tmp, DImode); |
97 |
-- emit_move_insn (tmp, src); |
98 |
-- src = tmp; |
99 |
-+ emit_insn (gen_loaddi_via_sse (tmp, src)); |
100 |
-+ emit_insn (gen_storedi_via_sse (dst, tmp)); |
101 |
- } |
102 |
- } |
103 |
-- emit_move_insn (dst, src); |
104 |
- DONE; |
105 |
- }) |
106 |
- |
107 |
-@@ -344,10 +347,12 @@ |
108 |
- (define_peephole2 |
109 |
- [(set (match_operand:DF 0 "memory_operand") |
110 |
- (match_operand:DF 1 "fp_register_operand")) |
111 |
-- (set (match_operand:DI 2 "sse_reg_operand") |
112 |
-- (match_operand:DI 3 "memory_operand")) |
113 |
-+ (set (match_operand:DF 2 "sse_reg_operand") |
114 |
-+ (unspec:DF [(match_operand:DI 3 "memory_operand")] |
115 |
-+ UNSPEC_LDX_ATOMIC)) |
116 |
- (set (match_operand:DI 4 "memory_operand") |
117 |
-- (match_dup 2))] |
118 |
-+ (unspec:DI [(match_dup 2)] |
119 |
-+ UNSPEC_STX_ATOMIC))] |
120 |
- "!TARGET_64BIT |
121 |
- && peep2_reg_dead_p (3, operands[2]) |
122 |
- && rtx_equal_p (operands[0], adjust_address_nv (operands[3], DFmode, 0))" |
123 |
-@@ -382,6 +387,32 @@ |
124 |
- [(set_attr "type" "fmov") |
125 |
- (set_attr "mode" "DI")]) |
126 |
- |
127 |
-+(define_insn "loaddi_via_sse" |
128 |
-+ [(set (match_operand:DF 0 "register_operand" "=x") |
129 |
-+ (unspec:DF [(match_operand:DI 1 "memory_operand" "m")] |
130 |
-+ UNSPEC_LDX_ATOMIC))] |
131 |
-+ "TARGET_SSE" |
132 |
-+{ |
133 |
-+ if (TARGET_SSE2) |
134 |
-+ return "%vmovq\t{%1, %0|%0, %1}"; |
135 |
-+ return "movlps\t{%1, %0|%0, %1}"; |
136 |
-+} |
137 |
-+ [(set_attr "type" "ssemov") |
138 |
-+ (set_attr "mode" "DI")]) |
139 |
-+ |
140 |
-+(define_insn "storedi_via_sse" |
141 |
-+ [(set (match_operand:DI 0 "memory_operand" "=m") |
142 |
-+ (unspec:DI [(match_operand:DF 1 "register_operand" "x")] |
143 |
-+ UNSPEC_STX_ATOMIC))] |
144 |
-+ "TARGET_SSE" |
145 |
-+{ |
146 |
-+ if (TARGET_SSE2) |
147 |
-+ return "%vmovq\t{%1, %0|%0, %1}"; |
148 |
-+ return "movlps\t{%1, %0|%0, %1}"; |
149 |
-+} |
150 |
-+ [(set_attr "type" "ssemov") |
151 |
-+ (set_attr "mode" "DI")]) |
152 |
-+ |
153 |
- (define_expand "atomic_compare_and_swap<mode>" |
154 |
- [(match_operand:QI 0 "register_operand") ;; bool success output |
155 |
- (match_operand:SWI124 1 "register_operand") ;; oldval output |
156 |
|
157 |
diff --git a/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch b/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch |
158 |
new file mode 100644 |
159 |
index 0000000..ca5eedc |
160 |
--- /dev/null |
161 |
+++ b/sys-devel/gcc/files/gcc-7.2.0-pr69728.patch |
162 |
@@ -0,0 +1,26 @@ |
163 |
+diff -Naur gcc-7.2.0.orig/gcc/graphite-sese-to-poly.c gcc-7.2.0/gcc/graphite-sese-to-poly.c |
164 |
+--- gcc-7.2.0.orig/gcc/graphite-sese-to-poly.c 2017-11-29 12:32:19.000188886 -0800 |
165 |
++++ gcc-7.2.0/gcc/graphite-sese-to-poly.c 2017-11-29 12:32:35.858188584 -0800 |
166 |
+@@ -1043,6 +1043,14 @@ |
167 |
+ if (empty < 0 || empty) |
168 |
+ return empty < 0 ? isl_schedule_free (schedule) : schedule; |
169 |
+ |
170 |
++ isl_union_set *domain = isl_schedule_get_domain (schedule); |
171 |
++ /* We cannot apply an empty domain to pbbs in this loop so return early. */ |
172 |
++ if (isl_union_set_is_empty (domain)) |
173 |
++ { |
174 |
++ isl_union_set_free (domain); |
175 |
++ return schedule; |
176 |
++ } |
177 |
++ |
178 |
+ isl_space *space = isl_set_get_space (iterators); |
179 |
+ int loop_index = isl_space_dim (space, isl_dim_set) - 1; |
180 |
+ |
181 |
+@@ -1063,7 +1071,6 @@ |
182 |
+ prefix = isl_multi_aff_set_tuple_id (prefix, isl_dim_out, label); |
183 |
+ |
184 |
+ int n = isl_multi_aff_dim (prefix, isl_dim_in); |
185 |
+- isl_union_set *domain = isl_schedule_get_domain (schedule); |
186 |
+ isl_multi_union_pw_aff *mupa = outer_projection_mupa (domain, n); |
187 |
+ mupa = isl_multi_union_pw_aff_apply_multi_aff (mupa, prefix); |
188 |
+ return isl_schedule_insert_partial_schedule (schedule, mupa); |
189 |
|
190 |
diff --git a/sys-devel/gcc/gcc-7.1.0-r1.ebuild b/sys-devel/gcc/gcc-7.1.0-r1.ebuild |
191 |
deleted file mode 100644 |
192 |
index c5194d1..0000000 |
193 |
--- a/sys-devel/gcc/gcc-7.1.0-r1.ebuild |
194 |
+++ /dev/null |
195 |
@@ -1,32 +0,0 @@ |
196 |
-# Copyright 1999-2017 Gentoo Foundation |
197 |
-# Distributed under the terms of the GNU General Public License v2 |
198 |
- |
199 |
-EAPI="5" |
200 |
- |
201 |
-PATCH_VER="1.1" |
202 |
-#UCLIBC_VER="1.0" |
203 |
- |
204 |
-inherit epatch toolchain |
205 |
- |
206 |
-KEYWORDS="" |
207 |
- |
208 |
-RDEPEND="" |
209 |
-DEPEND="${RDEPEND} |
210 |
- elibc_glibc? ( >=sys-libs/glibc-2.13 ) |
211 |
- >=${CATEGORY}/binutils-2.20" |
212 |
- |
213 |
-if [[ ${CATEGORY} != cross-* ]] ; then |
214 |
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" |
215 |
-fi |
216 |
- |
217 |
-src_prepare() { |
218 |
- toolchain_src_prepare |
219 |
- |
220 |
- # Upstream Patch |
221 |
- epatch "${FILESDIR}"/${PN}-7.1.0-pr80706.patch |
222 |
- |
223 |
- if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
224 |
- epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
225 |
- epatch "${FILESDIR}"/7.1.0/posix_memalign.patch |
226 |
- fi |
227 |
-} |
228 |
|
229 |
diff --git a/sys-devel/gcc/gcc-7.2.0.ebuild b/sys-devel/gcc/gcc-7.2.0.ebuild |
230 |
index 5eb4bef..035e93f 100644 |
231 |
--- a/sys-devel/gcc/gcc-7.2.0.ebuild |
232 |
+++ b/sys-devel/gcc/gcc-7.2.0.ebuild |
233 |
@@ -3,13 +3,13 @@ |
234 |
|
235 |
EAPI="5" |
236 |
|
237 |
-PATCH_GCC_VER="7.1.0" |
238 |
PATCH_VER="1.1" |
239 |
+PATCH_GCC_VER="7.1.0" |
240 |
#UCLIBC_VER="1.0" |
241 |
|
242 |
inherit epatch toolchain |
243 |
|
244 |
-KEYWORDS="" |
245 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
246 |
|
247 |
RDEPEND="" |
248 |
DEPEND="${RDEPEND} |
249 |
@@ -20,11 +20,11 @@ if [[ ${CATEGORY} != cross-* ]] ; then |
250 |
PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )" |
251 |
fi |
252 |
|
253 |
- |
254 |
- |
255 |
src_prepare() { |
256 |
toolchain_src_prepare |
257 |
|
258 |
+ epatch "${FILESDIR}"/gcc-7.2.0-pr69728.patch |
259 |
+ |
260 |
if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then |
261 |
epatch "${FILESDIR}"/6.3.0/cpu_indicator.patch |
262 |
epatch "${FILESDIR}"/7.1.0/posix_memalign.patch |