1 |
commit: 6db0a0d358aa57947c12c26fd34b0936bd404aae |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 16 16:39:35 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 16 16:44:48 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6db0a0d3 |
7 |
|
8 |
dev-qt/qtscript: Add gcc-8.3 fix |
9 |
|
10 |
Thanks-to: Tommy Yu <y <AT> metatoaster.com> |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../qtscript/files/qtscript-5.11.3-gcc-8.3.patch | 237 +++++++++++++++++++++ |
14 |
dev-qt/qtscript/qtscript-4.8.7.ebuild | 7 +- |
15 |
2 files changed, 242 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/dev-qt/qtscript/files/qtscript-5.11.3-gcc-8.3.patch b/dev-qt/qtscript/files/qtscript-5.11.3-gcc-8.3.patch |
18 |
new file mode 100644 |
19 |
index 00000000..34a7ab3c |
20 |
--- /dev/null |
21 |
+++ b/dev-qt/qtscript/files/qtscript-5.11.3-gcc-8.3.patch |
22 |
@@ -0,0 +1,237 @@ |
23 |
+From 97ec1d1882a83c23c91f0f7daea48e05858d8c32 Mon Sep 17 00:00:00 2001 |
24 |
+From: Thiago Macieira <thiago.macieira@×××××.com> |
25 |
+Date: Mon, 28 Jan 2019 14:33:12 -0800 |
26 |
+Subject: Fix build with GCC 8.3 |
27 |
+ |
28 |
+Qualifiers in the asm statement are not allowed in the global scope. I |
29 |
+thought they were necessary for LTO, but I the commit to this file that |
30 |
+added them predates my work on setting up LTO for GCC. |
31 |
+ |
32 |
+Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 |
33 |
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@××.io> |
34 |
+--- |
35 |
+ .../javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++++----------- |
36 |
+ 1 file changed, 24 insertions(+), 24 deletions(-) |
37 |
+ |
38 |
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp |
39 |
+index 1abdf8b..9f60761 100644 |
40 |
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp |
41 |
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp |
42 |
+@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s |
43 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline); |
44 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); |
45 |
+ |
46 |
+-asm volatile ( |
47 |
++asm ( |
48 |
+ ".text\n" |
49 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
50 |
+ HIDE_SYMBOL(ctiTrampoline) "\n" |
51 |
+@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
52 |
+ "ret" "\n" |
53 |
+ ); |
54 |
+ |
55 |
+-asm volatile ( |
56 |
++asm ( |
57 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
58 |
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" |
59 |
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
60 |
+@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
61 |
+ "ret" "\n" |
62 |
+ ); |
63 |
+ |
64 |
+-asm volatile ( |
65 |
++asm ( |
66 |
+ ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" |
67 |
+ HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" |
68 |
+ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
69 |
+@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s |
70 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline); |
71 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline); |
72 |
+ |
73 |
+-asm volatile ( |
74 |
++asm ( |
75 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
76 |
+ HIDE_SYMBOL(ctiTrampoline) "\n" |
77 |
+ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
78 |
+@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
79 |
+ "ret" "\n" |
80 |
+ ); |
81 |
+ |
82 |
+-asm volatile ( |
83 |
++asm ( |
84 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
85 |
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" |
86 |
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
87 |
+@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
88 |
+ "ret" "\n" |
89 |
+ ); |
90 |
+ |
91 |
+-asm volatile ( |
92 |
++asm ( |
93 |
+ ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" |
94 |
+ HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" |
95 |
+ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
96 |
+@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
97 |
+ #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." |
98 |
+ #endif |
99 |
+ |
100 |
+-asm volatile ( |
101 |
++asm ( |
102 |
+ ".text" "\n" |
103 |
+ ".align 2" "\n" |
104 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
105 |
+@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
106 |
+ "bx lr" "\n" |
107 |
+ ); |
108 |
+ |
109 |
+-asm volatile ( |
110 |
++asm ( |
111 |
+ ".text" "\n" |
112 |
+ ".align 2" "\n" |
113 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
114 |
+@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
115 |
+ "bx lr" "\n" |
116 |
+ ); |
117 |
+ |
118 |
+-asm volatile ( |
119 |
++asm ( |
120 |
+ ".text" "\n" |
121 |
+ ".align 2" "\n" |
122 |
+ ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" |
123 |
+@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
124 |
+ |
125 |
+ #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) |
126 |
+ |
127 |
+-asm volatile ( |
128 |
++asm ( |
129 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
130 |
+ HIDE_SYMBOL(ctiTrampoline) "\n" |
131 |
+ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
132 |
+@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
133 |
+ "mov pc, lr" "\n" |
134 |
+ ); |
135 |
+ |
136 |
+-asm volatile ( |
137 |
++asm ( |
138 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
139 |
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" |
140 |
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
141 |
+@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_ |
142 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline); |
143 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline); |
144 |
+ |
145 |
+-asm volatile ( |
146 |
++asm ( |
147 |
+ ".text\n" |
148 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
149 |
+ HIDE_SYMBOL(ctiTrampoline) "\n" |
150 |
+@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
151 |
+ "ret" "\n" |
152 |
+ ); |
153 |
+ |
154 |
+-asm volatile ( |
155 |
++asm ( |
156 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
157 |
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" |
158 |
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
159 |
+@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
160 |
+ "ret" "\n" |
161 |
+ ); |
162 |
+ |
163 |
+-asm volatile ( |
164 |
++asm ( |
165 |
+ ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" |
166 |
+ HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" |
167 |
+ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
168 |
+@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_ |
169 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline); |
170 |
+ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline); |
171 |
+ |
172 |
+-asm volatile ( |
173 |
++asm ( |
174 |
+ ".text\n" |
175 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
176 |
+ HIDE_SYMBOL(ctiTrampoline) "\n" |
177 |
+@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
178 |
+ "ret" "\n" |
179 |
+ ); |
180 |
+ |
181 |
+-asm volatile ( |
182 |
++asm ( |
183 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
184 |
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" |
185 |
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
186 |
+@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
187 |
+ "ret" "\n" |
188 |
+ ); |
189 |
+ |
190 |
+-asm volatile ( |
191 |
++asm ( |
192 |
+ ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" |
193 |
+ HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" |
194 |
+ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
195 |
+@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
196 |
+ #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." |
197 |
+ #endif |
198 |
+ |
199 |
+-asm volatile ( |
200 |
++asm ( |
201 |
+ ".text" "\n" |
202 |
+ ".align 2" "\n" |
203 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
204 |
+@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
205 |
+ "bx lr" "\n" |
206 |
+ ); |
207 |
+ |
208 |
+-asm volatile ( |
209 |
++asm ( |
210 |
+ ".text" "\n" |
211 |
+ ".align 2" "\n" |
212 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
213 |
+@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
214 |
+ "bx lr" "\n" |
215 |
+ ); |
216 |
+ |
217 |
+-asm volatile ( |
218 |
++asm ( |
219 |
+ ".text" "\n" |
220 |
+ ".align 2" "\n" |
221 |
+ ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" |
222 |
+@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" |
223 |
+ |
224 |
+ #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) |
225 |
+ |
226 |
+-asm volatile ( |
227 |
++asm ( |
228 |
+ ".text\n" |
229 |
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n" |
230 |
+ HIDE_SYMBOL(ctiTrampoline) "\n" |
231 |
+@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" |
232 |
+ "mov pc, lr" "\n" |
233 |
+ ); |
234 |
+ |
235 |
+-asm volatile ( |
236 |
++asm ( |
237 |
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" |
238 |
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" |
239 |
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" |
240 |
+@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD |
241 |
+ extern "C" { \ |
242 |
+ rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ |
243 |
+ }; \ |
244 |
+- asm volatile ( \ |
245 |
++ asm ( \ |
246 |
+ ".text" "\n" \ |
247 |
+ ".align 2" "\n" \ |
248 |
+ ".globl " SYMBOL_STRING(cti_##op) "\n" \ |
249 |
+@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR |
250 |
+ extern "C" { \ |
251 |
+ rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ |
252 |
+ }; \ |
253 |
+- asm volatile ( \ |
254 |
++ asm ( \ |
255 |
+ ".globl " SYMBOL_STRING(cti_##op) "\n" \ |
256 |
+ HIDE_SYMBOL(cti_##op) "\n" \ |
257 |
+ SYMBOL_STRING(cti_##op) ":" "\n" \ |
258 |
+-- |
259 |
+cgit v1.2.1 |
260 |
|
261 |
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild |
262 |
index 60eb46ba..265bd485 100644 |
263 |
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild |
264 |
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild |
265 |
@@ -1,4 +1,4 @@ |
266 |
-# Copyright 1999-2018 Gentoo Foundation |
267 |
+# Copyright 1999-2020 Gentoo Authors |
268 |
# Distributed under the terms of the GNU General Public License v2 |
269 |
|
270 |
EAPI=5 |
271 |
@@ -22,7 +22,10 @@ QT4_TARGET_DIRECTORIES="src/script" |
272 |
QCONFIG_ADD="script" |
273 |
QCONFIG_DEFINE="QT_SCRIPT" |
274 |
|
275 |
-PATCHES=( "${FILESDIR}/4.8.6-javascriptcore-x32.patch" ) |
276 |
+PATCHES=( |
277 |
+ "${FILESDIR}/4.8.6-javascriptcore-x32.patch" |
278 |
+ "${FILESDIR}/${PN}-5.11.3-gcc-8.3.patch" |
279 |
+) |
280 |
|
281 |
multilib_src_configure() { |
282 |
local myconf=( |