Gentoo Archives: gentoo-commits

From: Ralph Seichter <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-lang/fbc/files/1.06.0/bootstrap/, dev-lang/fbc/
Date: Tue, 30 Apr 2019 22:23:11
Message-Id: 1556625413.1ec25978a046116846a656890bc5b6a8ac52a130.ralph-seichter@gentoo
<
1 commit: 1ec25978a046116846a656890bc5b6a8ac52a130
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Tue Apr 30 11:56:53 2019 +0000
4 Commit: Ralph Seichter <gentoo <AT> seichter <DOT> de>
5 CommitDate: Tue Apr 30 11:56:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1ec25978
7
8 dev-lang/fbc: Move large patches to external host
9
10 Package-Manager: Portage-2.3.65, Repoman-2.3.12
11 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
12
13 dev-lang/fbc/Manifest | 2 +
14 dev-lang/fbc/fbc-1.06.0.ebuild | 6 +-
15 ...n-all-options-from-all-Wa-Wc-and-Wl-flags.patch | 1514 -----
16 ...n-all-options-from-all-Wa-Wc-and-Wl-flags.patch | 7124 --------------------
17 4 files changed, 7 insertions(+), 8639 deletions(-)
18
19 diff --git a/dev-lang/fbc/Manifest b/dev-lang/fbc/Manifest
20 index d27c9cd..1c62094 100644
21 --- a/dev-lang/fbc/Manifest
22 +++ b/dev-lang/fbc/Manifest
23 @@ -1,2 +1,4 @@
24 DIST FreeBASIC-1.06.0-source-bootstrap.tar.xz 7742292 BLAKE2B fd32c6e5edf6e8c27538465141c6b870d6c893f8e05fc8d91b273f9268a68065709cba95e8c5cd8b86786522b2ac1eaf1a6a547227432bbc9998eb1288b29515 SHA512 42878091994cae7e0a2f4ba1d2d83a80d32d62ad06790ac06643a266200b53b7ce2480a651b1622910a2733756b7ca032a5be1bb73ee3f796146394eebb9f43c
25 +DIST fbc-1.06.0-bootstrap-dist-linux-x86.patch 125456 BLAKE2B 14bf25ed51d04773a8c98408f76ce79fcc165500e3ef67fc9407971f92fdb359dfc9abe8feb989ad6fd0b710b26d99ac478561d561a0687c213d048d41610ca9 SHA512 39622d88ef1b83bbe309df937139e73e6bdae87c4e0461a170aa4b792a74a295060f2b770fa81e74a0a973a9ae816fadf18d75a1075d9112dd68c83ca3e0cbb6
26 +DIST fbc-1.06.0-bootstrap-dist-linux-x86_64.patch 58219 BLAKE2B f28a4b74b8648a3128d2e8f273af55e5f1880fe35c5acef31ceed7b33386c5fb6b83ed4657138515abb95891ce8bc157aea339f8ba947dece4df1f2876e926b7 SHA512 e62b6969a93f214a6c1d246c734ab2b9045ee7ad9558d0871589945613d11ae0815945b3270213bc959c792903e86cf38555b6fd68b0d0c9ec68f8ef61ea9a0e
27 DIST fbc-1.06.0.tar.gz 8847831 BLAKE2B 9245137995f9f3e2ff5adaf9b273593434ac9ec96919b2c970ec26183fe6fb7afee35753f2dd92f4b34d1aade92871e5a6722571a5ba04dde323fd7fb06c55c5 SHA512 687dcf665bb10e6a771cc01d02c21da77d89e052308600038dce526ba1ccfc6554d409dab184f3495557c9e4fdf744fd7a9088b4b137b782a9ab8633622c5484
28
29 diff --git a/dev-lang/fbc/fbc-1.06.0.ebuild b/dev-lang/fbc/fbc-1.06.0.ebuild
30 index 0fafe2e..689d4bb 100644
31 --- a/dev-lang/fbc/fbc-1.06.0.ebuild
32 +++ b/dev-lang/fbc/fbc-1.06.0.ebuild
33 @@ -6,7 +6,9 @@ EAPI=7
34 DESCRIPTION="FreeBASIC - A free/open source, multi-platform BASIC compiler."
35 HOMEPAGE="https://www.freebasic.net"
36 SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
37 - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz"
38 + https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz
39 + https://gist.github.com/vilhelmgray/08cebe0f22e303f7d5e6e5bc71e3d1f2/raw/710ba9ded1c7772f23fd68c08e02402f167d2c56/fbc-1.06.0-bootstrap-dist-linux-x86.patch
40 + https://gist.github.com/vilhelmgray/08cebe0f22e303f7d5e6e5bc71e3d1f2/raw/710ba9ded1c7772f23fd68c08e02402f167d2c56/fbc-1.06.0-bootstrap-dist-linux-x86_64.patch"
41
42 LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
43 SLOT="0"
44 @@ -46,6 +48,8 @@ src_prepare() {
45 if ! has_version dev-lang/fbc; then
46 cd "${BOOTSTRAP_S}" || die "cd failed"
47 eapply "${FILESDIR}/${PV}/bootstrap"
48 + eapply "${DISTDIR}/fbc-1.06.0-bootstrap-dist-linux-x86.patch"
49 + eapply "${DISTDIR}/fbc-1.06.0-bootstrap-dist-linux-x86_64.patch"
50 cd "${S}" || die "cd failed"
51 fi
52 default
53
54 diff --git a/dev-lang/fbc/files/1.06.0/bootstrap/0003-bootstrap-dist-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch b/dev-lang/fbc/files/1.06.0/bootstrap/0003-bootstrap-dist-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch
55 deleted file mode 100644
56 index bebb770..0000000
57 --- a/dev-lang/fbc/files/1.06.0/bootstrap/0003-bootstrap-dist-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch
58 +++ /dev/null
59 @@ -1,1514 +0,0 @@
60 -diff --git a/../FreeBASIC-1.06.0-source-bootstrap/bootstrap/linux-x86_64/fbc.c b/bootstrap/linux-x86_64/fbc.c
61 -index 650fc5b..12aee5a 100644
62 ---- a/../FreeBASIC-1.06.0-source-bootstrap/bootstrap/linux-x86_64/fbc.c
63 -+++ b/bootstrap/linux-x86_64/fbc.c
64 -@@ -310,7 +310,7 @@ static int64 OPTION_TAKES_ARGUMENT$[58] = { -1ll, -1ll, -1ll, -1ll, 0ll, 0ll, -1
65 -
66 - int32 main( int32 __FB_ARGC__$0, char** __FB_ARGV__$0 )
67 - {
68 -- FBSTRING TMP$647$0;
69 -+ FBSTRING TMP$650$0;
70 - int32 fb$result$0;
71 - __builtin_memset( &fb$result$0, 0, 4ll );
72 - fb_Init( __FB_ARGC__$0, (uint8**)__FB_ARGV__$0, 0 );
73 -@@ -353,10 +353,10 @@ int32 main( int32 __FB_ARGC__$0, char** __FB_ARGV__$0 )
74 - }
75 - label$1110:;
76 - label$1109:;
77 -- __builtin_memset( &TMP$647$0, 0, 24ll );
78 -- FBSTRING* vr$6 = fb_StrAssign( (void*)&TMP$647$0, -1ll, (void*)((uint8*)&FBC$ + 3098ll), 261ll, 0 );
79 -- FBADDINCLUDEPATH( &TMP$647$0 );
80 -- fb_StrDelete( &TMP$647$0 );
81 -+ __builtin_memset( &TMP$650$0, 0, 24ll );
82 -+ FBSTRING* vr$6 = fb_StrAssign( (void*)&TMP$650$0, -1ll, (void*)((uint8*)&FBC$ + 3098ll), 261ll, 0 );
83 -+ FBADDINCLUDEPATH( &TMP$650$0 );
84 -+ fb_StrDelete( &TMP$650$0 );
85 - int64 HAVE_INPUT_FILES$0;
86 - void* vr$10 = LISTGETHEAD( (struct $5TLIST*)((uint8*)&FBC$ + 144ll) );
87 - void* vr$13 = LISTGETHEAD( (struct $5TLIST*)((uint8*)&FBC$ + 376ll) );
88 -@@ -366,9 +366,9 @@ int32 main( int32 __FB_ARGC__$0, char** __FB_ARGV__$0 )
89 - if( *(int64*)((uint8*)&FBC$ + 136ll) < 0ll ) goto label$1112;
90 - {
91 - {
92 -- int64 TMP$648$2;
93 -- TMP$648$2 = *(int64*)((uint8*)&FBC$ + 136ll);
94 -- if( TMP$648$2 != 0ll ) goto label$1114;
95 -+ int64 TMP$651$2;
96 -+ TMP$651$2 = *(int64*)((uint8*)&FBC$ + 136ll);
97 -+ if( TMP$651$2 != 0ll ) goto label$1114;
98 - label$1115:;
99 - {
100 - FBSTRING* vr$24 = FBGETHOSTID( );
101 -@@ -376,7 +376,7 @@ int32 main( int32 __FB_ARGC__$0, char** __FB_ARGV__$0 )
102 - }
103 - goto label$1113;
104 - label$1114:;
105 -- if( TMP$648$2 != 1ll ) goto label$1116;
106 -+ if( TMP$651$2 != 1ll ) goto label$1116;
107 - label$1117:;
108 - {
109 - FBSTRING* vr$25 = FBGETTARGETID( );
110 -@@ -384,7 +384,7 @@ int32 main( int32 __FB_ARGC__$0, char** __FB_ARGV__$0 )
111 - }
112 - goto label$1113;
113 - label$1116:;
114 -- if( TMP$648$2 != 2ll ) goto label$1118;
115 -+ if( TMP$651$2 != 2ll ) goto label$1118;
116 - label$1119:;
117 - {
118 - if( HAVE_INPUT_FILES$0 == 0ll ) goto label$1121;
119 -@@ -399,7 +399,7 @@ int32 main( int32 __FB_ARGC__$0, char** __FB_ARGV__$0 )
120 - }
121 - goto label$1113;
122 - label$1118:;
123 -- if( TMP$648$2 != 3ll ) goto label$1122;
124 -+ if( TMP$651$2 != 3ll ) goto label$1122;
125 - label$1123:;
126 - {
127 - FBSTRING* vr$29 = fb_StrAllocTempDescZ( (uint8*)((uint8*)&FBC$ + 3359ll) );
128 -@@ -1609,7 +1609,7 @@ static int64 HLINKFILES( void )
129 - }
130 - goto label$189;
131 - label$190:;
132 -- static const void* tmp$649[7ll] = {
133 -+ static const void* tmp$652[7ll] = {
134 - &&label$192,
135 - &&label$189,
136 - &&label$189,
137 -@@ -1619,7 +1619,7 @@ static int64 HLINKFILES( void )
138 - &&label$202,
139 - };
140 - if( (TMP$126$5 - 2ull) > 6ull ) goto label$189;
141 -- goto *tmp$649[TMP$126$5 - 2ull];
142 -+ goto *tmp$652[TMP$126$5 - 2ull];
143 - label$189:;
144 - }
145 - }
146 -@@ -1640,7 +1640,7 @@ static int64 HLINKFILES( void )
147 - }
148 - goto label$173;
149 - label$174:;
150 -- static const void* tmp$650[9ll] = {
151 -+ static const void* tmp$653[9ll] = {
152 - &&label$175,
153 - &&label$175,
154 - &&label$184,
155 -@@ -1652,7 +1652,7 @@ static int64 HLINKFILES( void )
156 - &&label$184,
157 - };
158 - if( TMP$113$2 > 8ull ) goto label$173;
159 -- goto *tmp$650[TMP$113$2 - 0ull];
160 -+ goto *tmp$653[TMP$113$2 - 0ull];
161 - label$173:;
162 - }
163 - int64 vr$115 = FBGETOPTION( 3ll );
164 -@@ -1718,7 +1718,7 @@ static int64 HLINKFILES( void )
165 - }
166 - goto label$211;
167 - label$212:;
168 -- static const void* tmp$651[5ll] = {
169 -+ static const void* tmp$654[5ll] = {
170 - &&label$213,
171 - &&label$213,
172 - &&label$211,
173 -@@ -1726,7 +1726,7 @@ static int64 HLINKFILES( void )
174 - &&label$216,
175 - };
176 - if( TMP$142$2 > 4ull ) goto label$211;
177 -- goto *tmp$651[TMP$142$2 - 0ull];
178 -+ goto *tmp$654[TMP$142$2 - 0ull];
179 - label$211:;
180 - }
181 - if( *(int64*)((uint8*)&FBC$ + 2568ll) == 0ll ) goto label$218;
182 -@@ -1885,13 +1885,13 @@ static int64 HLINKFILES( void )
183 - }
184 - goto label$249;
185 - label$250:;
186 -- static const void* tmp$652[3ll] = {
187 -+ static const void* tmp$655[3ll] = {
188 - &&label$251,
189 - &&label$252,
190 - &&label$251,
191 - };
192 - if( (TMP$163$6 - 6ull) > 2ull ) goto label$252;
193 -- goto *tmp$652[TMP$163$6 - 6ull];
194 -+ goto *tmp$655[TMP$163$6 - 6ull];
195 - label$249:;
196 - }
197 - }
198 -@@ -1916,13 +1916,13 @@ static int64 HLINKFILES( void )
199 - }
200 - goto label$253;
201 - label$254:;
202 -- static const void* tmp$653[3ll] = {
203 -+ static const void* tmp$656[3ll] = {
204 - &&label$255,
205 - &&label$256,
206 - &&label$255,
207 - };
208 - if( (TMP$165$6 - 6ull) > 2ull ) goto label$256;
209 -- goto *tmp$653[TMP$165$6 - 6ull];
210 -+ goto *tmp$656[TMP$165$6 - 6ull];
211 - label$253:;
212 - }
213 - }
214 -@@ -1966,7 +1966,7 @@ static int64 HLINKFILES( void )
215 - }
216 - goto label$229;
217 - label$230:;
218 -- static const void* tmp$654[9ll] = {
219 -+ static const void* tmp$657[9ll] = {
220 - &&label$236,
221 - &&label$231,
222 - &&label$244,
223 -@@ -1978,7 +1978,7 @@ static int64 HLINKFILES( void )
224 - &&label$244,
225 - };
226 - if( TMP$156$2 > 8ull ) goto label$229;
227 -- goto *tmp$654[TMP$156$2 - 0ull];
228 -+ goto *tmp$657[TMP$156$2 - 0ull];
229 - label$229:;
230 - }
231 - if( *(int64*)((uint8*)&FBC$ + 2560ll) != 0ll ) goto label$265;
232 -@@ -2134,7 +2134,7 @@ static int64 HLINKFILES( void )
233 - }
234 - goto label$281;
235 - label$282:;
236 -- static const void* tmp$655[9ll] = {
237 -+ static const void* tmp$658[9ll] = {
238 - &&label$288,
239 - &&label$281,
240 - &&label$283,
241 -@@ -2146,7 +2146,7 @@ static int64 HLINKFILES( void )
242 - &&label$283,
243 - };
244 - if( TMP$183$2 > 8ull ) goto label$281;
245 -- goto *tmp$655[TMP$183$2 - 0ull];
246 -+ goto *tmp$658[TMP$183$2 - 0ull];
247 - label$281:;
248 - }
249 - int64 vr$352 = FBGETOPTION( 3ll );
250 -@@ -2325,7 +2325,7 @@ static int64 HLINKFILES( void )
251 - }
252 - goto label$293;
253 - label$294:;
254 -- static const void* tmp$656[5ll] = {
255 -+ static const void* tmp$659[5ll] = {
256 - &&label$300,
257 - &&label$300,
258 - &&label$293,
259 -@@ -2333,7 +2333,7 @@ static int64 HLINKFILES( void )
260 - &&label$305,
261 - };
262 - if( TMP$189$2 > 4ull ) goto label$293;
263 -- goto *tmp$656[TMP$189$2 - 0ull];
264 -+ goto *tmp$659[TMP$189$2 - 0ull];
265 - label$293:;
266 - }
267 - fb$result$1 = -1ll;
268 -@@ -2412,7 +2412,7 @@ static void HREADOBJINFO( void )
269 - }
270 - goto label$323;
271 - label$324:;
272 -- static const void* tmp$657[5ll] = {
273 -+ static const void* tmp$660[5ll] = {
274 - &&label$325,
275 - &&label$326,
276 - &&label$327,
277 -@@ -2420,7 +2420,7 @@ static void HREADOBJINFO( void )
278 - &&label$331,
279 - };
280 - if( TMP$212$3 > 4ull ) goto label$336;
281 -- goto *tmp$657[TMP$212$3 - 0ull];
282 -+ goto *tmp$660[TMP$212$3 - 0ull];
283 - label$323:;
284 - }
285 - }
286 -@@ -3416,36 +3416,45 @@ static void HANDLEOPT( int64 OPTID$1, FBSTRING* ARG$1 )
287 - {
288 - FBSTRING TMP$294$3;
289 - FBSTRING TMP$295$3;
290 -+ FBSTRING TMP$296$3;
291 - FBSTRING* vr$199 = HREPLACE( *(uint8**)ARG$1, (uint8*)",", (uint8*)" " );
292 - __builtin_memset( &TMP$294$3, 0, 24ll );
293 - FBSTRING* vr$202 = fb_StrConcat( &TMP$294$3, (void*)" ", 2ll, (void*)vr$199, -1ll );
294 - __builtin_memset( &TMP$295$3, 0, 24ll );
295 - FBSTRING* vr$205 = fb_StrConcat( &TMP$295$3, (void*)vr$202, -1ll, (void*)" ", 2ll );
296 -- fb_StrAssign( (void*)((uint8*)&FBC$ + 1782ll), 128ll, (void*)vr$205, -1ll, 0 );
297 -+ __builtin_memset( &TMP$296$3, 0, 24ll );
298 -+ FBSTRING* vr$209 = fb_StrConcat( &TMP$296$3, (void*)((uint8*)&FBC$ + 1782ll), 128ll, (void*)vr$205, -1ll );
299 -+ fb_StrAssign( (void*)((uint8*)&FBC$ + 1782ll), 128ll, (void*)vr$209, -1ll, 0 );
300 - }
301 - goto label$391;
302 - label$540:;
303 - {
304 -- FBSTRING TMP$296$3;
305 - FBSTRING TMP$297$3;
306 -- FBSTRING* vr$208 = HREPLACE( *(uint8**)ARG$1, (uint8*)",", (uint8*)" " );
307 -- __builtin_memset( &TMP$296$3, 0, 24ll );
308 -- FBSTRING* vr$211 = fb_StrConcat( &TMP$296$3, (void*)" ", 2ll, (void*)vr$208, -1ll );
309 -+ FBSTRING TMP$298$3;
310 -+ FBSTRING TMP$299$3;
311 -+ FBSTRING* vr$212 = HREPLACE( *(uint8**)ARG$1, (uint8*)",", (uint8*)" " );
312 - __builtin_memset( &TMP$297$3, 0, 24ll );
313 -- FBSTRING* vr$214 = fb_StrConcat( &TMP$297$3, (void*)vr$211, -1ll, (void*)" ", 2ll );
314 -- fb_StrAssign( (void*)((uint8*)&FBC$ + 2038ll), 128ll, (void*)vr$214, -1ll, 0 );
315 -+ FBSTRING* vr$215 = fb_StrConcat( &TMP$297$3, (void*)" ", 2ll, (void*)vr$212, -1ll );
316 -+ __builtin_memset( &TMP$298$3, 0, 24ll );
317 -+ FBSTRING* vr$218 = fb_StrConcat( &TMP$298$3, (void*)vr$215, -1ll, (void*)" ", 2ll );
318 -+ __builtin_memset( &TMP$299$3, 0, 24ll );
319 -+ FBSTRING* vr$222 = fb_StrConcat( &TMP$299$3, (void*)((uint8*)&FBC$ + 2038ll), 128ll, (void*)vr$218, -1ll );
320 -+ fb_StrAssign( (void*)((uint8*)&FBC$ + 2038ll), 128ll, (void*)vr$222, -1ll, 0 );
321 - }
322 - goto label$391;
323 - label$541:;
324 - {
325 -- FBSTRING TMP$298$3;
326 -- FBSTRING TMP$299$3;
327 -- FBSTRING* vr$217 = HREPLACE( *(uint8**)ARG$1, (uint8*)",", (uint8*)" " );
328 -- __builtin_memset( &TMP$298$3, 0, 24ll );
329 -- FBSTRING* vr$220 = fb_StrConcat( &TMP$298$3, (void*)" ", 2ll, (void*)vr$217, -1ll );
330 -- __builtin_memset( &TMP$299$3, 0, 24ll );
331 -- FBSTRING* vr$223 = fb_StrConcat( &TMP$299$3, (void*)vr$220, -1ll, (void*)" ", 2ll );
332 -- fb_StrAssign( (void*)((uint8*)&FBC$ + 1910ll), 128ll, (void*)vr$223, -1ll, 0 );
333 -+ FBSTRING TMP$300$3;
334 -+ FBSTRING TMP$301$3;
335 -+ FBSTRING TMP$302$3;
336 -+ FBSTRING* vr$225 = HREPLACE( *(uint8**)ARG$1, (uint8*)",", (uint8*)" " );
337 -+ __builtin_memset( &TMP$300$3, 0, 24ll );
338 -+ FBSTRING* vr$228 = fb_StrConcat( &TMP$300$3, (void*)" ", 2ll, (void*)vr$225, -1ll );
339 -+ __builtin_memset( &TMP$301$3, 0, 24ll );
340 -+ FBSTRING* vr$231 = fb_StrConcat( &TMP$301$3, (void*)vr$228, -1ll, (void*)" ", 2ll );
341 -+ __builtin_memset( &TMP$302$3, 0, 24ll );
342 -+ FBSTRING* vr$235 = fb_StrConcat( &TMP$302$3, (void*)((uint8*)&FBC$ + 1910ll), 128ll, (void*)vr$231, -1ll );
343 -+ fb_StrAssign( (void*)((uint8*)&FBC$ + 1910ll), 128ll, (void*)vr$235, -1ll, 0 );
344 - }
345 - goto label$391;
346 - label$542:;
347 -@@ -3456,11 +3465,11 @@ static void HANDLEOPT( int64 OPTID$1, FBSTRING* ARG$1 )
348 - label$543:;
349 - {
350 - {
351 -- FBSTRING TMP$300$4;
352 -- FBSTRING* vr$226 = fb_StrLcase2( ARG$1, 0 );
353 -- FBSTRING* vr$228 = fb_StrInit( (void*)&TMP$300$4, -1ll, (void*)vr$226, -1ll, 0 );
354 -- int32 vr$230 = fb_StrCompare( (void*)&TMP$300$4, -1ll, (void*)"gosub-setjmp", 13ll );
355 -- if( (int64)vr$230 != 0ll ) goto label$545;
356 -+ FBSTRING TMP$303$4;
357 -+ FBSTRING* vr$238 = fb_StrLcase2( ARG$1, 0 );
358 -+ FBSTRING* vr$240 = fb_StrInit( (void*)&TMP$303$4, -1ll, (void*)vr$238, -1ll, 0 );
359 -+ int32 vr$242 = fb_StrCompare( (void*)&TMP$303$4, -1ll, (void*)"gosub-setjmp", 13ll );
360 -+ if( (int64)vr$242 != 0ll ) goto label$545;
361 - label$546:;
362 - {
363 - FBSETOPTION( 22ll, -1ll );
364 -@@ -3472,12 +3481,12 @@ static void HANDLEOPT( int64 OPTID$1, FBSTRING* ARG$1 )
365 - }
366 - label$547:;
367 - label$544:;
368 -- fb_StrDelete( &TMP$300$4 );
369 -+ fb_StrDelete( &TMP$303$4 );
370 - }
371 - }
372 - goto label$391;
373 - label$392:;
374 -- static const void* tmp$658[58ll] = {
375 -+ static const void* tmp$661[58ll] = {
376 - &&label$393,
377 - &&label$394,
378 - &&label$397,
379 -@@ -3538,7 +3547,7 @@ static void HANDLEOPT( int64 OPTID$1, FBSTRING* ARG$1 )
380 - &&label$543,
381 - };
382 - if( TMP$252$2 > 57ull ) goto label$391;
383 -- goto *tmp$658[TMP$252$2 - 0ull];
384 -+ goto *tmp$661[TMP$252$2 - 0ull];
385 - label$391:;
386 - }
387 - label$390:;
388 -@@ -3550,8 +3559,8 @@ static int64 PARSEOPTION( uint8* OPT$1 )
389 - __builtin_memset( &fb$result$1, 0, 8ll );
390 - label$548:;
391 - {
392 -- uint64 TMP$302$2;
393 -- TMP$302$2 = (uint64)*(uint8*)OPT$1;
394 -+ uint64 TMP$305$2;
395 -+ TMP$305$2 = (uint64)*(uint8*)OPT$1;
396 - goto label$551;
397 - label$552:;
398 - {
399 -@@ -4117,7 +4126,7 @@ static int64 PARSEOPTION( uint8* OPT$1 )
400 - }
401 - goto label$550;
402 - label$551:;
403 -- static const void* tmp$659[78ll] = {
404 -+ static const void* tmp$662[78ll] = {
405 - &&label$693,
406 - &&label$550,
407 - &&label$550,
408 -@@ -4197,8 +4206,8 @@ static int64 PARSEOPTION( uint8* OPT$1 )
409 - &&label$550,
410 - &&label$690,
411 - };
412 -- if( (TMP$302$2 - 45ull) > 77ull ) goto label$550;
413 -- goto *tmp$659[TMP$302$2 - 45ull];
414 -+ if( (TMP$305$2 - 45ull) > 77ull ) goto label$550;
415 -+ goto *tmp$662[TMP$305$2 - 45ull];
416 - label$550:;
417 - }
418 - fb$result$1 = -1ll;
419 -@@ -4233,9 +4242,9 @@ static void HANDLEARG( FBSTRING* ARG$1 )
420 - label$705:;
421 - label$704:;
422 - {
423 -- uint8 TMP$364$2;
424 -- TMP$364$2 = *(uint8*)*(uint8**)ARG$1;
425 -- if( (uint64)(int64)TMP$364$2 != 45ull ) goto label$707;
426 -+ uint8 TMP$367$2;
427 -+ TMP$367$2 = *(uint8*)*(uint8**)ARG$1;
428 -+ if( (uint64)(int64)TMP$367$2 != 45ull ) goto label$707;
429 - label$708:;
430 - {
431 - uint8* OPT$3;
432 -@@ -4268,7 +4277,7 @@ static void HANDLEARG( FBSTRING* ARG$1 )
433 - }
434 - goto label$706;
435 - label$707:;
436 -- if( (uint64)(int64)TMP$364$2 != 64ull ) goto label$715;
437 -+ if( (uint64)(int64)TMP$367$2 != 64ull ) goto label$715;
438 - label$716:;
439 - {
440 - static int64 RECLEVEL$3 = 0ll;
441 -@@ -4411,8 +4420,8 @@ static void PARSEARGSFROMFILE( FBSTRING* FILENAME$1 )
442 - int64 CH$4;
443 - CH$4 = (int64)*(uint8*)((uint8*)*(uint8**)&ARGS$1 + I$3);
444 - {
445 -- uint64 TMP$370$5;
446 -- TMP$370$5 = (uint64)CH$4;
447 -+ uint64 TMP$373$5;
448 -+ TMP$373$5 = (uint64)CH$4;
449 - goto label$751;
450 - label$752:;
451 - {
452 -@@ -4441,7 +4450,7 @@ static void PARSEARGSFROMFILE( FBSTRING* FILENAME$1 )
453 - }
454 - goto label$750;
455 - label$751:;
456 -- static const void* tmp$660[8ll] = {
457 -+ static const void* tmp$663[8ll] = {
458 - &&label$752,
459 - &&label$750,
460 - &&label$755,
461 -@@ -4451,8 +4460,8 @@ static void PARSEARGSFROMFILE( FBSTRING* FILENAME$1 )
462 - &&label$750,
463 - &&label$755,
464 - };
465 -- if( (TMP$370$5 - 32ull) > 7ull ) goto label$750;
466 -- goto *tmp$660[TMP$370$5 - 32ull];
467 -+ if( (TMP$373$5 - 32ull) > 7ull ) goto label$750;
468 -+ goto *tmp$663[TMP$373$5 - 32ull];
469 - label$750:;
470 - }
471 - I$3 = I$3 + 1ll;
472 -@@ -4504,9 +4513,9 @@ static int64 HTARGETNEEDSPIC( void )
473 - if( vr$1 == 0ll ) goto label$765;
474 - {
475 - {
476 -- uint64 TMP$372$3;
477 -+ uint64 TMP$375$3;
478 - int64 vr$2 = FBGETOPTION( 3ll );
479 -- TMP$372$3 = (uint64)vr$2;
480 -+ TMP$375$3 = (uint64)vr$2;
481 - goto label$767;
482 - label$768:;
483 - {
484 -@@ -4514,7 +4523,7 @@ static int64 HTARGETNEEDSPIC( void )
485 - }
486 - goto label$766;
487 - label$767:;
488 -- static const void* tmp$661[7ll] = {
489 -+ static const void* tmp$664[7ll] = {
490 - &&label$768,
491 - &&label$766,
492 - &&label$766,
493 -@@ -4523,8 +4532,8 @@ static int64 HTARGETNEEDSPIC( void )
494 - &&label$766,
495 - &&label$768,
496 - };
497 -- if( (TMP$372$3 - 2ull) > 6ull ) goto label$766;
498 -- goto *tmp$661[TMP$372$3 - 2ull];
499 -+ if( (TMP$375$3 - 2ull) > 6ull ) goto label$766;
500 -+ goto *tmp$664[TMP$375$3 - 2ull];
501 - label$766:;
502 - }
503 - }
504 -@@ -4543,8 +4552,8 @@ static void HPARSEARGS( int64 ARGC$1, uint8** ARGV$1 )
505 - {
506 - int64 I$2;
507 - I$2 = 1ll;
508 -- int64 TMP$373$2;
509 -- TMP$373$2 = ARGC$1 + -1ll;
510 -+ int64 TMP$376$2;
511 -+ TMP$376$2 = ARGC$1 + -1ll;
512 - goto label$771;
513 - label$774:;
514 - {
515 -@@ -4554,16 +4563,16 @@ static void HPARSEARGS( int64 ARGC$1, uint8** ARGV$1 )
516 - label$772:;
517 - I$2 = I$2 + 1ll;
518 - label$771:;
519 -- if( I$2 <= TMP$373$2 ) goto label$774;
520 -+ if( I$2 <= TMP$376$2 ) goto label$774;
521 - label$773:;
522 - }
523 - if( *(int64*)&FBC$ < 0ll ) goto label$776;
524 - {
525 -- FBSTRING TMP$374$2;
526 -- __builtin_memset( &TMP$374$2, 0, 24ll );
527 -- FBSTRING* vr$11 = fb_StrAssign( (void*)&TMP$374$2, -1ll, *(void**)((uint8*)((uint8*)ARGV$1 + (ARGC$1 << (3ll & 63ll))) + -8ll), 0ll, 0 );
528 -- HFATALINVALIDOPTION( &TMP$374$2 );
529 -- fb_StrDelete( &TMP$374$2 );
530 -+ FBSTRING TMP$377$2;
531 -+ __builtin_memset( &TMP$377$2, 0, 24ll );
532 -+ FBSTRING* vr$11 = fb_StrAssign( (void*)&TMP$377$2, -1ll, *(void**)((uint8*)((uint8*)ARGV$1 + (ARGC$1 << (3ll & 63ll))) + -8ll), 0ll, 0 );
533 -+ HFATALINVALIDOPTION( &TMP$377$2 );
534 -+ fb_StrDelete( &TMP$377$2 );
535 - }
536 - label$776:;
537 - label$775:;
538 -@@ -4627,9 +4636,9 @@ static void HPARSEARGS( int64 ARGC$1, uint8** ARGV$1 )
539 - label$790:;
540 - label$789:;
541 - {
542 -- uint64 TMP$375$2;
543 -+ uint64 TMP$378$2;
544 - int64 vr$33 = FBGETOPTION( 3ll );
545 -- TMP$375$2 = (uint64)vr$33;
546 -+ TMP$378$2 = (uint64)vr$33;
547 - goto label$792;
548 - label$793:;
549 - {
550 -@@ -4650,21 +4659,21 @@ static void HPARSEARGS( int64 ARGC$1, uint8** ARGV$1 )
551 - }
552 - goto label$791;
553 - label$792:;
554 -- static const void* tmp$662[5ll] = {
555 -+ static const void* tmp$665[5ll] = {
556 - &&label$793,
557 - &&label$793,
558 - &&label$794,
559 - &&label$794,
560 - &&label$793,
561 - };
562 -- if( TMP$375$2 > 4ull ) goto label$794;
563 -- goto *tmp$662[TMP$375$2 - 0ull];
564 -+ if( TMP$378$2 > 4ull ) goto label$794;
565 -+ goto *tmp$665[TMP$378$2 - 0ull];
566 - label$791:;
567 - }
568 - {
569 -- uint64 TMP$376$2;
570 -+ uint64 TMP$379$2;
571 - int64 vr$37 = FBGETOPTION( 3ll );
572 -- TMP$376$2 = (uint64)vr$37;
573 -+ TMP$379$2 = (uint64)vr$37;
574 - goto label$798;
575 - label$799:;
576 - {
577 -@@ -4683,7 +4692,7 @@ static void HPARSEARGS( int64 ARGC$1, uint8** ARGV$1 )
578 - }
579 - goto label$797;
580 - label$798:;
581 -- static const void* tmp$663[7ll] = {
582 -+ static const void* tmp$666[7ll] = {
583 - &&label$799,
584 - &&label$800,
585 - &&label$800,
586 -@@ -4692,31 +4701,31 @@ static void HPARSEARGS( int64 ARGC$1, uint8** ARGV$1 )
587 - &&label$799,
588 - &&label$799,
589 - };
590 -- if( (TMP$376$2 - 2ull) > 6ull ) goto label$800;
591 -- goto *tmp$663[TMP$376$2 - 2ull];
592 -+ if( (TMP$379$2 - 2ull) > 6ull ) goto label$800;
593 -+ goto *tmp$666[TMP$379$2 - 2ull];
594 - label$797:;
595 - }
596 - if( *(int64*)((uint8*)&FBC$ + 64ll) < 0ll ) goto label$804;
597 - {
598 - {
599 -- int64 TMP$377$3;
600 -+ int64 TMP$380$3;
601 - int64 vr$40 = FBGETCPUFAMILY( );
602 -- TMP$377$3 = vr$40;
603 -- if( TMP$377$3 == 0ll ) goto label$807;
604 -+ TMP$380$3 = vr$40;
605 -+ if( TMP$380$3 == 0ll ) goto label$807;
606 - label$808:;
607 -- if( TMP$377$3 != 1ll ) goto label$806;
608 -+ if( TMP$380$3 != 1ll ) goto label$806;
609 - label$807:;
610 - {
611 - }
612 - goto label$805;
613 - label$806:;
614 - {
615 -- FBSTRING TMP$378$4;
616 -- __builtin_memset( &TMP$378$4, 0, 24ll );
617 -+ FBSTRING TMP$381$4;
618 -+ __builtin_memset( &TMP$381$4, 0, 24ll );
619 - FBSTRING* vr$42 = FBGETTARGETID( );
620 -- FBSTRING* vr$44 = fb_StrAssign( (void*)&TMP$378$4, -1ll, (void*)vr$42, -1ll, 0 );
621 -- ERRREPORTEX( 319ll, *(uint8**)&TMP$378$4, -1ll, 1ll, (uint8*)0ull );
622 -- fb_StrDelete( &TMP$378$4 );
623 -+ FBSTRING* vr$44 = fb_StrAssign( (void*)&TMP$381$4, -1ll, (void*)vr$42, -1ll, 0 );
624 -+ ERRREPORTEX( 319ll, *(uint8**)&TMP$381$4, -1ll, 1ll, (uint8*)0ull );
625 -+ fb_StrDelete( &TMP$381$4 );
626 - }
627 - label$809:;
628 - label$805:;
629 -@@ -4775,27 +4784,27 @@ static void FBCDETERMINEPREFIX( void )
630 - int64 vr$1 = fb_StrLen( (void*)((uint8*)&FBC$ + 2576ll), 261ll );
631 - if( vr$1 != 0ll ) goto label$824;
632 - {
633 -- FBSTRING TMP$379$2;
634 -- FBSTRING TMP$380$2;
635 -+ FBSTRING TMP$382$2;
636 - FBSTRING TMP$383$2;
637 -- __builtin_memset( &TMP$379$2, 0, 24ll );
638 -+ FBSTRING TMP$386$2;
639 -+ __builtin_memset( &TMP$382$2, 0, 24ll );
640 - FBSTRING* vr$3 = fb_ExePath( );
641 -- FBSTRING* vr$5 = fb_StrAssign( (void*)&TMP$379$2, -1ll, (void*)vr$3, -1ll, 0 );
642 -- FBSTRING* vr$7 = PATHSTRIPDIV( &TMP$379$2 );
643 -- __builtin_memset( &TMP$380$2, 0, 24ll );
644 -- FBSTRING* vr$10 = fb_StrConcat( &TMP$380$2, (void*)vr$7, -1ll, (void*)"/", 2ll );
645 -- fb_StrAssign( (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)vr$10, -1ll, 0 );
646 -- fb_StrDelete( &TMP$379$2 );
647 -+ FBSTRING* vr$5 = fb_StrAssign( (void*)&TMP$382$2, -1ll, (void*)vr$3, -1ll, 0 );
648 -+ FBSTRING* vr$7 = PATHSTRIPDIV( &TMP$382$2 );
649 - __builtin_memset( &TMP$383$2, 0, 24ll );
650 -- FBSTRING* vr$16 = fb_StrConcat( &TMP$383$2, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"../", 4ll );
651 -+ FBSTRING* vr$10 = fb_StrConcat( &TMP$383$2, (void*)vr$7, -1ll, (void*)"/", 2ll );
652 -+ fb_StrAssign( (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)vr$10, -1ll, 0 );
653 -+ fb_StrDelete( &TMP$382$2 );
654 -+ __builtin_memset( &TMP$386$2, 0, 24ll );
655 -+ FBSTRING* vr$16 = fb_StrConcat( &TMP$386$2, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"../", 4ll );
656 - fb_StrAssign( (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)vr$16, -1ll, 0 );
657 - }
658 - goto label$823;
659 - label$824:;
660 - {
661 -- FBSTRING TMP$384$2;
662 -- __builtin_memset( &TMP$384$2, 0, 24ll );
663 -- FBSTRING* vr$21 = fb_StrConcat( &TMP$384$2, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"/", 2ll );
664 -+ FBSTRING TMP$387$2;
665 -+ __builtin_memset( &TMP$387$2, 0, 24ll );
666 -+ FBSTRING* vr$21 = fb_StrConcat( &TMP$387$2, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"/", 2ll );
667 - fb_StrAssign( (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)vr$21, -1ll, 0 );
668 - }
669 - label$823:;
670 -@@ -4804,9 +4813,6 @@ static void FBCDETERMINEPREFIX( void )
671 -
672 - static void FBCSETUPCOMPILERPATHS( void )
673 - {
674 -- FBSTRING TMP$387$1;
675 -- FBSTRING TMP$388$1;
676 -- FBSTRING TMP$389$1;
677 - FBSTRING TMP$390$1;
678 - FBSTRING TMP$391$1;
679 - FBSTRING TMP$392$1;
680 -@@ -4815,6 +4821,9 @@ static void FBCSETUPCOMPILERPATHS( void )
681 - FBSTRING TMP$395$1;
682 - FBSTRING TMP$396$1;
683 - FBSTRING TMP$397$1;
684 -+ FBSTRING TMP$398$1;
685 -+ FBSTRING TMP$399$1;
686 -+ FBSTRING TMP$400$1;
687 - label$825:;
688 - FBSTRING TARGETID$1;
689 - FBSTRING* vr$0 = FBGETTARGETID( );
690 -@@ -4824,30 +4833,30 @@ static void FBCSETUPCOMPILERPATHS( void )
691 - fb_StrAssign( (void*)&FBNAME$1, -1ll, (void*)"freebasic", 10ll, 0 );
692 - FBSTRING LIBDIRNAME$1;
693 - FBSTRING* vr$6 = fb_StrInit( (void*)&LIBDIRNAME$1, -1ll, (void*)"lib", 4ll, 0 );
694 -- __builtin_memset( &TMP$387$1, 0, 24ll );
695 -- FBSTRING* vr$11 = fb_StrConcat( &TMP$387$1, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"bin", 4ll );
696 -- __builtin_memset( &TMP$388$1, 0, 24ll );
697 -- FBSTRING* vr$14 = fb_StrConcat( &TMP$388$1, (void*)vr$11, -1ll, (void*)"/", 2ll );
698 -- __builtin_memset( &TMP$389$1, 0, 24ll );
699 -- FBSTRING* vr$17 = fb_StrConcat( &TMP$389$1, (void*)vr$14, -1ll, (void*)((uint8*)&FBC$ + 2295ll), 129ll );
700 -- fb_StrAssign( (void*)((uint8*)&FBC$ + 2837ll), 261ll, (void*)vr$17, -1ll, 0 );
701 - __builtin_memset( &TMP$390$1, 0, 24ll );
702 -- FBSTRING* vr$23 = fb_StrConcat( &TMP$390$1, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"include", 8ll );
703 -+ FBSTRING* vr$11 = fb_StrConcat( &TMP$390$1, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"bin", 4ll );
704 - __builtin_memset( &TMP$391$1, 0, 24ll );
705 -- FBSTRING* vr$26 = fb_StrConcat( &TMP$391$1, (void*)vr$23, -1ll, (void*)"/", 2ll );
706 -+ FBSTRING* vr$14 = fb_StrConcat( &TMP$391$1, (void*)vr$11, -1ll, (void*)"/", 2ll );
707 - __builtin_memset( &TMP$392$1, 0, 24ll );
708 -- FBSTRING* vr$29 = fb_StrConcat( &TMP$392$1, (void*)vr$26, -1ll, (void*)&FBNAME$1, -1ll );
709 -- fb_StrAssign( (void*)((uint8*)&FBC$ + 3098ll), 261ll, (void*)vr$29, -1ll, 0 );
710 -+ FBSTRING* vr$17 = fb_StrConcat( &TMP$392$1, (void*)vr$14, -1ll, (void*)((uint8*)&FBC$ + 2295ll), 129ll );
711 -+ fb_StrAssign( (void*)((uint8*)&FBC$ + 2837ll), 261ll, (void*)vr$17, -1ll, 0 );
712 - __builtin_memset( &TMP$393$1, 0, 24ll );
713 -- FBSTRING* vr$37 = fb_StrConcat( &TMP$393$1, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)&LIBDIRNAME$1, -1ll );
714 -+ FBSTRING* vr$23 = fb_StrConcat( &TMP$393$1, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)"include", 8ll );
715 - __builtin_memset( &TMP$394$1, 0, 24ll );
716 -- FBSTRING* vr$40 = fb_StrConcat( &TMP$394$1, (void*)vr$37, -1ll, (void*)"/", 2ll );
717 -+ FBSTRING* vr$26 = fb_StrConcat( &TMP$394$1, (void*)vr$23, -1ll, (void*)"/", 2ll );
718 - __builtin_memset( &TMP$395$1, 0, 24ll );
719 -- FBSTRING* vr$43 = fb_StrConcat( &TMP$395$1, (void*)vr$40, -1ll, (void*)&FBNAME$1, -1ll );
720 -+ FBSTRING* vr$29 = fb_StrConcat( &TMP$395$1, (void*)vr$26, -1ll, (void*)&FBNAME$1, -1ll );
721 -+ fb_StrAssign( (void*)((uint8*)&FBC$ + 3098ll), 261ll, (void*)vr$29, -1ll, 0 );
722 - __builtin_memset( &TMP$396$1, 0, 24ll );
723 -- FBSTRING* vr$46 = fb_StrConcat( &TMP$396$1, (void*)vr$43, -1ll, (void*)"/", 2ll );
724 -+ FBSTRING* vr$37 = fb_StrConcat( &TMP$396$1, (void*)((uint8*)&FBC$ + 2576ll), 261ll, (void*)&LIBDIRNAME$1, -1ll );
725 - __builtin_memset( &TMP$397$1, 0, 24ll );
726 -- FBSTRING* vr$49 = fb_StrConcat( &TMP$397$1, (void*)vr$46, -1ll, (void*)&TARGETID$1, -1ll );
727 -+ FBSTRING* vr$40 = fb_StrConcat( &TMP$397$1, (void*)vr$37, -1ll, (void*)"/", 2ll );
728 -+ __builtin_memset( &TMP$398$1, 0, 24ll );
729 -+ FBSTRING* vr$43 = fb_StrConcat( &TMP$398$1, (void*)vr$40, -1ll, (void*)&FBNAME$1, -1ll );
730 -+ __builtin_memset( &TMP$399$1, 0, 24ll );
731 -+ FBSTRING* vr$46 = fb_StrConcat( &TMP$399$1, (void*)vr$43, -1ll, (void*)"/", 2ll );
732 -+ __builtin_memset( &TMP$400$1, 0, 24ll );
733 -+ FBSTRING* vr$49 = fb_StrConcat( &TMP$400$1, (void*)vr$46, -1ll, (void*)&TARGETID$1, -1ll );
734 - fb_StrAssign( (void*)((uint8*)&FBC$ + 3359ll), 261ll, (void*)vr$49, -1ll, 0 );
735 - fb_StrDelete( &LIBDIRNAME$1 );
736 - fb_StrDelete( &FBNAME$1 );
737 -@@ -4857,17 +4866,17 @@ static void FBCSETUPCOMPILERPATHS( void )
738 -
739 - static void FBCPRINTTARGETINFO( void )
740 - {
741 -- FBSTRING TMP$399$1;
742 -- FBSTRING TMP$400$1;
743 -+ FBSTRING TMP$402$1;
744 -+ FBSTRING TMP$403$1;
745 - label$827:;
746 - FBSTRING S$1;
747 - FBSTRING* vr$0 = FBGETTARGETID( );
748 - FBSTRING* vr$2 = fb_StrInit( (void*)&S$1, -1ll, (void*)vr$0, -1ll, 0 );
749 - uint8* vr$3 = FBGETFBCARCH( );
750 -- __builtin_memset( &TMP$399$1, 0, 24ll );
751 -- FBSTRING* vr$6 = fb_StrConcat( &TMP$399$1, (void*)", ", 3ll, (void*)vr$3, 0ll );
752 -- __builtin_memset( &TMP$400$1, 0, 24ll );
753 -- FBSTRING* vr$10 = fb_StrConcat( &TMP$400$1, (void*)&S$1, -1ll, (void*)vr$6, -1ll );
754 -+ __builtin_memset( &TMP$402$1, 0, 24ll );
755 -+ FBSTRING* vr$6 = fb_StrConcat( &TMP$402$1, (void*)", ", 3ll, (void*)vr$3, 0ll );
756 -+ __builtin_memset( &TMP$403$1, 0, 24ll );
757 -+ FBSTRING* vr$10 = fb_StrConcat( &TMP$403$1, (void*)&S$1, -1ll, (void*)vr$6, -1ll );
758 - FBSTRING* vr$12 = fb_StrAssign( (void*)&S$1, -1ll, (void*)vr$10, -1ll, 0 );
759 - FBSTRING* vr$14 = fb_StrConcatAssign( (void*)&S$1, -1ll, (void*)", ", 3ll, 0 );
760 - int64 vr$15 = FBGETBITS( );
761 -@@ -4896,7 +4905,7 @@ static void FBCDETERMINEMAINNAME( void )
762 - int64 vr$1 = fb_StrLen( (void*)((uint8*)&FBC$ + 1117ll), 261ll );
763 - if( vr$1 != 0ll ) goto label$834;
764 - {
765 -- FBSTRING TMP$406$2;
766 -+ FBSTRING TMP$409$2;
767 - struct $9FBCIOFILE* M$2;
768 - void* vr$3 = LISTGETHEAD( (struct $5TLIST*)((uint8*)&FBC$ + 144ll) );
769 - M$2 = (struct $9FBCIOFILE*)vr$3;
770 -@@ -4922,11 +4931,11 @@ static void FBCDETERMINEMAINNAME( void )
771 - label$837:;
772 - }
773 - label$835:;
774 -- __builtin_memset( &TMP$406$2, 0, 24ll );
775 -- FBSTRING* vr$14 = fb_StrAssign( (void*)&TMP$406$2, -1ll, (void*)((uint8*)&FBC$ + 1117ll), 261ll, 0 );
776 -- FBSTRING* vr$16 = HSTRIPEXT( &TMP$406$2 );
777 -+ __builtin_memset( &TMP$409$2, 0, 24ll );
778 -+ FBSTRING* vr$14 = fb_StrAssign( (void*)&TMP$409$2, -1ll, (void*)((uint8*)&FBC$ + 1117ll), 261ll, 0 );
779 -+ FBSTRING* vr$16 = HSTRIPEXT( &TMP$409$2 );
780 - fb_StrAssign( (void*)((uint8*)&FBC$ + 1117ll), 261ll, (void*)vr$16, -1ll, 0 );
781 -- fb_StrDelete( &TMP$406$2 );
782 -+ fb_StrDelete( &TMP$409$2 );
783 - }
784 - label$834:;
785 - label$833:;
786 -@@ -4935,7 +4944,7 @@ static void FBCDETERMINEMAINNAME( void )
787 -
788 - static FBSTRING* HGETASMNAME( struct $9FBCIOFILE* MODULE$1, int64 STAGE$1 )
789 - {
790 -- FBSTRING TMP$411$1;
791 -+ FBSTRING TMP$414$1;
792 - FBSTRING fb$result$1;
793 - __builtin_memset( &fb$result$1, 0, 24ll );
794 - label$839:;
795 -@@ -4948,17 +4957,17 @@ static FBSTRING* HGETASMNAME( struct $9FBCIOFILE* MODULE$1, int64 STAGE$1 )
796 - if( STAGE$1 != 1ll ) goto label$842;
797 - {
798 - {
799 -- int64 TMP$408$3;
800 -+ int64 TMP$411$3;
801 - int64 vr$6 = FBGETOPTION( 2ll );
802 -- TMP$408$3 = vr$6;
803 -- if( TMP$408$3 != 1ll ) goto label$844;
804 -+ TMP$411$3 = vr$6;
805 -+ if( TMP$411$3 != 1ll ) goto label$844;
806 - label$845:;
807 - {
808 - EXT$1 = (uint8*)".c";
809 - }
810 - goto label$843;
811 - label$844:;
812 -- if( TMP$408$3 != 2ll ) goto label$846;
813 -+ if( TMP$411$3 != 2ll ) goto label$846;
814 - label$847:;
815 - {
816 - EXT$1 = (uint8*)".ll";
817 -@@ -4969,8 +4978,8 @@ static FBSTRING* HGETASMNAME( struct $9FBCIOFILE* MODULE$1, int64 STAGE$1 )
818 - }
819 - label$842:;
820 - label$841:;
821 -- __builtin_memset( &TMP$411$1, 0, 24ll );
822 -- FBSTRING* vr$10 = fb_StrConcat( &TMP$411$1, (void*)&ASMFILE$1, -1ll, (void*)EXT$1, 0ll );
823 -+ __builtin_memset( &TMP$414$1, 0, 24ll );
824 -+ FBSTRING* vr$10 = fb_StrConcat( &TMP$414$1, (void*)&ASMFILE$1, -1ll, (void*)EXT$1, 0ll );
825 - FBSTRING* vr$12 = fb_StrAssign( (void*)&ASMFILE$1, -1ll, (void*)vr$10, -1ll, 0 );
826 - FBSTRING* vr$15 = fb_StrAssign( (void*)&fb$result$1, -1ll, (void*)&ASMFILE$1, -1ll, 0 );
827 - fb_StrDelete( &ASMFILE$1 );
828 -@@ -5004,10 +5013,10 @@ static void HCOMPILEBAS( struct $9FBCIOFILE* MODULE$1, int64 IS_MAIN$1, int64 IS
829 - FBSTRING* vr$15 = fb_StrAssign( (void*)&PPONLYFILE$1, -1ll, *(void**)((uint8*)MODULE$1 + 24ll), -1ll, 0 );
830 - if( *(int64*)((uint8*)MODULE$1 + 32ll) != 0ll ) goto label$855;
831 - {
832 -- FBSTRING TMP$413$3;
833 -+ FBSTRING TMP$416$3;
834 - FBSTRING* vr$18 = HSTRIPEXT( &PPONLYFILE$1 );
835 -- __builtin_memset( &TMP$413$3, 0, 24ll );
836 -- FBSTRING* vr$21 = fb_StrConcat( &TMP$413$3, (void*)vr$18, -1ll, (void*)".pp.bas", 8ll );
837 -+ __builtin_memset( &TMP$416$3, 0, 24ll );
838 -+ FBSTRING* vr$21 = fb_StrConcat( &TMP$416$3, (void*)vr$18, -1ll, (void*)".pp.bas", 8ll );
839 - FBSTRING* vr$23 = fb_StrAssign( (void*)&PPONLYFILE$1, -1ll, (void*)vr$21, -1ll, 0 );
840 - }
841 - label$855:;
842 -@@ -5026,9 +5035,9 @@ static void HCOMPILEBAS( struct $9FBCIOFILE* MODULE$1, int64 IS_MAIN$1, int64 IS
843 - int64 vr$29 = FBGETOPTION( 1ll );
844 - if( vr$29 == 0ll ) goto label$859;
845 - {
846 -- FBSTRING TMP$417$3;
847 -- __builtin_memset( &TMP$417$3, 0, 24ll );
848 -- FBSTRING* vr$33 = fb_StrConcat( &TMP$417$3, (void*)" -pp ", 6ll, (void*)&PPONLYFILE$1, -1ll );
849 -+ FBSTRING TMP$420$3;
850 -+ __builtin_memset( &TMP$420$3, 0, 24ll );
851 -+ FBSTRING* vr$33 = fb_StrConcat( &TMP$420$3, (void*)" -pp ", 6ll, (void*)&PPONLYFILE$1, -1ll );
852 - fb_PrintString( 0, vr$33, 0 );
853 - }
854 - label$859:;
855 -@@ -5120,12 +5129,12 @@ static void HCOMPILEMODULES( void )
856 - struct $9FBCIOFILE* MODULE$1;
857 - ISMAIN$1 = 0ll;
858 - {
859 -- int64 TMP$420$2;
860 -+ int64 TMP$423$2;
861 - int64 vr$1 = FBGETOPTION( 0ll );
862 -- TMP$420$2 = vr$1;
863 -- if( TMP$420$2 == 0ll ) goto label$880;
864 -+ TMP$423$2 = vr$1;
865 -+ if( TMP$423$2 == 0ll ) goto label$880;
866 - label$881:;
867 -- if( TMP$420$2 != 2ll ) goto label$879;
868 -+ if( TMP$423$2 != 2ll ) goto label$879;
869 - label$880:;
870 - {
871 - CHECKMAIN$1 = -1ll;
872 -@@ -5160,14 +5169,14 @@ static void HCOMPILEMODULES( void )
873 - {
874 - if( CHECKMAIN$1 == 0ll ) goto label$891;
875 - {
876 -- FBSTRING TMP$421$3;
877 -- __builtin_memset( &TMP$421$3, 0, 24ll );
878 -+ FBSTRING TMP$424$3;
879 -+ __builtin_memset( &TMP$424$3, 0, 24ll );
880 - FBSTRING* vr$16 = HSTRIPEXT( (FBSTRING*)MODULE$1 );
881 -- FBSTRING* vr$18 = fb_StrAssign( (void*)&TMP$421$3, -1ll, (void*)vr$16, -1ll, 0 );
882 -- FBSTRING* vr$19 = HSTRIPPATH( *(uint8**)&TMP$421$3 );
883 -+ FBSTRING* vr$18 = fb_StrAssign( (void*)&TMP$424$3, -1ll, (void*)vr$16, -1ll, 0 );
884 -+ FBSTRING* vr$19 = HSTRIPPATH( *(uint8**)&TMP$424$3 );
885 - int32 vr$21 = fb_StrCompare( (void*)&MAINFILE$1, -1ll, (void*)vr$19, -1ll );
886 - ISMAIN$1 = (int64)-((int64)vr$21 == 0ll);
887 -- fb_StrDelete( &TMP$421$3 );
888 -+ fb_StrDelete( &TMP$424$3 );
889 - }
890 - label$891:;
891 - label$890:;
892 -@@ -5184,24 +5193,24 @@ static void HCOMPILEMODULES( void )
893 -
894 - static int64 HPARSEXPM( FBSTRING* XPMFILE$1, FBSTRING* CODE$1 )
895 - {
896 -- FBSTRING TMP$423$1;
897 -- FBSTRING TMP$425$1;
898 -- FBSTRING TMP$427$1;
899 -- FBSTRING TMP$435$1;
900 -- FBSTRING TMP$437$1;
901 -- FBSTRING TMP$439$1;
902 -- FBSTRING TMP$443$1;
903 -+ FBSTRING TMP$426$1;
904 -+ FBSTRING TMP$428$1;
905 -+ FBSTRING TMP$430$1;
906 -+ FBSTRING TMP$438$1;
907 -+ FBSTRING TMP$440$1;
908 -+ FBSTRING TMP$442$1;
909 -+ FBSTRING TMP$446$1;
910 - int64 fb$result$1;
911 - __builtin_memset( &fb$result$1, 0, 8ll );
912 - label$892:;
913 -- __builtin_memset( &TMP$423$1, 0, 24ll );
914 -- FBSTRING* vr$3 = fb_StrConcat( &TMP$423$1, (void*)CODE$1, -1ll, (void*)"\x0A" "dim shared as zstring ptr ", 28ll );
915 -+ __builtin_memset( &TMP$426$1, 0, 24ll );
916 -+ FBSTRING* vr$3 = fb_StrConcat( &TMP$426$1, (void*)CODE$1, -1ll, (void*)"\x0A" "dim shared as zstring ptr ", 28ll );
917 - FBSTRING* vr$4 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$3, -1ll, 0 );
918 -- __builtin_memset( &TMP$425$1, 0, 24ll );
919 -- FBSTRING* vr$7 = fb_StrConcat( &TMP$425$1, (void*)CODE$1, -1ll, (void*)"fb_program_icon_data", 21ll );
920 -+ __builtin_memset( &TMP$428$1, 0, 24ll );
921 -+ FBSTRING* vr$7 = fb_StrConcat( &TMP$428$1, (void*)CODE$1, -1ll, (void*)"fb_program_icon_data", 21ll );
922 - FBSTRING* vr$8 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$7, -1ll, 0 );
923 -- __builtin_memset( &TMP$427$1, 0, 24ll );
924 -- FBSTRING* vr$11 = fb_StrConcat( &TMP$427$1, (void*)CODE$1, -1ll, (void*)"(0 to ...) = _\x0A{ _\x0A", 20ll );
925 -+ __builtin_memset( &TMP$430$1, 0, 24ll );
926 -+ FBSTRING* vr$11 = fb_StrConcat( &TMP$430$1, (void*)CODE$1, -1ll, (void*)"(0 to ...) = _\x0A{ _\x0A", 20ll );
927 - FBSTRING* vr$12 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$11, -1ll, 0 );
928 - int64 F$1;
929 - int32 vr$13 = fb_FileFree( );
930 -@@ -5249,21 +5258,21 @@ static int64 HPARSEXPM( FBSTRING* XPMFILE$1, FBSTRING* CODE$1 )
931 - int64 vr$54 = fb_StrLen( (void*)&LN$1, -1ll );
932 - if( vr$54 <= 0ll ) goto label$902;
933 - {
934 -- FBSTRING TMP$432$3;
935 -- FBSTRING TMP$433$3;
936 -+ FBSTRING TMP$435$3;
937 -+ FBSTRING TMP$436$3;
938 - if( SAW_ROWS$1 == 0ll ) goto label$904;
939 - {
940 -- FBSTRING TMP$430$4;
941 -- __builtin_memset( &TMP$430$4, 0, 24ll );
942 -- FBSTRING* vr$57 = fb_StrConcat( &TMP$430$4, (void*)CODE$1, -1ll, (void*)", _\x0A", 5ll );
943 -+ FBSTRING TMP$433$4;
944 -+ __builtin_memset( &TMP$433$4, 0, 24ll );
945 -+ FBSTRING* vr$57 = fb_StrConcat( &TMP$433$4, (void*)CODE$1, -1ll, (void*)", _\x0A", 5ll );
946 - FBSTRING* vr$58 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$57, -1ll, 0 );
947 - }
948 - label$904:;
949 - label$903:;
950 -- __builtin_memset( &TMP$432$3, 0, 24ll );
951 -- FBSTRING* vr$62 = fb_StrConcat( &TMP$432$3, (void*)"\x09@", 3ll, (void*)&LN$1, -1ll );
952 -- __builtin_memset( &TMP$433$3, 0, 24ll );
953 -- FBSTRING* vr$65 = fb_StrConcat( &TMP$433$3, (void*)CODE$1, -1ll, (void*)vr$62, -1ll );
954 -+ __builtin_memset( &TMP$435$3, 0, 24ll );
955 -+ FBSTRING* vr$62 = fb_StrConcat( &TMP$435$3, (void*)"\x09@", 3ll, (void*)&LN$1, -1ll );
956 -+ __builtin_memset( &TMP$436$3, 0, 24ll );
957 -+ FBSTRING* vr$65 = fb_StrConcat( &TMP$436$3, (void*)CODE$1, -1ll, (void*)vr$62, -1ll );
958 - FBSTRING* vr$66 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$65, -1ll, 0 );
959 - SAW_ROWS$1 = -1ll;
960 - }
961 -@@ -5284,17 +5293,17 @@ static int64 HPARSEXPM( FBSTRING* XPMFILE$1, FBSTRING* CODE$1 )
962 - }
963 - label$907:;
964 - label$906:;
965 -- __builtin_memset( &TMP$435$1, 0, 24ll );
966 -- FBSTRING* vr$74 = fb_StrConcat( &TMP$435$1, (void*)CODE$1, -1ll, (void*)" _ \x0A", 5ll );
967 -+ __builtin_memset( &TMP$438$1, 0, 24ll );
968 -+ FBSTRING* vr$74 = fb_StrConcat( &TMP$438$1, (void*)CODE$1, -1ll, (void*)" _ \x0A", 5ll );
969 - FBSTRING* vr$75 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$74, -1ll, 0 );
970 -- __builtin_memset( &TMP$437$1, 0, 24ll );
971 -- FBSTRING* vr$78 = fb_StrConcat( &TMP$437$1, (void*)CODE$1, -1ll, (void*)"}\x0A\x0A", 4ll );
972 -+ __builtin_memset( &TMP$440$1, 0, 24ll );
973 -+ FBSTRING* vr$78 = fb_StrConcat( &TMP$440$1, (void*)CODE$1, -1ll, (void*)"}\x0A\x0A", 4ll );
974 - FBSTRING* vr$79 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$78, -1ll, 0 );
975 -- __builtin_memset( &TMP$439$1, 0, 24ll );
976 -- FBSTRING* vr$82 = fb_StrConcat( &TMP$439$1, (void*)CODE$1, -1ll, (void*)"extern as zstring ptr ptr fb_program_icon alias \x22" "fb_program_icon\x22\x0A", 67ll );
977 -+ __builtin_memset( &TMP$442$1, 0, 24ll );
978 -+ FBSTRING* vr$82 = fb_StrConcat( &TMP$442$1, (void*)CODE$1, -1ll, (void*)"extern as zstring ptr ptr fb_program_icon alias \x22" "fb_program_icon\x22\x0A", 67ll );
979 - FBSTRING* vr$83 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$82, -1ll, 0 );
980 -- __builtin_memset( &TMP$443$1, 0, 24ll );
981 -- FBSTRING* vr$86 = fb_StrConcat( &TMP$443$1, (void*)CODE$1, -1ll, (void*)"dim shared as zstring ptr ptr fb_program_icon = @fb_program_icon_data(0)\x0A", 74ll );
982 -+ __builtin_memset( &TMP$446$1, 0, 24ll );
983 -+ FBSTRING* vr$86 = fb_StrConcat( &TMP$446$1, (void*)CODE$1, -1ll, (void*)"dim shared as zstring ptr ptr fb_program_icon = @fb_program_icon_data(0)\x0A", 74ll );
984 - FBSTRING* vr$87 = fb_StrAssign( (void*)CODE$1, -1ll, (void*)vr$86, -1ll, 0 );
985 - fb$result$1 = -1ll;
986 - fb_StrDelete( &LN$1 );
987 -@@ -5304,7 +5313,7 @@ static int64 HPARSEXPM( FBSTRING* XPMFILE$1, FBSTRING* CODE$1 )
988 -
989 - static int64 HCOMPILEXPM( void )
990 - {
991 -- int64 TMP$448$1;
992 -+ int64 TMP$451$1;
993 - int64 fb$result$1;
994 - __builtin_memset( &fb$result$1, 0, 8ll );
995 - label$908:;
996 -@@ -5335,14 +5344,14 @@ static int64 HCOMPILEXPM( void )
997 - FBSTRING* vr$15 = fb_StrConcatAssign( (void*)((uint8*)&FBC$ + 272ll), -1ll, (void*)".bas", 5ll, 0 );
998 - if( *(int64*)((uint8*)&FBC$ + 112ll) == 0ll ) goto label$915;
999 - {
1000 -- FBSTRING TMP$446$2;
1001 -- FBSTRING TMP$447$2;
1002 -+ FBSTRING TMP$449$2;
1003 -+ FBSTRING TMP$450$2;
1004 - FBSTRING* vr$16 = fb_StrAllocTempDescZEx( (uint8*)"parsing xpm: ", 13ll );
1005 - fb_PrintString( 0, vr$16, 2 );
1006 -- __builtin_memset( &TMP$446$2, 0, 24ll );
1007 -- FBSTRING* vr$21 = fb_StrConcat( &TMP$446$2, (void*)&XPMFILE$1, -1ll, (void*)" -o ", 5ll );
1008 -- __builtin_memset( &TMP$447$2, 0, 24ll );
1009 -- FBSTRING* vr$24 = fb_StrConcat( &TMP$447$2, (void*)vr$21, -1ll, (void*)((uint8*)&FBC$ + 272ll), -1ll );
1010 -+ __builtin_memset( &TMP$449$2, 0, 24ll );
1011 -+ FBSTRING* vr$21 = fb_StrConcat( &TMP$449$2, (void*)&XPMFILE$1, -1ll, (void*)" -o ", 5ll );
1012 -+ __builtin_memset( &TMP$450$2, 0, 24ll );
1013 -+ FBSTRING* vr$24 = fb_StrConcat( &TMP$450$2, (void*)vr$21, -1ll, (void*)((uint8*)&FBC$ + 272ll), -1ll );
1014 - fb_PrintString( 0, vr$24, 1 );
1015 - }
1016 - label$915:;
1017 -@@ -5367,8 +5376,8 @@ static int64 HCOMPILEXPM( void )
1018 - }
1019 - label$919:;
1020 - label$918:;
1021 -- TMP$448$1 = FO$1;
1022 -- fb_PrintString( (int32)TMP$448$1, &CODE$1, 0 );
1023 -+ TMP$451$1 = FO$1;
1024 -+ fb_PrintString( (int32)TMP$451$1, &CODE$1, 0 );
1025 - int32 vr$41 = fb_FileClose( (int32)FO$1 );
1026 - if( (int64)vr$41 == 0ll ) goto label$920;
1027 - void* vr$43 = fb_ErrorThrowAt( 2805, (uint8*)"src/compiler/fbc.bas", (void*)0ull, (void*)0ull );
1028 -@@ -5406,24 +5415,24 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1029 - label$926:;
1030 - label$925:;
1031 - {
1032 -- int64 TMP$449$2;
1033 -+ int64 TMP$452$2;
1034 - int64 vr$7 = FBGETOPTION( 2ll );
1035 -- TMP$449$2 = vr$7;
1036 -- if( TMP$449$2 != 1ll ) goto label$928;
1037 -+ TMP$452$2 = vr$7;
1038 -+ if( TMP$452$2 != 1ll ) goto label$928;
1039 - label$929:;
1040 - {
1041 - {
1042 -- int64 TMP$450$4;
1043 -+ int64 TMP$453$4;
1044 - int64 vr$8 = FBGETCPUFAMILY( );
1045 -- TMP$450$4 = vr$8;
1046 -- if( TMP$450$4 != 0ll ) goto label$931;
1047 -+ TMP$453$4 = vr$8;
1048 -+ if( TMP$453$4 != 0ll ) goto label$931;
1049 - label$932:;
1050 - {
1051 - FBSTRING* vr$10 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"-m32 ", 6ll, 0 );
1052 - }
1053 - goto label$930;
1054 - label$931:;
1055 -- if( TMP$450$4 != 1ll ) goto label$933;
1056 -+ if( TMP$453$4 != 1ll ) goto label$933;
1057 - label$934:;
1058 - {
1059 - FBSTRING* vr$12 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"-m64 ", 6ll, 0 );
1060 -@@ -5438,16 +5447,16 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1061 - goto label$935;
1062 - label$936:;
1063 - {
1064 -- FBSTRING TMP$455$4;
1065 -- FBSTRING TMP$456$4;
1066 -- FBSTRING TMP$457$4;
1067 -+ FBSTRING TMP$458$4;
1068 -+ FBSTRING TMP$459$4;
1069 -+ FBSTRING TMP$460$4;
1070 - uint8* vr$15 = FBGETGCCARCH( );
1071 -- __builtin_memset( &TMP$455$4, 0, 24ll );
1072 -- FBSTRING* vr$18 = fb_StrConcat( &TMP$455$4, (void*)"-march=", 8ll, (void*)vr$15, 0ll );
1073 -- __builtin_memset( &TMP$456$4, 0, 24ll );
1074 -- FBSTRING* vr$21 = fb_StrConcat( &TMP$456$4, (void*)vr$18, -1ll, (void*)" ", 2ll );
1075 -- __builtin_memset( &TMP$457$4, 0, 24ll );
1076 -- FBSTRING* vr$25 = fb_StrConcat( &TMP$457$4, (void*)&LN$1, -1ll, (void*)vr$21, -1ll );
1077 -+ __builtin_memset( &TMP$458$4, 0, 24ll );
1078 -+ FBSTRING* vr$18 = fb_StrConcat( &TMP$458$4, (void*)"-march=", 8ll, (void*)vr$15, 0ll );
1079 -+ __builtin_memset( &TMP$459$4, 0, 24ll );
1080 -+ FBSTRING* vr$21 = fb_StrConcat( &TMP$459$4, (void*)vr$18, -1ll, (void*)" ", 2ll );
1081 -+ __builtin_memset( &TMP$460$4, 0, 24ll );
1082 -+ FBSTRING* vr$25 = fb_StrConcat( &TMP$460$4, (void*)&LN$1, -1ll, (void*)vr$21, -1ll );
1083 - FBSTRING* vr$27 = fb_StrAssign( (void*)&LN$1, -1ll, (void*)vr$25, -1ll, 0 );
1084 - }
1085 - label$935:;
1086 -@@ -5486,12 +5495,12 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1087 - label$942:;
1088 - label$941:;
1089 - {
1090 -- int64 TMP$474$4;
1091 -+ int64 TMP$477$4;
1092 - int64 vr$61 = FBGETCPUFAMILY( );
1093 -- TMP$474$4 = vr$61;
1094 -- if( TMP$474$4 == 0ll ) goto label$945;
1095 -+ TMP$477$4 = vr$61;
1096 -+ if( TMP$477$4 == 0ll ) goto label$945;
1097 - label$946:;
1098 -- if( TMP$474$4 != 1ll ) goto label$944;
1099 -+ if( TMP$477$4 != 1ll ) goto label$944;
1100 - label$945:;
1101 - {
1102 - int64 vr$62 = FBGETOPTION( 9ll );
1103 -@@ -5508,35 +5517,35 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1104 - }
1105 - goto label$927;
1106 - label$928:;
1107 -- if( TMP$449$2 != 2ll ) goto label$949;
1108 -+ if( TMP$452$2 != 2ll ) goto label$949;
1109 - label$950:;
1110 - {
1111 - {
1112 -- int64 TMP$476$4;
1113 -+ int64 TMP$479$4;
1114 - int64 vr$65 = FBGETCPUFAMILY( );
1115 -- TMP$476$4 = vr$65;
1116 -- if( TMP$476$4 != 0ll ) goto label$952;
1117 -+ TMP$479$4 = vr$65;
1118 -+ if( TMP$479$4 != 0ll ) goto label$952;
1119 - label$953:;
1120 - {
1121 - FBSTRING* vr$67 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"-march=x86 ", 12ll, 0 );
1122 - }
1123 - goto label$951;
1124 - label$952:;
1125 -- if( TMP$476$4 != 1ll ) goto label$954;
1126 -+ if( TMP$479$4 != 1ll ) goto label$954;
1127 - label$955:;
1128 - {
1129 - FBSTRING* vr$69 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"-march=x86-64 ", 15ll, 0 );
1130 - }
1131 - goto label$951;
1132 - label$954:;
1133 -- if( TMP$476$4 != 2ll ) goto label$956;
1134 -+ if( TMP$479$4 != 2ll ) goto label$956;
1135 - label$957:;
1136 - {
1137 - FBSTRING* vr$71 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"-march=arm ", 12ll, 0 );
1138 - }
1139 - goto label$951;
1140 - label$956:;
1141 -- if( TMP$476$4 != 3ll ) goto label$958;
1142 -+ if( TMP$479$4 != 3ll ) goto label$958;
1143 - label$959:;
1144 - {
1145 - FBSTRING* vr$73 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"-march=aarch64 ", 16ll, 0 );
1146 -@@ -5557,12 +5566,12 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1147 - FBSTRING* vr$82 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)vr$80, -1ll, 0 );
1148 - FBSTRING* vr$84 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)" ", 2ll, 0 );
1149 - {
1150 -- int64 TMP$482$4;
1151 -+ int64 TMP$485$4;
1152 - int64 vr$85 = FBGETCPUFAMILY( );
1153 -- TMP$482$4 = vr$85;
1154 -- if( TMP$482$4 == 0ll ) goto label$964;
1155 -+ TMP$485$4 = vr$85;
1156 -+ if( TMP$485$4 == 0ll ) goto label$964;
1157 - label$965:;
1158 -- if( TMP$482$4 != 1ll ) goto label$963;
1159 -+ if( TMP$485$4 != 1ll ) goto label$963;
1160 - label$964:;
1161 - {
1162 - int64 vr$86 = FBGETOPTION( 9ll );
1163 -@@ -5589,10 +5598,10 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1164 - FBSTRING* vr$102 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"\x22", 2ll, 0 );
1165 - FBSTRING* vr$105 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)((uint8*)&FBC$ + 2038ll), 128ll, 0 );
1166 - {
1167 -- int64 TMP$486$2;
1168 -+ int64 TMP$489$2;
1169 - int64 vr$106 = FBGETOPTION( 2ll );
1170 -- TMP$486$2 = vr$106;
1171 -- if( TMP$486$2 != 1ll ) goto label$969;
1172 -+ TMP$489$2 = vr$106;
1173 -+ if( TMP$489$2 != 1ll ) goto label$969;
1174 - label$970:;
1175 - {
1176 - int64 vr$108 = FBCRUNBIN( (uint8*)"compiling C", 3ll, &LN$1 );
1177 -@@ -5600,7 +5609,7 @@ static int64 HCOMPILESTAGE2MODULE( struct $9FBCIOFILE* MODULE$1 )
1178 - }
1179 - goto label$968;
1180 - label$969:;
1181 -- if( TMP$486$2 != 2ll ) goto label$971;
1182 -+ if( TMP$489$2 != 2ll ) goto label$971;
1183 - label$972:;
1184 - {
1185 - int64 vr$110 = FBCRUNBIN( (uint8*)"compiling LLVM IR", 4ll, &LN$1 );
1186 -@@ -5641,19 +5650,19 @@ static void HCOMPILESTAGE2MODULES( void )
1187 -
1188 - static int64 HASSEMBLEMODULE( struct $9FBCIOFILE* MODULE$1 )
1189 - {
1190 -- FBSTRING TMP$495$1;
1191 -- FBSTRING TMP$496$1;
1192 -- FBSTRING TMP$497$1;
1193 -+ FBSTRING TMP$498$1;
1194 -+ FBSTRING TMP$499$1;
1195 -+ FBSTRING TMP$500$1;
1196 - int64 fb$result$1;
1197 - __builtin_memset( &fb$result$1, 0, 8ll );
1198 - label$979:;
1199 - FBSTRING LN$1;
1200 - __builtin_memset( &LN$1, 0, 24ll );
1201 - {
1202 -- int64 TMP$489$2;
1203 -+ int64 TMP$492$2;
1204 - int64 vr$2 = FBGETCPUFAMILY( );
1205 -- TMP$489$2 = vr$2;
1206 -- if( TMP$489$2 != 0ll ) goto label$982;
1207 -+ TMP$492$2 = vr$2;
1208 -+ if( TMP$492$2 != 0ll ) goto label$982;
1209 - label$983:;
1210 - {
1211 - int64 vr$3 = FBGETOPTION( 3ll );
1212 -@@ -5670,7 +5679,7 @@ static int64 HASSEMBLEMODULE( struct $9FBCIOFILE* MODULE$1 )
1213 - }
1214 - goto label$981;
1215 - label$982:;
1216 -- if( TMP$489$2 != 1ll ) goto label$986;
1217 -+ if( TMP$492$2 != 1ll ) goto label$986;
1218 - label$987:;
1219 - {
1220 - int64 vr$8 = FBGETOPTION( 3ll );
1221 -@@ -5705,12 +5714,12 @@ static int64 HASSEMBLEMODULE( struct $9FBCIOFILE* MODULE$1 )
1222 - FBSTRING* vr$19 = HGETASMNAME( MODULE$1, 2ll );
1223 - FBSTRING* vr$21 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)vr$19, -1ll, 0 );
1224 - FBSTRING* vr$23 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)"\x22 ", 3ll, 0 );
1225 -- __builtin_memset( &TMP$495$1, 0, 24ll );
1226 -- FBSTRING* vr$27 = fb_StrConcat( &TMP$495$1, (void*)"-o \x22", 5ll, *(void**)((uint8*)MODULE$1 + 24ll), -1ll );
1227 -- __builtin_memset( &TMP$496$1, 0, 24ll );
1228 -- FBSTRING* vr$30 = fb_StrConcat( &TMP$496$1, (void*)vr$27, -1ll, (void*)"\x22", 2ll );
1229 -- __builtin_memset( &TMP$497$1, 0, 24ll );
1230 -- FBSTRING* vr$34 = fb_StrConcat( &TMP$497$1, (void*)&LN$1, -1ll, (void*)vr$30, -1ll );
1231 -+ __builtin_memset( &TMP$498$1, 0, 24ll );
1232 -+ FBSTRING* vr$27 = fb_StrConcat( &TMP$498$1, (void*)"-o \x22", 5ll, *(void**)((uint8*)MODULE$1 + 24ll), -1ll );
1233 -+ __builtin_memset( &TMP$499$1, 0, 24ll );
1234 -+ FBSTRING* vr$30 = fb_StrConcat( &TMP$499$1, (void*)vr$27, -1ll, (void*)"\x22", 2ll );
1235 -+ __builtin_memset( &TMP$500$1, 0, 24ll );
1236 -+ FBSTRING* vr$34 = fb_StrConcat( &TMP$500$1, (void*)&LN$1, -1ll, (void*)vr$30, -1ll );
1237 - FBSTRING* vr$36 = fb_StrAssign( (void*)&LN$1, -1ll, (void*)vr$34, -1ll, 0 );
1238 - FBSTRING* vr$39 = fb_StrConcatAssign( (void*)&LN$1, -1ll, (void*)((uint8*)&FBC$ + 1782ll), 128ll, 0 );
1239 - int64 vr$41 = FBCRUNBIN( (uint8*)"assembling", 0ll, &LN$1 );
1240 -@@ -5759,30 +5768,30 @@ static void HASSEMBLEMODULES( void )
1241 -
1242 - static int64 HASSEMBLERC( struct $9FBCIOFILE* RC$1 )
1243 - {
1244 -- FBSTRING TMP$500$1;
1245 -- FBSTRING TMP$501$1;
1246 -- FBSTRING TMP$502$1;
1247 - FBSTRING TMP$503$1;
1248 - FBSTRING TMP$504$1;
1249 - FBSTRING TMP$505$1;
1250 -+ FBSTRING TMP$506$1;
1251 -+ FBSTRING TMP$507$1;
1252 -+ FBSTRING TMP$508$1;
1253 - int64 fb$result$1;
1254 - __builtin_memset( &fb$result$1, 0, 8ll );
1255 - label$1004:;
1256 - FBSTRING LN$1;
1257 - FBSTRING* vr$2 = fb_StrInit( (void*)&LN$1, -1ll, (void*)"--output-format=coff --include-dir=.", 37ll, 0 );
1258 -- __builtin_memset( &TMP$500$1, 0, 24ll );
1259 -- FBSTRING* vr$7 = fb_StrConcat( &TMP$500$1, (void*)" \x22", 3ll, (void*)RC$1, -1ll );
1260 -- __builtin_memset( &TMP$501$1, 0, 24ll );
1261 -- FBSTRING* vr$10 = fb_StrConcat( &TMP$501$1, (void*)vr$7, -1ll, (void*)"\x22", 2ll );
1262 -- __builtin_memset( &TMP$502$1, 0, 24ll );
1263 -- FBSTRING* vr$14 = fb_StrConcat( &TMP$502$1, (void*)&LN$1, -1ll, (void*)vr$10, -1ll );
1264 -- FBSTRING* vr$16 = fb_StrAssign( (void*)&LN$1, -1ll, (void*)vr$14, -1ll, 0 );
1265 - __builtin_memset( &TMP$503$1, 0, 24ll );
1266 -- FBSTRING* vr$20 = fb_StrConcat( &TMP$503$1, (void*)" \x22", 3ll, *(void**)((uint8*)RC$1 + 24ll), -1ll );
1267 -+ FBSTRING* vr$7 = fb_StrConcat( &TMP$503$1, (void*)" \x22", 3ll, (void*)RC$1, -1ll );
1268 - __builtin_memset( &TMP$504$1, 0, 24ll );
1269 -- FBSTRING* vr$23 = fb_StrConcat( &TMP$504$1, (void*)vr$20, -1ll, (void*)"\x22", 2ll );
1270 -+ FBSTRING* vr$10 = fb_StrConcat( &TMP$504$1, (void*)vr$7, -1ll, (void*)"\x22", 2ll );
1271 - __builtin_memset( &TMP$505$1, 0, 24ll );
1272 -- FBSTRING* vr$27 = fb_StrConcat( &TMP$505$1, (void*)&LN$1, -1ll, (void*)vr$23, -1ll );
1273 -+ FBSTRING* vr$14 = fb_StrConcat( &TMP$505$1, (void*)&LN$1, -1ll, (void*)vr$10, -1ll );
1274 -+ FBSTRING* vr$16 = fb_StrAssign( (void*)&LN$1, -1ll, (void*)vr$14, -1ll, 0 );
1275 -+ __builtin_memset( &TMP$506$1, 0, 24ll );
1276 -+ FBSTRING* vr$20 = fb_StrConcat( &TMP$506$1, (void*)" \x22", 3ll, *(void**)((uint8*)RC$1 + 24ll), -1ll );
1277 -+ __builtin_memset( &TMP$507$1, 0, 24ll );
1278 -+ FBSTRING* vr$23 = fb_StrConcat( &TMP$507$1, (void*)vr$20, -1ll, (void*)"\x22", 2ll );
1279 -+ __builtin_memset( &TMP$508$1, 0, 24ll );
1280 -+ FBSTRING* vr$27 = fb_StrConcat( &TMP$508$1, (void*)&LN$1, -1ll, (void*)vr$23, -1ll );
1281 - FBSTRING* vr$29 = fb_StrAssign( (void*)&LN$1, -1ll, (void*)vr$27, -1ll, 0 );
1282 - int64 vr$31 = FBCRUNBIN( (uint8*)"compiling rc", 7ll, &LN$1 );
1283 - fb$result$1 = vr$31;
1284 -@@ -5908,8 +5917,8 @@ static int64 HCOMPILEFBCTINF( void )
1285 -
1286 - static int64 HARCHIVEFILES( void )
1287 - {
1288 -- FBSTRING TMP$510$1;
1289 -- FBSTRING TMP$511$1;
1290 -+ FBSTRING TMP$513$1;
1291 -+ FBSTRING TMP$514$1;
1292 - int64 fb$result$1;
1293 - __builtin_memset( &fb$result$1, 0, 8ll );
1294 - label$1033:;
1295 -@@ -5922,16 +5931,16 @@ static int64 HARCHIVEFILES( void )
1296 - label$1036:;
1297 - label$1035:;
1298 - FBSTRING LN$1;
1299 -- __builtin_memset( &TMP$510$1, 0, 24ll );
1300 -- FBSTRING* vr$8 = fb_StrConcat( &TMP$510$1, (void*)"-rsc \x22", 7ll, (void*)((uint8*)&FBC$ + 856ll), 261ll );
1301 -- __builtin_memset( &TMP$511$1, 0, 24ll );
1302 -- FBSTRING* vr$11 = fb_StrConcat( &TMP$511$1, (void*)vr$8, -1ll, (void*)"\x22 ", 3ll );
1303 -+ __builtin_memset( &TMP$513$1, 0, 24ll );
1304 -+ FBSTRING* vr$8 = fb_StrConcat( &TMP$513$1, (void*)"-rsc \x22", 7ll, (void*)((uint8*)&FBC$ + 856ll), 261ll );
1305 -+ __builtin_memset( &TMP$514$1, 0, 24ll );
1306 -+ FBSTRING* vr$11 = fb_StrConcat( &TMP$514$1, (void*)vr$8, -1ll, (void*)"\x22 ", 3ll );
1307 - FBSTRING* vr$13 = fb_StrInit( (void*)&LN$1, -1ll, (void*)vr$11, -1ll, 0 );
1308 - int64 vr$14 = FBGETOPTION( 29ll );
1309 - int64 vr$15 = FBISCROSSCOMP( );
1310 - if( (vr$14 & ~vr$15) == 0ll ) goto label$1038;
1311 - {
1312 -- FBSTRING TMP$515$2;
1313 -+ FBSTRING TMP$518$2;
1314 - int64 vr$18 = HCOMPILEFBCTINF( );
1315 - if( vr$18 == 0ll ) goto label$1040;
1316 - {
1317 -@@ -5939,10 +5948,10 @@ static int64 HARCHIVEFILES( void )
1318 - }
1319 - label$1040:;
1320 - label$1039:;
1321 -- __builtin_memset( &TMP$515$2, 0, 24ll );
1322 -- FBSTRING* vr$23 = fb_StrAssign( (void*)&TMP$515$2, -1ll, (void*)"__fb_ct.inf", 12ll, 0 );
1323 -- FBCADDTEMP( &TMP$515$2 );
1324 -- fb_StrDelete( &TMP$515$2 );
1325 -+ __builtin_memset( &TMP$518$2, 0, 24ll );
1326 -+ FBSTRING* vr$23 = fb_StrAssign( (void*)&TMP$518$2, -1ll, (void*)"__fb_ct.inf", 12ll, 0 );
1327 -+ FBCADDTEMP( &TMP$518$2 );
1328 -+ fb_StrDelete( &TMP$518$2 );
1329 - }
1330 - label$1038:;
1331 - label$1037:;
1332 -@@ -5952,15 +5961,15 @@ static int64 HARCHIVEFILES( void )
1333 - label$1041:;
1334 - if( OBJFILE$1 == (FBSTRING*)0ull ) goto label$1042;
1335 - {
1336 -- FBSTRING TMP$516$2;
1337 -- FBSTRING TMP$517$2;
1338 -- FBSTRING TMP$518$2;
1339 -- __builtin_memset( &TMP$516$2, 0, 24ll );
1340 -- FBSTRING* vr$30 = fb_StrConcat( &TMP$516$2, (void*)"\x22", 2ll, (void*)OBJFILE$1, -1ll );
1341 -- __builtin_memset( &TMP$517$2, 0, 24ll );
1342 -- FBSTRING* vr$33 = fb_StrConcat( &TMP$517$2, (void*)vr$30, -1ll, (void*)"\x22 ", 3ll );
1343 -- __builtin_memset( &TMP$518$2, 0, 24ll );
1344 -- FBSTRING* vr$37 = fb_StrConcat( &TMP$518$2, (void*)&LN$1, -1ll, (void*)vr$33, -1ll );
1345 -+ FBSTRING TMP$519$2;
1346 -+ FBSTRING TMP$520$2;
1347 -+ FBSTRING TMP$521$2;
1348 -+ __builtin_memset( &TMP$519$2, 0, 24ll );
1349 -+ FBSTRING* vr$30 = fb_StrConcat( &TMP$519$2, (void*)"\x22", 2ll, (void*)OBJFILE$1, -1ll );
1350 -+ __builtin_memset( &TMP$520$2, 0, 24ll );
1351 -+ FBSTRING* vr$33 = fb_StrConcat( &TMP$520$2, (void*)vr$30, -1ll, (void*)"\x22 ", 3ll );
1352 -+ __builtin_memset( &TMP$521$2, 0, 24ll );
1353 -+ FBSTRING* vr$37 = fb_StrConcat( &TMP$521$2, (void*)&LN$1, -1ll, (void*)vr$33, -1ll );
1354 - FBSTRING* vr$39 = fb_StrAssign( (void*)&LN$1, -1ll, (void*)vr$37, -1ll, 0 );
1355 - void* vr$40 = LISTGETNEXT( (void*)OBJFILE$1 );
1356 - OBJFILE$1 = (FBSTRING*)vr$40;
1357 -@@ -5976,30 +5985,30 @@ static int64 HARCHIVEFILES( void )
1358 -
1359 - static void HSETDEFAULTLIBPATHS( void )
1360 - {
1361 -- FBSTRING TMP$520$1;
1362 -- FBSTRING TMP$521$1;
1363 -+ FBSTRING TMP$523$1;
1364 -+ FBSTRING TMP$524$1;
1365 - label$1043:;
1366 -- __builtin_memset( &TMP$520$1, 0, 24ll );
1367 -- FBSTRING* vr$3 = fb_StrAssign( (void*)&TMP$520$1, -1ll, (void*)((uint8*)&FBC$ + 3359ll), 261ll, 0 );
1368 -- FBCADDDEFLIBPATH( &TMP$520$1 );
1369 -- fb_StrDelete( &TMP$520$1 );
1370 -- __builtin_memset( &TMP$521$1, 0, 24ll );
1371 -- FBSTRING* vr$8 = fb_StrAssign( (void*)&TMP$521$1, -1ll, (void*)".", 2ll, 0 );
1372 -- FBCADDDEFLIBPATH( &TMP$521$1 );
1373 -- fb_StrDelete( &TMP$521$1 );
1374 -+ __builtin_memset( &TMP$523$1, 0, 24ll );
1375 -+ FBSTRING* vr$3 = fb_StrAssign( (void*)&TMP$523$1, -1ll, (void*)((uint8*)&FBC$ + 3359ll), 261ll, 0 );
1376 -+ FBCADDDEFLIBPATH( &TMP$523$1 );
1377 -+ fb_StrDelete( &TMP$523$1 );
1378 -+ __builtin_memset( &TMP$524$1, 0, 24ll );
1379 -+ FBSTRING* vr$8 = fb_StrAssign( (void*)&TMP$524$1, -1ll, (void*)".", 2ll, 0 );
1380 -+ FBCADDDEFLIBPATH( &TMP$524$1 );
1381 -+ fb_StrDelete( &TMP$524$1 );
1382 - FBCADDLIBPATHFOR( (uint8*)"libgcc.a" );
1383 - {
1384 -- int64 TMP$523$2;
1385 -+ int64 TMP$526$2;
1386 - int64 vr$11 = FBGETOPTION( 3ll );
1387 -- TMP$523$2 = vr$11;
1388 -- if( TMP$523$2 != 3ll ) goto label$1046;
1389 -+ TMP$526$2 = vr$11;
1390 -+ if( TMP$526$2 != 3ll ) goto label$1046;
1391 - label$1047:;
1392 - {
1393 - FBCADDLIBPATHFOR( (uint8*)"libm.a" );
1394 - }
1395 - goto label$1045;
1396 - label$1046:;
1397 -- if( TMP$523$2 != 0ll ) goto label$1048;
1398 -+ if( TMP$526$2 != 0ll ) goto label$1048;
1399 - label$1049:;
1400 - {
1401 - FBCADDLIBPATHFOR( (uint8*)"libmingw32.a" );
1402 -@@ -6012,12 +6021,12 @@ static void HSETDEFAULTLIBPATHS( void )
1403 -
1404 - static void FBCADDDEFLIB( uint8* LIBNAME$1 )
1405 - {
1406 -- FBSTRING TMP$526$1;
1407 -+ FBSTRING TMP$529$1;
1408 - label$1050:;
1409 -- __builtin_memset( &TMP$526$1, 0, 24ll );
1410 -- FBSTRING* vr$2 = fb_StrAssign( (void*)&TMP$526$1, -1ll, (void*)LIBNAME$1, 0ll, 0 );
1411 -- STRSETADD( (struct $7TSTRSET*)((uint8*)&FBC$ + 680ll), &TMP$526$1, -1ll );
1412 -- fb_StrDelete( &TMP$526$1 );
1413 -+ __builtin_memset( &TMP$529$1, 0, 24ll );
1414 -+ FBSTRING* vr$2 = fb_StrAssign( (void*)&TMP$529$1, -1ll, (void*)LIBNAME$1, 0ll, 0 );
1415 -+ STRSETADD( (struct $7TSTRSET*)((uint8*)&FBC$ + 680ll), &TMP$529$1, -1ll );
1416 -+ fb_StrDelete( &TMP$529$1 );
1417 - label$1051:;
1418 - }
1419 -
1420 -@@ -6051,32 +6060,32 @@ static FBSTRING* HGETFBLIBNAMESUFFIX( void )
1421 -
1422 - static void HADDDEFAULTLIBS( void )
1423 - {
1424 -- FBSTRING TMP$527$1;
1425 -- FBSTRING TMP$528$1;
1426 -+ FBSTRING TMP$530$1;
1427 -+ FBSTRING TMP$531$1;
1428 - label$1058:;
1429 -- __builtin_memset( &TMP$528$1, 0, 24ll );
1430 -+ __builtin_memset( &TMP$531$1, 0, 24ll );
1431 - FBSTRING* vr$1 = HGETFBLIBNAMESUFFIX( );
1432 -- __builtin_memset( &TMP$527$1, 0, 24ll );
1433 -- FBSTRING* vr$4 = fb_StrConcat( &TMP$527$1, (void*)"fb", 3ll, (void*)vr$1, -1ll );
1434 -- FBSTRING* vr$6 = fb_StrAssign( (void*)&TMP$528$1, -1ll, (void*)vr$4, -1ll, 0 );
1435 -- FBCADDDEFLIB( *(uint8**)&TMP$528$1 );
1436 -- fb_StrDelete( &TMP$528$1 );
1437 -+ __builtin_memset( &TMP$530$1, 0, 24ll );
1438 -+ FBSTRING* vr$4 = fb_StrConcat( &TMP$530$1, (void*)"fb", 3ll, (void*)vr$1, -1ll );
1439 -+ FBSTRING* vr$6 = fb_StrAssign( (void*)&TMP$531$1, -1ll, (void*)vr$4, -1ll, 0 );
1440 -+ FBCADDDEFLIB( *(uint8**)&TMP$531$1 );
1441 -+ fb_StrDelete( &TMP$531$1 );
1442 - int64 vr$8 = FBGETOPTION( 26ll );
1443 - if( vr$8 == 0ll ) goto label$1061;
1444 - {
1445 -- FBSTRING TMP$530$2;
1446 -- FBSTRING TMP$531$2;
1447 -- __builtin_memset( &TMP$531$2, 0, 24ll );
1448 -+ FBSTRING TMP$533$2;
1449 -+ FBSTRING TMP$534$2;
1450 -+ __builtin_memset( &TMP$534$2, 0, 24ll );
1451 - FBSTRING* vr$10 = HGETFBLIBNAMESUFFIX( );
1452 -- __builtin_memset( &TMP$530$2, 0, 24ll );
1453 -- FBSTRING* vr$13 = fb_StrConcat( &TMP$530$2, (void*)"fbgfx", 6ll, (void*)vr$10, -1ll );
1454 -- FBSTRING* vr$15 = fb_StrAssign( (void*)&TMP$531$2, -1ll, (void*)vr$13, -1ll, 0 );
1455 -- FBCADDDEFLIB( *(uint8**)&TMP$531$2 );
1456 -- fb_StrDelete( &TMP$531$2 );
1457 -+ __builtin_memset( &TMP$533$2, 0, 24ll );
1458 -+ FBSTRING* vr$13 = fb_StrConcat( &TMP$533$2, (void*)"fbgfx", 6ll, (void*)vr$10, -1ll );
1459 -+ FBSTRING* vr$15 = fb_StrAssign( (void*)&TMP$534$2, -1ll, (void*)vr$13, -1ll, 0 );
1460 -+ FBCADDDEFLIB( *(uint8**)&TMP$534$2 );
1461 -+ fb_StrDelete( &TMP$534$2 );
1462 - {
1463 -- uint64 TMP$532$3;
1464 -+ uint64 TMP$535$3;
1465 - int64 vr$17 = FBGETOPTION( 3ll );
1466 -- TMP$532$3 = (uint64)vr$17;
1467 -+ TMP$535$3 = (uint64)vr$17;
1468 - goto label$1063;
1469 - label$1064:;
1470 - {
1471 -@@ -6086,11 +6095,11 @@ static void HADDDEFAULTLIBS( void )
1472 - goto label$1062;
1473 - label$1065:;
1474 - {
1475 -- FBSTRING TMP$536$4;
1476 -- __builtin_memset( &TMP$536$4, 0, 24ll );
1477 -- FBSTRING* vr$20 = fb_StrAssign( (void*)&TMP$536$4, -1ll, (void*)"/usr/X11R6/lib", 15ll, 0 );
1478 -- FBCADDDEFLIBPATH( &TMP$536$4 );
1479 -- fb_StrDelete( &TMP$536$4 );
1480 -+ FBSTRING TMP$539$4;
1481 -+ __builtin_memset( &TMP$539$4, 0, 24ll );
1482 -+ FBSTRING* vr$20 = fb_StrAssign( (void*)&TMP$539$4, -1ll, (void*)"/usr/X11R6/lib", 15ll, 0 );
1483 -+ FBCADDDEFLIBPATH( &TMP$539$4 );
1484 -+ fb_StrDelete( &TMP$539$4 );
1485 - FBCADDDEFLIB( (uint8*)"X11" );
1486 - FBCADDDEFLIB( (uint8*)"Xext" );
1487 - FBCADDDEFLIB( (uint8*)"Xpm" );
1488 -@@ -6099,7 +6108,7 @@ static void HADDDEFAULTLIBS( void )
1489 - }
1490 - goto label$1062;
1491 - label$1063:;
1492 -- static const void* tmp$664[9ll] = {
1493 -+ static const void* tmp$667[9ll] = {
1494 - &&label$1064,
1495 - &&label$1064,
1496 - &&label$1065,
1497 -@@ -6110,17 +6119,17 @@ static void HADDDEFAULTLIBS( void )
1498 - &&label$1065,
1499 - &&label$1065,
1500 - };
1501 -- if( TMP$532$3 > 8ull ) goto label$1062;
1502 -- goto *tmp$664[TMP$532$3 - 0ull];
1503 -+ if( TMP$535$3 > 8ull ) goto label$1062;
1504 -+ goto *tmp$667[TMP$535$3 - 0ull];
1505 - label$1062:;
1506 - }
1507 - }
1508 - label$1061:;
1509 - label$1060:;
1510 - {
1511 -- uint64 TMP$542$2;
1512 -+ uint64 TMP$545$2;
1513 - int64 vr$23 = FBGETOPTION( 3ll );
1514 -- TMP$542$2 = (uint64)vr$23;
1515 -+ TMP$545$2 = (uint64)vr$23;
1516 - goto label$1067;
1517 - label$1068:;
1518 - {
1519 -@@ -6263,7 +6272,7 @@ static void HADDDEFAULTLIBS( void )
1520 - }
1521 - goto label$1066;
1522 - label$1067:;
1523 -- static const void* tmp$665[9ll] = {
1524 -+ static const void* tmp$668[9ll] = {
1525 - &&label$1083,
1526 - &&label$1068,
1527 - &&label$1076,
1528 -@@ -6274,8 +6283,8 @@ static void HADDDEFAULTLIBS( void )
1529 - &&label$1071,
1530 - &&label$1081,
1531 - };
1532 -- if( TMP$542$2 > 8ull ) goto label$1066;
1533 -- goto *tmp$665[TMP$542$2 - 0ull];
1534 -+ if( TMP$545$2 > 8ull ) goto label$1066;
1535 -+ goto *tmp$668[TMP$545$2 - 0ull];
1536 - label$1066:;
1537 - }
1538 - label$1059:;
1539 -@@ -6423,24 +6432,24 @@ static void HPRINTOPTIONS( void )
1540 -
1541 - static void HPRINTVERSION( void )
1542 - {
1543 -- FBSTRING TMP$642$1;
1544 -- FBSTRING TMP$643$1;
1545 -- FBSTRING TMP$644$1;
1546 - FBSTRING TMP$645$1;
1547 -+ FBSTRING TMP$646$1;
1548 -+ FBSTRING TMP$647$1;
1549 -+ FBSTRING TMP$648$1;
1550 - label$1097:;
1551 - FBSTRING CONFIG$1;
1552 - __builtin_memset( &CONFIG$1, 0, 24ll );
1553 - int64 vr$1 = FBGETHOSTBITS( );
1554 - FBSTRING* vr$2 = fb_LongintToStr( vr$1 );
1555 - FBSTRING* vr$3 = FBGETHOSTID( );
1556 -- __builtin_memset( &TMP$642$1, 0, 24ll );
1557 -- FBSTRING* vr$6 = fb_StrConcat( &TMP$642$1, (void*)"FreeBASIC Compiler - Version 1.06.0 (02-17-2019), built for ", 61ll, (void*)vr$3, -1ll );
1558 -- __builtin_memset( &TMP$643$1, 0, 24ll );
1559 -- FBSTRING* vr$9 = fb_StrConcat( &TMP$643$1, (void*)vr$6, -1ll, (void*)" (", 3ll );
1560 -- __builtin_memset( &TMP$644$1, 0, 24ll );
1561 -- FBSTRING* vr$12 = fb_StrConcat( &TMP$644$1, (void*)vr$9, -1ll, (void*)vr$2, -1ll );
1562 - __builtin_memset( &TMP$645$1, 0, 24ll );
1563 -- FBSTRING* vr$15 = fb_StrConcat( &TMP$645$1, (void*)vr$12, -1ll, (void*)"bit)", 5ll );
1564 -+ FBSTRING* vr$6 = fb_StrConcat( &TMP$645$1, (void*)"FreeBASIC Compiler - Version 1.06.0 (04-21-2019), built for ", 61ll, (void*)vr$3, -1ll );
1565 -+ __builtin_memset( &TMP$646$1, 0, 24ll );
1566 -+ FBSTRING* vr$9 = fb_StrConcat( &TMP$646$1, (void*)vr$6, -1ll, (void*)" (", 3ll );
1567 -+ __builtin_memset( &TMP$647$1, 0, 24ll );
1568 -+ FBSTRING* vr$12 = fb_StrConcat( &TMP$647$1, (void*)vr$9, -1ll, (void*)vr$2, -1ll );
1569 -+ __builtin_memset( &TMP$648$1, 0, 24ll );
1570 -+ FBSTRING* vr$15 = fb_StrConcat( &TMP$648$1, (void*)vr$12, -1ll, (void*)"bit)", 5ll );
1571 - fb_PrintString( 0, vr$15, 1 );
1572 - FBSTRING* vr$16 = fb_StrAllocTempDescZEx( (uint8*)"Copyright (C) 2004-2019 The FreeBASIC development team.", 55ll );
1573 - fb_PrintString( 0, vr$16, 1 );
1574
1575 diff --git a/dev-lang/fbc/files/1.06.0/bootstrap/0004-bootstrap-dist-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch b/dev-lang/fbc/files/1.06.0/bootstrap/0004-bootstrap-dist-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch
1576 deleted file mode 100644
1577 index 733d624..0000000
1578 --- a/dev-lang/fbc/files/1.06.0/bootstrap/0004-bootstrap-dist-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch
1579 +++ /dev/null
1580 @@ -1,7124 +0,0 @@
1581 -diff --git a/../FreeBASIC-1.06.0-source-bootstrap/bootstrap/linux-x86/fbc.asm b/bootstrap/linux-x86/fbc.asm
1582 -index 2136701..bb6441f 100644
1583 ---- a/../FreeBASIC-1.06.0-source-bootstrap/bootstrap/linux-x86/fbc.asm
1584 -+++ b/bootstrap/linux-x86/fbc.asm
1585 -@@ -41,49 +41,49 @@ add esp, 16
1586 - .Lt_0002:
1587 - call FBCINIT
1588 - cmp dword ptr [ebp+8], 1
1589 --jne .Lt_06E8
1590 -+jne .Lt_06EB
1591 - call HPRINTOPTIONS
1592 - sub esp, 12
1593 - push 1
1594 - call FBCEND
1595 - add esp, 16
1596 --.Lt_06E8:
1597 --.Lt_06E7:
1598 -+.Lt_06EB:
1599 -+.Lt_06EA:
1600 - sub esp, 8
1601 - push dword ptr [ebp+12]
1602 - push dword ptr [ebp+8]
1603 - call HPARSEARGS
1604 - add esp, 16
1605 - cmp dword ptr [FBC+60], 0
1606 --je .Lt_06EA
1607 -+je .Lt_06ED
1608 - call HPRINTVERSION
1609 - sub esp, 12
1610 - push 0
1611 - call FBCEND
1612 - add esp, 16
1613 --.Lt_06EA:
1614 --.Lt_06E9:
1615 -+.Lt_06ED:
1616 -+.Lt_06EC:
1617 - cmp dword ptr [FBC+56], 0
1618 --je .Lt_06EC
1619 -+je .Lt_06EF
1620 - call HPRINTVERSION
1621 --.Lt_06EC:
1622 --.Lt_06EB:
1623 -+.Lt_06EF:
1624 -+.Lt_06EE:
1625 - cmp dword ptr [FBC+64], 0
1626 --je .Lt_06EE
1627 -+je .Lt_06F1
1628 - call HPRINTOPTIONS
1629 - sub esp, 12
1630 - push 1
1631 - call FBCEND
1632 - add esp, 16
1633 --.Lt_06EE:
1634 --.Lt_06ED:
1635 -+.Lt_06F1:
1636 -+.Lt_06F0:
1637 - call FBCDETERMINEPREFIX
1638 - call FBCSETUPCOMPILERPATHS
1639 - cmp dword ptr [FBC+56], 0
1640 --je .Lt_06F0
1641 -+je .Lt_06F3
1642 - call FBCPRINTTARGETINFO
1643 --.Lt_06F0:
1644 --.Lt_06EF:
1645 -+.Lt_06F3:
1646 -+.Lt_06F2:
1647 - sub esp, 12
1648 - mov dword ptr [ebp-16], 0
1649 - mov dword ptr [ebp-12], 0
1650 -@@ -147,12 +147,12 @@ sbb ecx, ecx
1651 - or ebx, ecx
1652 - mov dword ptr [ebp-20], ebx
1653 - cmp dword ptr [FBC+68], 0
1654 --jl .Lt_06F3
1655 -+jl .Lt_06F6
1656 - mov ebx, dword ptr [FBC+68]
1657 - mov dword ptr [ebp-24], ebx
1658 - cmp dword ptr [ebp-24], 0
1659 --jne .Lt_06F6
1660 --.Lt_06F7:
1661 -+jne .Lt_06F9
1662 -+.Lt_06FA:
1663 - sub esp, 4
1664 - push 1
1665 - sub esp, 8
1666 -@@ -162,11 +162,11 @@ push eax
1667 - push 0
1668 - call fb_PrintString
1669 - add esp, 16
1670 --jmp .Lt_06F4
1671 --.Lt_06F6:
1672 --cmp dword ptr [ebp-24], 1
1673 --jne .Lt_06F8
1674 -+jmp .Lt_06F7
1675 - .Lt_06F9:
1676 -+cmp dword ptr [ebp-24], 1
1677 -+jne .Lt_06FB
1678 -+.Lt_06FC:
1679 - sub esp, 4
1680 - push 1
1681 - sub esp, 8
1682 -@@ -176,16 +176,16 @@ push eax
1683 - push 0
1684 - call fb_PrintString
1685 - add esp, 16
1686 --jmp .Lt_06F4
1687 --.Lt_06F8:
1688 --cmp dword ptr [ebp-24], 2
1689 --jne .Lt_06FA
1690 -+jmp .Lt_06F7
1691 - .Lt_06FB:
1692 -+cmp dword ptr [ebp-24], 2
1693 -+jne .Lt_06FD
1694 -+.Lt_06FE:
1695 - cmp dword ptr [ebp-20], 0
1696 --je .Lt_06FD
1697 -+je .Lt_0700
1698 - call FBCDETERMINEMAINNAME
1699 --.Lt_06FD:
1700 --.Lt_06FC:
1701 -+.Lt_0700:
1702 -+.Lt_06FF:
1703 - call HSETOUTNAME
1704 - sub esp, 4
1705 - push 1
1706 -@@ -198,11 +198,11 @@ push eax
1707 - push 0
1708 - call fb_PrintString
1709 - add esp, 16
1710 --jmp .Lt_06F4
1711 --.Lt_06FA:
1712 -+jmp .Lt_06F7
1713 -+.Lt_06FD:
1714 - cmp dword ptr [ebp-24], 3
1715 --jne .Lt_06FE
1716 --.Lt_06FF:
1717 -+jne .Lt_0701
1718 -+.Lt_0702:
1719 - sub esp, 4
1720 - push 1
1721 - sub esp, 4
1722 -@@ -214,59 +214,59 @@ push eax
1723 - push 0
1724 - call fb_PrintString
1725 - add esp, 16
1726 --.Lt_06FE:
1727 --.Lt_06F4:
1728 -+.Lt_0701:
1729 -+.Lt_06F7:
1730 - sub esp, 12
1731 - push 0
1732 - call FBCEND
1733 - add esp, 16
1734 --.Lt_06F3:
1735 --.Lt_06F2:
1736 -+.Lt_06F6:
1737 -+.Lt_06F5:
1738 - call FBCDETERMINEMAINNAME
1739 - cmp dword ptr [ebp-20], 0
1740 --jne .Lt_0701
1741 -+jne .Lt_0704
1742 - call HPRINTOPTIONS
1743 - sub esp, 12
1744 - push 1
1745 - call FBCEND
1746 - add esp, 16
1747 --.Lt_0701:
1748 --.Lt_0700:
1749 -+.Lt_0704:
1750 -+.Lt_0703:
1751 - call HCOMPILEMODULES
1752 - call HCOMPILEXPM
1753 - test eax, eax
1754 --jne .Lt_0703
1755 -+jne .Lt_0706
1756 - sub esp, 12
1757 - push 1
1758 - call FBCEND
1759 - add esp, 16
1760 --.Lt_0703:
1761 --.Lt_0702:
1762 -+.Lt_0706:
1763 -+.Lt_0705:
1764 - cmp dword ptr [FBC+36], 0
1765 --je .Lt_0705
1766 -+je .Lt_0708
1767 - sub esp, 12
1768 - push 0
1769 - call FBCEND
1770 - add esp, 16
1771 --.Lt_0705:
1772 --.Lt_0704:
1773 -+.Lt_0708:
1774 -+.Lt_0707:
1775 - sub esp, 12
1776 - push 2
1777 - call FBGETOPTION
1778 - add esp, 16
1779 - test eax, eax
1780 --je .Lt_0707
1781 -+je .Lt_070A
1782 - call HCOMPILESTAGE2MODULES
1783 --.Lt_0707:
1784 --.Lt_0706:
1785 -+.Lt_070A:
1786 -+.Lt_0709:
1787 - cmp dword ptr [FBC+44], 0
1788 --je .Lt_0709
1789 -+je .Lt_070C
1790 - sub esp, 12
1791 - push 0
1792 - call FBCEND
1793 - add esp, 16
1794 --.Lt_0709:
1795 --.Lt_0708:
1796 -+.Lt_070C:
1797 -+.Lt_070B:
1798 - call HASSEMBLEMODULES
1799 - call HASSEMBLERCS
1800 - call HASSEMBLEXPM
1801 -@@ -275,13 +275,13 @@ push 0
1802 - call FBGETOPTION
1803 - add esp, 16
1804 - cmp eax, 3
1805 --jne .Lt_070B
1806 -+jne .Lt_070E
1807 - sub esp, 12
1808 - push 0
1809 - call FBCEND
1810 - add esp, 16
1811 --.Lt_070B:
1812 --.Lt_070A:
1813 -+.Lt_070E:
1814 -+.Lt_070D:
1815 - call HSETDEFAULTLIBPATHS
1816 - sub esp, 12
1817 - push 29
1818 -@@ -291,45 +291,45 @@ mov ebx, eax
1819 - call FBISCROSSCOMP
1820 - not eax
1821 - and ebx, eax
1822 --je .Lt_070D
1823 -+je .Lt_0710
1824 - call HCOLLECTOBJINFO
1825 --.Lt_070D:
1826 --.Lt_070C:
1827 -+.Lt_0710:
1828 -+.Lt_070F:
1829 - sub esp, 12
1830 - push 0
1831 - call FBGETOPTION
1832 - add esp, 16
1833 - cmp eax, 1
1834 --jne .Lt_070F
1835 -+jne .Lt_0712
1836 - call HARCHIVEFILES
1837 - test eax, eax
1838 --jne .Lt_0711
1839 -+jne .Lt_0714
1840 - sub esp, 12
1841 - push 1
1842 - call FBCEND
1843 - add esp, 16
1844 --.Lt_0711:
1845 --.Lt_0710:
1846 -+.Lt_0714:
1847 -+.Lt_0713:
1848 - sub esp, 12
1849 - push 0
1850 - call FBCEND
1851 - add esp, 16
1852 --.Lt_070F:
1853 --.Lt_070E:
1854 -+.Lt_0712:
1855 -+.Lt_0711:
1856 - cmp dword ptr [FBC+2120], 0
1857 --jne .Lt_0713
1858 -+jne .Lt_0716
1859 - call HADDDEFAULTLIBS
1860 --.Lt_0713:
1861 --.Lt_0712:
1862 -+.Lt_0716:
1863 -+.Lt_0715:
1864 - call HLINKFILES
1865 - test eax, eax
1866 --jne .Lt_0715
1867 -+jne .Lt_0718
1868 - sub esp, 12
1869 - push 1
1870 - call FBCEND
1871 - add esp, 16
1872 --.Lt_0715:
1873 --.Lt_0714:
1874 -+.Lt_0718:
1875 -+.Lt_0717:
1876 - sub esp, 12
1877 - push 0
1878 - call FBCEND
1879 -@@ -2210,18 +2210,18 @@ sub esp, 52
1880 - push ebx
1881 - .Lt_00A2:
1882 - mov eax, dword ptr [ebp+8]
1883 --cmp dword ptr [Lt_0720], eax
1884 -+cmp dword ptr [Lt_0723], eax
1885 - jne .Lt_00A5
1886 - sub esp, 12
1887 - push 0
1888 - push -1
1889 --push offset Lt_0721
1890 -+push offset Lt_0724
1891 - push -1
1892 - push dword ptr [ebp+12]
1893 - call fb_StrAssign
1894 - add esp, 32
1895 - mov eax, dword ptr [ebp+16]
1896 --mov ebx, dword ptr [Lt_0722]
1897 -+mov ebx, dword ptr [Lt_0725]
1898 - mov dword ptr [eax], ebx
1899 - jmp .Lt_00A3
1900 - .Lt_00A5:
1901 -@@ -2341,18 +2341,18 @@ mov dword ptr [eax], -1
1902 - .Lt_00A7:
1903 - .Lt_00A6:
1904 - mov eax, dword ptr [ebp+8]
1905 --mov dword ptr [Lt_0720], eax
1906 -+mov dword ptr [Lt_0723], eax
1907 - sub esp, 12
1908 - push 0
1909 - push -1
1910 - push dword ptr [ebp+12]
1911 - push -1
1912 --push offset Lt_0721
1913 -+push offset Lt_0724
1914 - call fb_StrAssign
1915 - add esp, 32
1916 - mov eax, dword ptr [ebp+16]
1917 - mov ebx, dword ptr [eax]
1918 --mov dword ptr [Lt_0722], ebx
1919 -+mov dword ptr [Lt_0725], ebx
1920 - .Lt_00A3:
1921 - pop ebx
1922 - mov esp, ebp
1923 -@@ -2362,14 +2362,14 @@ ret
1924 -
1925 - .section .data
1926 - .balign 4
1927 --Lt_0720:
1928 -+Lt_0723:
1929 - .int -1
1930 -
1931 - .section .bss
1932 - .balign 4
1933 -- .lcomm Lt_0722,4
1934 -+ .lcomm Lt_0725,4
1935 - .balign 4
1936 -- .lcomm Lt_0721,12
1937 -+ .lcomm Lt_0724,12
1938 -
1939 - .section .text
1940 - .balign 16
1941 -@@ -2848,7 +2848,7 @@ cmp edx, 0
1942 - jne .Lt_00DF
1943 - cmp eax, 0
1944 - jne .Lt_00DF
1945 --.Lt_0724:
1946 -+.Lt_0727:
1947 - sub esp, 12
1948 - push dword ptr [ebp+12]
1949 - call HGENERATEEMPTYDEFFILE
1950 -@@ -4819,10 +4819,10 @@ setne al
1951 - shr eax, 1
1952 - sbb eax, eax
1953 - mov dword ptr [ebp-52], eax
1954 --jmp .Lt_0726
1955 -+jmp .Lt_0729
1956 - .Lt_01CE:
1957 - mov dword ptr [ebp-52], -1
1958 --.Lt_0726:
1959 -+.Lt_0729:
1960 - cmp dword ptr [ebp-52], 0
1961 - je .Lt_01D1
1962 - sub esp, 12
1963 -@@ -6324,7 +6324,7 @@ HANDLEOPT:
1964 - .type HANDLEOPT, @function
1965 - push ebp
1966 - mov ebp, esp
1967 --sub esp, 36
1968 -+sub esp, 52
1969 - push ebx
1970 - .Lt_028C:
1971 - mov eax, dword ptr [ebp+8]
1972 -@@ -7603,6 +7603,8 @@ sub esp, 12
1973 - push 0
1974 - push -1
1975 - sub esp, 8
1976 -+push -1
1977 -+sub esp, 12
1978 - push 2
1979 - push offset Lt_00B4
1980 - push -1
1981 -@@ -7632,6 +7634,17 @@ mov dword ptr [ebp-20], 0
1982 - lea eax, [ebp-28]
1983 - push eax
1984 - call fb_StrConcat
1985 -+add esp, 32
1986 -+push eax
1987 -+push 128
1988 -+lea eax, [FBC+1346]
1989 -+push eax
1990 -+mov dword ptr [ebp-40], 0
1991 -+mov dword ptr [ebp-36], 0
1992 -+mov dword ptr [ebp-32], 0
1993 -+lea eax, [ebp-40]
1994 -+push eax
1995 -+call fb_StrConcat
1996 - add esp, 28
1997 - push eax
1998 - push 128
1999 -@@ -7640,11 +7653,13 @@ push eax
2000 - call fb_StrAssign
2001 - add esp, 32
2002 - jmp .Lt_028E
2003 --.Lt_034F:
2004 -+.Lt_0350:
2005 - sub esp, 12
2006 - push 0
2007 - push -1
2008 - sub esp, 8
2009 -+push -1
2010 -+sub esp, 12
2011 - push 2
2012 - push offset Lt_00B4
2013 - push -1
2014 -@@ -7674,6 +7689,17 @@ mov dword ptr [ebp-20], 0
2015 - lea eax, [ebp-28]
2016 - push eax
2017 - call fb_StrConcat
2018 -+add esp, 32
2019 -+push eax
2020 -+push 128
2021 -+lea eax, [FBC+1602]
2022 -+push eax
2023 -+mov dword ptr [ebp-40], 0
2024 -+mov dword ptr [ebp-36], 0
2025 -+mov dword ptr [ebp-32], 0
2026 -+lea eax, [ebp-40]
2027 -+push eax
2028 -+call fb_StrConcat
2029 - add esp, 28
2030 - push eax
2031 - push 128
2032 -@@ -7682,11 +7708,13 @@ push eax
2033 - call fb_StrAssign
2034 - add esp, 32
2035 - jmp .Lt_028E
2036 --.Lt_0352:
2037 -+.Lt_0354:
2038 - sub esp, 12
2039 - push 0
2040 - push -1
2041 - sub esp, 8
2042 -+push -1
2043 -+sub esp, 12
2044 - push 2
2045 - push offset Lt_00B4
2046 - push -1
2047 -@@ -7716,6 +7744,17 @@ mov dword ptr [ebp-20], 0
2048 - lea eax, [ebp-28]
2049 - push eax
2050 - call fb_StrConcat
2051 -+add esp, 32
2052 -+push eax
2053 -+push 128
2054 -+lea eax, [FBC+1474]
2055 -+push eax
2056 -+mov dword ptr [ebp-40], 0
2057 -+mov dword ptr [ebp-36], 0
2058 -+mov dword ptr [ebp-32], 0
2059 -+lea eax, [ebp-40]
2060 -+push eax
2061 -+call fb_StrConcat
2062 - add esp, 28
2063 - push eax
2064 - push 128
2065 -@@ -7724,7 +7763,7 @@ push eax
2066 - call fb_StrAssign
2067 - add esp, 32
2068 - jmp .Lt_028E
2069 --.Lt_0355:
2070 -+.Lt_0358:
2071 - sub esp, 12
2072 - push 0
2073 - push -1
2074 -@@ -7735,7 +7774,7 @@ push eax
2075 - call fb_StrAssign
2076 - add esp, 32
2077 - jmp .Lt_028E
2078 --.Lt_0356:
2079 -+.Lt_0359:
2080 - sub esp, 12
2081 - push 0
2082 - push -1
2083 -@@ -7751,28 +7790,28 @@ push eax
2084 - call fb_StrInit
2085 - add esp, 32
2086 - push 13
2087 --push offset Lt_035A
2088 -+push offset Lt_035D
2089 - push -1
2090 - lea eax, [ebp-16]
2091 - push eax
2092 - call fb_StrCompare
2093 - add esp, 16
2094 - test eax, eax
2095 --jne .Lt_0359
2096 --.Lt_035B:
2097 -+jne .Lt_035C
2098 -+.Lt_035E:
2099 - sub esp, 8
2100 - push -1
2101 - push 22
2102 - call FBSETOPTION
2103 - add esp, 16
2104 --jmp .Lt_0357
2105 --.Lt_0359:
2106 -+jmp .Lt_035A
2107 -+.Lt_035C:
2108 - sub esp, 12
2109 - push dword ptr [ebp+12]
2110 - call HFATALINVALIDOPTION
2111 - add esp, 16
2112 --.Lt_035C:
2113 --.Lt_0357:
2114 -+.Lt_035F:
2115 -+.Lt_035A:
2116 - sub esp, 12
2117 - lea eax, [ebp-16]
2118 - push eax
2119 -@@ -7783,8 +7822,8 @@ jmp .Lt_028E
2120 - cmp dword ptr [ebp-4], 57
2121 - ja .Lt_028E
2122 - mov eax, dword ptr [ebp-4]
2123 --jmp dword ptr [.LT_035D+eax*4]
2124 --.LT_035D:
2125 -+jmp dword ptr [.LT_0360+eax*4]
2126 -+.LT_0360:
2127 - .int .Lt_0291
2128 - .int .Lt_0292
2129 - .int .Lt_0299
2130 -@@ -7839,10 +7878,10 @@ jmp dword ptr [.LT_035D+eax*4]
2131 - .int .Lt_0328
2132 - .int .Lt_0329
2133 - .int .Lt_034C
2134 --.int .Lt_034F
2135 --.int .Lt_0352
2136 --.int .Lt_0355
2137 --.int .Lt_0356
2138 -+.int .Lt_0350
2139 -+.int .Lt_0354
2140 -+.int .Lt_0358
2141 -+.int .Lt_0359
2142 - .Lt_028E:
2143 - .Lt_028D:
2144 - pop ebx
2145 -@@ -7858,131 +7897,119 @@ mov ebp, esp
2146 - sub esp, 20
2147 - push ebx
2148 - mov dword ptr [ebp-4], 0
2149 --.Lt_035E:
2150 -+.Lt_0361:
2151 - mov eax, dword ptr [ebp+8]
2152 - movzx ebx, byte ptr [eax]
2153 - mov dword ptr [ebp-8], ebx
2154 --jmp .Lt_0361
2155 --.Lt_0363:
2156 -+jmp .Lt_0364
2157 -+.Lt_0366:
2158 - mov ebx, dword ptr [ebp+8]
2159 - movzx eax, byte ptr [ebx+1]
2160 - test eax, eax
2161 --jne .Lt_0366
2162 -+jne .Lt_0369
2163 - mov dword ptr [ebp-4], 0
2164 --jmp .Lt_035F
2165 --.Lt_0366:
2166 --.Lt_0365:
2167 -+jmp .Lt_0362
2168 -+.Lt_0369:
2169 -+.Lt_0368:
2170 - push 5
2171 --push offset Lt_0367
2172 -+push offset Lt_036A
2173 - push 0
2174 - push dword ptr [ebp+8]
2175 - call fb_StrCompare
2176 - add esp, 16
2177 - test eax, eax
2178 --jne .Lt_0369
2179 -+jne .Lt_036C
2180 - mov dword ptr [ebp-4], 1
2181 --jmp .Lt_035F
2182 --.Lt_0369:
2183 --.Lt_0368:
2184 -+jmp .Lt_0362
2185 -+.Lt_036C:
2186 -+.Lt_036B:
2187 - push 4
2188 --push offset Lt_036A
2189 -+push offset Lt_036D
2190 - push 0
2191 - push dword ptr [ebp+8]
2192 - call fb_StrCompare
2193 - add esp, 16
2194 - test eax, eax
2195 --jne .Lt_036C
2196 -+jne .Lt_036F
2197 - mov dword ptr [ebp-4], 2
2198 --jmp .Lt_035F
2199 --.Lt_036C:
2200 --.Lt_036B:
2201 --jmp .Lt_0360
2202 --.Lt_036D:
2203 -+jmp .Lt_0362
2204 -+.Lt_036F:
2205 -+.Lt_036E:
2206 -+jmp .Lt_0363
2207 -+.Lt_0370:
2208 - mov eax, dword ptr [ebp+8]
2209 - movzx ebx, byte ptr [eax+1]
2210 - test ebx, ebx
2211 --jne .Lt_0370
2212 -+jne .Lt_0373
2213 - mov dword ptr [ebp-4], 3
2214 --jmp .Lt_035F
2215 --.Lt_0370:
2216 --.Lt_036F:
2217 --jmp .Lt_0360
2218 --.Lt_0371:
2219 -+jmp .Lt_0362
2220 -+.Lt_0373:
2221 -+.Lt_0372:
2222 -+jmp .Lt_0363
2223 -+.Lt_0374:
2224 - mov ebx, dword ptr [ebp+8]
2225 - movzx eax, byte ptr [ebx+1]
2226 - test eax, eax
2227 --jne .Lt_0374
2228 -+jne .Lt_0377
2229 - mov dword ptr [ebp-4], 4
2230 --jmp .Lt_035F
2231 --.Lt_0374:
2232 --.Lt_0373:
2233 --jmp .Lt_0360
2234 --.Lt_0375:
2235 -+jmp .Lt_0362
2236 -+.Lt_0377:
2237 -+.Lt_0376:
2238 -+jmp .Lt_0363
2239 -+.Lt_0378:
2240 - mov eax, dword ptr [ebp+8]
2241 - movzx ebx, byte ptr [eax+1]
2242 - test ebx, ebx
2243 --jne .Lt_0378
2244 -+jne .Lt_037B
2245 - mov dword ptr [ebp-4], 5
2246 --jmp .Lt_035F
2247 --.Lt_0378:
2248 --.Lt_0377:
2249 --jmp .Lt_0360
2250 --.Lt_0379:
2251 -+jmp .Lt_0362
2252 -+.Lt_037B:
2253 -+.Lt_037A:
2254 -+jmp .Lt_0363
2255 -+.Lt_037C:
2256 - mov ebx, dword ptr [ebp+8]
2257 - movzx eax, byte ptr [ebx+1]
2258 - test eax, eax
2259 --jne .Lt_037C
2260 -+jne .Lt_037F
2261 - mov dword ptr [ebp-4], 6
2262 --jmp .Lt_035F
2263 --.Lt_037C:
2264 --.Lt_037B:
2265 -+jmp .Lt_0362
2266 -+.Lt_037F:
2267 -+.Lt_037E:
2268 - push 4
2269 --push offset Lt_037D
2270 -+push offset Lt_0380
2271 - push 0
2272 - push dword ptr [ebp+8]
2273 - call fb_StrCompare
2274 - add esp, 16
2275 - test eax, eax
2276 --jne .Lt_037F
2277 -+jne .Lt_0382
2278 - mov dword ptr [ebp-4], 7
2279 --jmp .Lt_035F
2280 --.Lt_037F:
2281 --.Lt_037E:
2282 -+jmp .Lt_0362
2283 -+.Lt_0382:
2284 -+.Lt_0381:
2285 - push 6
2286 --push offset Lt_0380
2287 -+push offset Lt_0383
2288 - push 0
2289 - push dword ptr [ebp+8]
2290 - call fb_StrCompare
2291 - add esp, 16
2292 - test eax, eax
2293 --jne .Lt_0382
2294 -+jne .Lt_0385
2295 - mov dword ptr [ebp-4], 8
2296 --jmp .Lt_035F
2297 --.Lt_0382:
2298 --.Lt_0381:
2299 --jmp .Lt_0360
2300 --.Lt_0383:
2301 -+jmp .Lt_0362
2302 -+.Lt_0385:
2303 -+.Lt_0384:
2304 -+jmp .Lt_0363
2305 -+.Lt_0386:
2306 - mov eax, dword ptr [ebp+8]
2307 - movzx ebx, byte ptr [eax+1]
2308 - test ebx, ebx
2309 --jne .Lt_0386
2310 --mov dword ptr [ebp-4], 9
2311 --jmp .Lt_035F
2312 --.Lt_0386:
2313 --.Lt_0385:
2314 --push 3
2315 --push offset Lt_0387
2316 --push 0
2317 --push dword ptr [ebp+8]
2318 --call fb_StrCompare
2319 --add esp, 16
2320 --test eax, eax
2321 - jne .Lt_0389
2322 --mov dword ptr [ebp-4], 10
2323 --jmp .Lt_035F
2324 -+mov dword ptr [ebp-4], 9
2325 -+jmp .Lt_0362
2326 - .Lt_0389:
2327 - .Lt_0388:
2328 --push 4
2329 -+push 3
2330 - push offset Lt_038A
2331 - push 0
2332 - push dword ptr [ebp+8]
2333 -@@ -7990,11 +8017,11 @@ call fb_StrCompare
2334 - add esp, 16
2335 - test eax, eax
2336 - jne .Lt_038C
2337 --mov dword ptr [ebp-4], 11
2338 --jmp .Lt_035F
2339 -+mov dword ptr [ebp-4], 10
2340 -+jmp .Lt_0362
2341 - .Lt_038C:
2342 - .Lt_038B:
2343 --push 7
2344 -+push 4
2345 - push offset Lt_038D
2346 - push 0
2347 - push dword ptr [ebp+8]
2348 -@@ -8002,25 +8029,25 @@ call fb_StrCompare
2349 - add esp, 16
2350 - test eax, eax
2351 - jne .Lt_038F
2352 --mov dword ptr [ebp-4], 12
2353 --jmp .Lt_035F
2354 -+mov dword ptr [ebp-4], 11
2355 -+jmp .Lt_0362
2356 - .Lt_038F:
2357 - .Lt_038E:
2358 --jmp .Lt_0360
2359 --.Lt_0390:
2360 --push 10
2361 --push offset Lt_0392
2362 -+push 7
2363 -+push offset Lt_0390
2364 - push 0
2365 - push dword ptr [ebp+8]
2366 - call fb_StrCompare
2367 - add esp, 16
2368 - test eax, eax
2369 --jne .Lt_0394
2370 --mov dword ptr [ebp-4], 13
2371 --jmp .Lt_035F
2372 --.Lt_0394:
2373 -+jne .Lt_0392
2374 -+mov dword ptr [ebp-4], 12
2375 -+jmp .Lt_0362
2376 -+.Lt_0392:
2377 -+.Lt_0391:
2378 -+jmp .Lt_0363
2379 - .Lt_0393:
2380 --push 7
2381 -+push 10
2382 - push offset Lt_0395
2383 - push 0
2384 - push dword ptr [ebp+8]
2385 -@@ -8028,11 +8055,11 @@ call fb_StrCompare
2386 - add esp, 16
2387 - test eax, eax
2388 - jne .Lt_0397
2389 --mov dword ptr [ebp-4], 14
2390 --jmp .Lt_035F
2391 -+mov dword ptr [ebp-4], 13
2392 -+jmp .Lt_0362
2393 - .Lt_0397:
2394 - .Lt_0396:
2395 --push 4
2396 -+push 7
2397 - push offset Lt_0398
2398 - push 0
2399 - push dword ptr [ebp+8]
2400 -@@ -8040,125 +8067,125 @@ call fb_StrCompare
2401 - add esp, 16
2402 - test eax, eax
2403 - jne .Lt_039A
2404 --mov dword ptr [ebp-4], 15
2405 --jmp .Lt_035F
2406 -+mov dword ptr [ebp-4], 14
2407 -+jmp .Lt_0362
2408 - .Lt_039A:
2409 - .Lt_0399:
2410 --jmp .Lt_0360
2411 --.Lt_039B:
2412 -+push 4
2413 -+push offset Lt_039B
2414 -+push 0
2415 -+push dword ptr [ebp+8]
2416 -+call fb_StrCompare
2417 -+add esp, 16
2418 -+test eax, eax
2419 -+jne .Lt_039D
2420 -+mov dword ptr [ebp-4], 15
2421 -+jmp .Lt_0362
2422 -+.Lt_039D:
2423 -+.Lt_039C:
2424 -+jmp .Lt_0363
2425 -+.Lt_039E:
2426 - mov eax, dword ptr [ebp+8]
2427 - movzx ebx, byte ptr [eax+1]
2428 - test ebx, ebx
2429 --jne .Lt_039E
2430 -+jne .Lt_03A1
2431 - mov dword ptr [ebp-4], 16
2432 --jmp .Lt_035F
2433 --.Lt_039E:
2434 --.Lt_039D:
2435 -+jmp .Lt_0362
2436 -+.Lt_03A1:
2437 -+.Lt_03A0:
2438 - push 4
2439 --push offset Lt_039F
2440 -+push offset Lt_03A2
2441 - push 0
2442 - push dword ptr [ebp+8]
2443 - call fb_StrCompare
2444 - add esp, 16
2445 - test eax, eax
2446 --jne .Lt_03A1
2447 -+jne .Lt_03A4
2448 - mov dword ptr [ebp-4], 17
2449 --jmp .Lt_035F
2450 --.Lt_03A1:
2451 --.Lt_03A0:
2452 --jmp .Lt_0360
2453 --.Lt_03A2:
2454 -+jmp .Lt_0362
2455 -+.Lt_03A4:
2456 -+.Lt_03A3:
2457 -+jmp .Lt_0363
2458 -+.Lt_03A5:
2459 - push 5
2460 --push offset Lt_03A4
2461 -+push offset Lt_03A7
2462 - push 0
2463 - push dword ptr [ebp+8]
2464 - call fb_StrCompare
2465 - add esp, 16
2466 - test eax, eax
2467 --jne .Lt_03A6
2468 -+jne .Lt_03A9
2469 - mov dword ptr [ebp-4], 18
2470 --jmp .Lt_035F
2471 --.Lt_03A6:
2472 --.Lt_03A5:
2473 --jmp .Lt_0360
2474 --.Lt_03A7:
2475 -+jmp .Lt_0362
2476 -+.Lt_03A9:
2477 -+.Lt_03A8:
2478 -+jmp .Lt_0363
2479 -+.Lt_03AA:
2480 - mov eax, dword ptr [ebp+8]
2481 - movzx ebx, byte ptr [eax+1]
2482 - test ebx, ebx
2483 --jne .Lt_03AA
2484 -+jne .Lt_03AD
2485 - mov dword ptr [ebp-4], 19
2486 --jmp .Lt_035F
2487 --.Lt_03AA:
2488 --.Lt_03A9:
2489 -+jmp .Lt_0362
2490 -+.Lt_03AD:
2491 -+.Lt_03AC:
2492 - push 8
2493 --push offset Lt_03AB
2494 -+push offset Lt_03AE
2495 - push 0
2496 - push dword ptr [ebp+8]
2497 - call fb_StrCompare
2498 - add esp, 16
2499 - test eax, eax
2500 --jne .Lt_03AD
2501 -+jne .Lt_03B0
2502 - mov dword ptr [ebp-4], 20
2503 --jmp .Lt_035F
2504 --.Lt_03AD:
2505 --.Lt_03AC:
2506 --jmp .Lt_0360
2507 --.Lt_03AE:
2508 -+jmp .Lt_0362
2509 -+.Lt_03B0:
2510 -+.Lt_03AF:
2511 -+jmp .Lt_0363
2512 -+.Lt_03B1:
2513 - mov eax, dword ptr [ebp+8]
2514 - movzx ebx, byte ptr [eax+1]
2515 - test ebx, ebx
2516 --jne .Lt_03B1
2517 -+jne .Lt_03B4
2518 - mov dword ptr [ebp-4], 21
2519 --jmp .Lt_035F
2520 --.Lt_03B1:
2521 --.Lt_03B0:
2522 -+jmp .Lt_0362
2523 -+.Lt_03B4:
2524 -+.Lt_03B3:
2525 - push 5
2526 --push offset Lt_03B2
2527 -+push offset Lt_03B5
2528 - push 0
2529 - push dword ptr [ebp+8]
2530 - call fb_StrCompare
2531 - add esp, 16
2532 - test eax, eax
2533 --jne .Lt_03B4
2534 -+jne .Lt_03B7
2535 - mov dword ptr [ebp-4], 22
2536 --jmp .Lt_035F
2537 --.Lt_03B4:
2538 --.Lt_03B3:
2539 --push 4
2540 -+jmp .Lt_0362
2541 -+.Lt_03B7:
2542 -+.Lt_03B6:
2543 -+push 4
2544 - push offset Lt_0046
2545 - push 0
2546 - push dword ptr [ebp+8]
2547 - call fb_StrCompare
2548 - add esp, 16
2549 - test eax, eax
2550 --jne .Lt_03B6
2551 -+jne .Lt_03B9
2552 - mov dword ptr [ebp-4], 23
2553 --jmp .Lt_035F
2554 --.Lt_03B6:
2555 --.Lt_03B5:
2556 --jmp .Lt_0360
2557 --.Lt_03B7:
2558 -+jmp .Lt_0362
2559 -+.Lt_03B9:
2560 -+.Lt_03B8:
2561 -+jmp .Lt_0363
2562 -+.Lt_03BA:
2563 - mov eax, dword ptr [ebp+8]
2564 - movzx ebx, byte ptr [eax+1]
2565 - test ebx, ebx
2566 --jne .Lt_03BA
2567 --mov dword ptr [ebp-4], 24