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