mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-10 11:09:16 +02:00
f7782641ad
54153 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
florian
|
f7782641ad |
--- Merging r40738 into '.':
U rtl/linux/Makefile.fpc U rtl/linux/Makefile --- Recording mergeinfo for merge of r40738 into '.': U . git-svn-id: branches/fixes_3_2@40739 - |
||
|
Jonas Maebe
|
fc9e9e804a |
--- Merging r40512 into '.':
A tests/webtbs/tw33607.pp U compiler/aarch64/hlcgcpu.pas --- Recording mergeinfo for merge of r40512 into '.': U . --- Merging r40566 into '.': U compiler/aarch64/cpupara.pas --- Recording mergeinfo for merge of r40566 into '.': G . --- Merging r40567 into '.': G compiler/aarch64/cpupara.pas --- Recording mergeinfo for merge of r40567 into '.': G . --- Merging r40573 into '.': G compiler/aarch64/cpupara.pas --- Recording mergeinfo for merge of r40573 into '.': G . --- Merging r40629 into '.': U compiler/ncnv.pas U compiler/llvm/nllvmcnv.pas --- Recording mergeinfo for merge of r40629 into '.': G . --- Merging r40637 into '.': U compiler/ncon.pas A tests/webtbs/tw33666.pp --- Recording mergeinfo for merge of r40637 into '.': G . --- Merging r40729 into '.': U compiler/ncal.pas U compiler/jvm/njvminl.pas U compiler/ninl.pas --- Recording mergeinfo for merge of r40729 into '.': G . git-svn-id: branches/fixes_3_2@40735 - |
||
|
marco
|
5826dfa53d |
--- Merging r40608 into '.':
A packages/sqlite/src/sqlite3ext.pp U packages/sqlite/fpmake.pp --- Recording mergeinfo for merge of r40608 into '.': U . --- Merging r40609 into '.': A packages/sqlite/examples/myext.pp A packages/sqlite/examples/myext.lpi --- Recording mergeinfo for merge of r40609 into '.': G . # revisions: 40608,40609 git-svn-id: branches/fixes_3_2@40728 - |
||
|
marco
|
3bdf46a423 |
--- Merging r40524 into '.':
U rtl/objpas/classes/bits.inc U rtl/objpas/classes/classesh.inc A tests/test/units/classes/ttbits.pp --- Recording mergeinfo for merge of r40524 into '.': U . # revisions: 40524 git-svn-id: branches/fixes_3_2@40727 - |
||
|
marco
|
35de02532b |
--- Merging r40513 into '.':
U rtl/solaris/ostypes.inc --- Recording mergeinfo for merge of r40513 into '.': U . # revisions: 40513 git-svn-id: branches/fixes_3_2@40726 - |
||
|
marco
|
49f4652c23 |
--- Merging r40615 into '.':
U packages/chm/src/chmcmd.lpr --- Recording mergeinfo for merge of r40615 into '.': U . # revisions: 40615 git-svn-id: branches/fixes_3_2@40725 - |
||
|
marco
|
bb89a4dca0 |
--- Merging r39842 into '.':
U packages/fcl-pdf/src/fppdf.pp U packages/fcl-pdf/examples/testfppdf.lpr --- Recording mergeinfo for merge of r39842 into '.': U . --- Merging r40054 into '.': U packages/fcl-pdf/src/fpparsettf.pp --- Recording mergeinfo for merge of r40054 into '.': G . # revisions: 39842,40054 git-svn-id: branches/fixes_3_2@40723 - |
||
|
marco
|
e680d94fe1 |
--- Merging r40191 into '.':
U packages/fcl-js/src/jsbase.pp U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40191 into '.': U . --- Merging r40195 into '.': U packages/fcl-web/examples/simpleserver/simpleserver.pas --- Recording mergeinfo for merge of r40195 into '.': G . --- Merging r40203 into '.': U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r40203 into '.': G . --- Merging r40364 into '.': U packages/fcl-web/src/base/fphttpstatus.pas U packages/fcl-web/fpmake.pp --- Recording mergeinfo for merge of r40364 into '.': G . --- Merging r40366 into '.': G packages/fcl-web/examples/simpleserver/simpleserver.pas U packages/fcl-web/examples/simpleserver/simpleserver.lpi --- Recording mergeinfo for merge of r40366 into '.': G . --- Merging r40393 into '.': U packages/fcl-web/src/base/httproute.pp --- Recording mergeinfo for merge of r40393 into '.': G . --- Merging r40395 into '.': U packages/fcl-web/src/base/fphttpclient.pp --- Recording mergeinfo for merge of r40395 into '.': G . --- Merging r40592 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40592 into '.': G . --- Merging r40707 into '.': U packages/fcl-js/tests/tcwriter.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40707 into '.': G . # revisions: 40191,40195,40203,40364,40366,40393,40395,40592,40707 git-svn-id: branches/fixes_3_2@40719 - |
||
|
marco
|
e16529a374 |
--- Merging r40076 into '.':
U packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40076 into '.': U . --- Merging r40081 into '.': U packages/pastojs/tests/tcmodules.pas U packages/pastojs/src/fppas2js.pp U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40081 into '.': G . --- Merging r40083 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40083 into '.': G . --- Merging r40084 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40084 into '.': G . --- Merging r40085 into '.': U packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40085 into '.': G . --- Merging r40101 into '.': U packages/pastojs/src/pas2jsfileutils.pp U packages/pastojs/src/pas2jsfileutilsnodejs.inc --- Recording mergeinfo for merge of r40101 into '.': G . --- Merging r40105 into '.': G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40105 into '.': G . --- Merging r40106 into '.': G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40106 into '.': G . --- Merging r40107 into '.': U packages/pastojs/src/pas2jspparser.pp --- Recording mergeinfo for merge of r40107 into '.': G . --- Merging r40116 into '.': U utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40116 into '.': G . --- Merging r40126 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40126 into '.': G . --- Merging r40127 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40127 into '.': G . --- Merging r40133 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40133 into '.': G . --- Merging r40135 into '.': U packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40135 into '.': G . --- Merging r40138 into '.': G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40138 into '.': G . --- Merging r40139 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40139 into '.': G . --- Merging r40140 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40140 into '.': G . --- Merging r40143 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40143 into '.': G . --- Merging r40146 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40146 into '.': G . --- Merging r40148 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40148 into '.': G . --- Merging r40151 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40151 into '.': G . --- Merging r40152 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40152 into '.': G . --- Merging r40164 into '.': U utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40164 into '.': G . --- Merging r40168 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40168 into '.': G . --- Merging r40175 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40175 into '.': G . --- Merging r40177 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40177 into '.': G . --- Merging r40192 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40192 into '.': G . --- Merging r40193 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40193 into '.': G . --- Merging r40194 into '.': U packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40194 into '.': G . --- Merging r40204 into '.': U packages/fcl-passrc/src/pasuseanalyzer.pas U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40204 into '.': G . --- Merging r40209 into '.': G packages/pastojs/src/pas2jslogger.pp --- Recording mergeinfo for merge of r40209 into '.': G . --- Merging r40210 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40210 into '.': G . --- Merging r40211 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40211 into '.': G . --- Merging r40241 into '.': U utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40241 into '.': G . --- Merging r40243 into '.': G utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40243 into '.': G . --- Merging r40245 into '.': U utils/pas2js/pas2js.cfg --- Recording mergeinfo for merge of r40245 into '.': G . --- Merging r40258 into '.': G utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40258 into '.': G . --- Merging r40259 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40259 into '.': G . --- Merging r40263 into '.': U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40263 into '.': G . --- Merging r40279 into '.': U packages/pastojs/tests/tcfiler.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/fppas2js.pp U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40279 into '.': G . --- Merging r40290 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40290 into '.': G . --- Merging r40302 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40302 into '.': G . --- Merging r40304 into '.': U packages/fcl-passrc/src/paswrite.pp --- Recording mergeinfo for merge of r40304 into '.': G . --- Merging r40305 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40305 into '.': G . --- Merging r40342 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40342 into '.': G . --- Merging r40343 into '.': U packages/pastojs/src/pas2jsfiler.pp G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40343 into '.': G . --- Merging r40351 into '.': U packages/fcl-js/src/jswriter.pp G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfileutilsunix.inc G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppas2js.pp U packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40351 into '.': G . --- Merging r40352 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40352 into '.': G . --- Merging r40353 into '.': U utils/pas2js/pas2jslib.lpi --- Recording mergeinfo for merge of r40353 into '.': G . --- Merging r40354 into '.': U packages/pastojs/fpmake.pp --- Recording mergeinfo for merge of r40354 into '.': G . --- Merging r40355 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40355 into '.': G . --- Merging r40356 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfileutils.pp U utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40356 into '.': G . --- Merging r40372 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40372 into '.': G . --- Merging r40423 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40423 into '.': G . --- Merging r40424 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40424 into '.': G . --- Merging r40426 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40426 into '.': G . --- Merging r40427 into '.': G packages/pastojs/fpmake.pp G packages/pastojs/src/pas2jscompiler.pp A packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40427 into '.': G . --- Merging r40428 into '.': U packages/pastojs/tests/tcunitsearch.pas U packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r40428 into '.': G . --- Merging r40429 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40429 into '.': G . --- Merging r40430 into '.': G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40430 into '.': G . --- Merging r40439 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40439 into '.': G . --- Merging r40440 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40440 into '.': G . --- Merging r40441 into '.': G packages/pastojs/src/pas2jspcucompiler.pp --- Recording mergeinfo for merge of r40441 into '.': G . # revisions: 40076,40081,40083,40084,40085,40101,40105,40106,40107,40116,40126,40127,40133,40135,40138,40139,40140,40143,40146,40148,40151,40152,40164,40168,40175,40177,40192,40193,40194,40204,40209,40210,40211,40241,40243,40245,40258,40259,40263,40279,40290,40302,40304,40305,40342,40343,40351,40352,40353,40354,40355,40356,40372,40423,40424,40426,40427,40428,40429,40430,40439,40440,40441 git-svn-id: branches/fixes_3_2@40718 - |
||
|
pierre
|
23b9dde397 |
Merge of commits 40142, 40189 and 40347
------------------------------------------------------------------------
r40142 | jonas | 2018-11-01 13:19:33 +0000 (Thu, 01 Nov 2018) | 2 lines
* ttryfinallynode now inherits from tbinarynode instead of tloopnode, as its
t1 field was always set to tnothingnode
------------------------------------------------------------------------
--- Merging r40142 into '.':
U compiler/i386/n386flw.pas
U compiler/nflw.pas
U compiler/x86_64/nx64flw.pas
U compiler/nutils.pas
U compiler/ppu.pas
U compiler/ncgflw.pas
U compiler/psub.pas
--- Recording mergeinfo for merge of r40142 into '.':
U .
------------------------------------------------------------------------
r40189 | jonas | 2018-11-02 21:12:18 +0000 (Fri, 02 Nov 2018) | 2 lines
* fixed overzealous removal of an assigned(t1) check in r40142 (it was for a
ttryexceptnode instead of for a ttryfinally node)
------------------------------------------------------------------------
--- Merging r40189 into '.':
G compiler/x86_64/nx64flw.pas
--- Recording mergeinfo for merge of r40189 into '.':
G .
------------------------------------------------------------------------
r40347 | pierre | 2018-11-18 10:32:13 +0000 (Sun, 18 Nov 2018) | 3 lines
* Use getasizeint/putasizeint for tfieldvarsym.fieldoffset
* Change CurrentPPUVersion
------------------------------------------------------------------------
--- Merging r40347 into '.':
G compiler/ppu.pas
U compiler/utils/ppuutils/ppudump.pp
U compiler/symsym.pas
--- Recording mergeinfo for merge of r40347 into '.':
G .
git-svn-id: branches/fixes_3_2@40717 -
|
||
|
pierre
|
92cd9502ef |
Merge of revisions 40277
40307
40309
40314
40319
40322
40324
40326
40377
40378 from trunk to fixes_3_2
------------------------------------------------------------------------
r40277 | pierre | 2018-11-08 20:18:30 +0000 (Thu, 08 Nov 2018) | 1 line
Implement mark_write override for tinilinenode
------------------------------------------------------------------------
--- Merging r40277 into '.':
U compiler/ninl.pas
--- Recording mergeinfo for merge of r40277 into '.':
U .
------------------------------------------------------------------------
r40307 | pierre | 2018-11-13 15:10:21 +0000 (Tue, 13 Nov 2018) | 6 lines
+ Introduce PPC_SUFFIXES, new make variable that lists all ppc suffixes
for all different CPUs supported.
* Use PPC_SUFFIXES in execlean and CPU_clean targets.
* Also delete CPU/bin subbirectory.
------------------------------------------------------------------------
--- Merging r40307 into '.':
U compiler/Makefile
U compiler/Makefile.fpc
--- Recording mergeinfo for merge of r40307 into '.':
G .
------------------------------------------------------------------------
r40309 | pierre | 2018-11-13 15:51:32 +0000 (Tue, 13 Nov 2018) | 1 line
Try to avoid expectloc not set after first pass error for call node
------------------------------------------------------------------------
--- Merging r40309 into '.':
U compiler/ncal.pas
--- Recording mergeinfo for merge of r40309 into '.':
G .
------------------------------------------------------------------------
r40314 | pierre | 2018-11-14 13:13:19 +0000 (Wed, 14 Nov 2018) | 4 lines
* Change first parameter type of function is_continuous_maks to aword type.
Add typecasts where needed to allow for successful compilation of arm-linux target
with -CriotR options when building the compiler.
------------------------------------------------------------------------
--- Merging r40314 into '.':
U compiler/arm/cpubase.pas
U compiler/arm/cgcpu.pas
--- Recording mergeinfo for merge of r40314 into '.':
G .
------------------------------------------------------------------------
r40319 | pierre | 2018-11-15 16:58:40 +0000 (Thu, 15 Nov 2018) | 1 line
Disable range check in m68k:tiscv32 and riscv64 cgcpu units
------------------------------------------------------------------------
--- Merging r40319 into '.':
C compiler/riscv64
U compiler/m68k/cgcpu.pas
C compiler/riscv32
--- Recording mergeinfo for merge of r40319 into '.':
G .
Summary of conflicts:
Tree conflicts: 2
------------------------------------------------------------------------
r40322 | pierre | 2018-11-15 22:01:25 +0000 (Thu, 15 Nov 2018) | 1 line
Also disable range checking in arm/aoptcpu unit
------------------------------------------------------------------------
--- Merging r40322 into '.':
U compiler/arm/aoptcpu.pas
--- Recording mergeinfo for merge of r40322 into '.':
G .
------------------------------------------------------------------------
r40324 | pierre | 2018-11-16 10:27:42 +0000 (Fri, 16 Nov 2018) | 4 lines
* Disable range check for m68k/aoptcpu unit
* Add missing change of var parameter p to next instruction
in TryToOptimizeMove method after instruction removal.
------------------------------------------------------------------------
--- Merging r40324 into '.':
U compiler/m68k/aoptcpu.pas
--- Recording mergeinfo for merge of r40324 into '.':
G .
------------------------------------------------------------------------
r40326 | pierre | 2018-11-16 13:28:26 +0000 (Fri, 16 Nov 2018) | 1 line
Change local variables offsetdec and extraoffset type to ASizeInt
------------------------------------------------------------------------
--- Merging r40326 into '.':
U compiler/ncgmem.pas
--- Recording mergeinfo for merge of r40326 into '.':
G .
------------------------------------------------------------------------
r40377 | pierre | 2018-11-27 10:19:36 +0000 (Tue, 27 Nov 2018) | 1 line
Fix bug report 34605 and add corresponding test
------------------------------------------------------------------------
--- Merging r40377 into '.':
A tests/webtbs/tw34605.pp
U compiler/nutils.pas
--- Recording mergeinfo for merge of r40377 into '.':
G .
------------------------------------------------------------------------
r40378 | pierre | 2018-11-27 10:21:37 +0000 (Tue, 27 Nov 2018) | 1 line
Avoid range errors or overflows on for AVR cpu, when computing address offsets
------------------------------------------------------------------------
--- Merging r40378 into '.':
U compiler/ncgset.pas
U compiler/ngtcon.pas
--- Recording mergeinfo for merge of r40378 into '.':
G .
git-svn-id: branches/fixes_3_2@40716 -
|
||
|
marco
|
4873692ce5 |
--- Merging r40063 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r40063 into '.': U . --- Merging r40240 into '.': U packages/fcl-db/tests/testsqldb.pas U packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r40240 into '.': G . --- Merging r40396 into '.': U packages/fcl-db/src/sqldb/postgres/pqeventmonitor.pp --- Recording mergeinfo for merge of r40396 into '.': G . --- Merging r40607 into '.': G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r40607 into '.': G . --- Merging r40610 into '.': A packages/fcl-db/examples/myext.pp A packages/fcl-db/examples/sqlite3extdemo.pp --- Recording mergeinfo for merge of r40610 into '.': G . # revisions: 40063,40240,40396,40607,40610 git-svn-id: branches/fixes_3_2@40713 - |
||
|
marco
|
4d66a5b4ad |
--- Merging r39851 into '.':
G packages/fcl-passrc/tests/tcresolver.pas G packages/pastojs/tests/tcprecompile.pas G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfiler.pp G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r39851 into '.': G . --- Merging r39853 into '.': U packages/fcl-js/src/jsbase.pp --- Recording mergeinfo for merge of r39853 into '.': G . --- Merging r39854 into '.': U packages/fcl-js/src/jswriter.pp U packages/pastojs/tests/tcsrcmap.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39854 into '.': G . --- Merging r39855 into '.': U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39855 into '.': G . --- Merging r39856 into '.': U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39856 into '.': G . --- Merging r39857 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39857 into '.': G . --- Merging r39898 into '.': G packages/fcl-js/src/jsbase.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r39898 into '.': G . --- Merging r39899 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39899 into '.': G . --- Merging r39904 into '.': U packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r39904 into '.': G . --- Merging r39906 into '.': G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39906 into '.': G . --- Merging r39908 into '.': U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r39908 into '.': G . --- Merging r39919 into '.': G packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/tests/tcuseanalyzer.pas U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r39919 into '.': G . --- Merging r39921 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r39921 into '.': G . --- Merging r39926 into '.': G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39926 into '.': G . --- Merging r39928 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39928 into '.': G . --- Merging r39929 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39929 into '.': G . --- Merging r39932 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r39932 into '.': G . --- Merging r39937 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r39937 into '.': G . --- Merging r39939 into '.': U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r39939 into '.': G . --- Merging r39940 into '.': U packages/fcl-passrc/src/pasresolveeval.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pparser.pp U packages/pastojs/tests/tcfiler.pas G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jsfiler.pp --- Recording mergeinfo for merge of r39940 into '.': G . --- Merging r39942 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39942 into '.': G . --- Merging r39944 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39944 into '.': G . --- Merging r39946 into '.': G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r39946 into '.': G . --- Merging r39966 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r39966 into '.': G . --- Merging r39968 into '.': G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r39968 into '.': G . --- Merging r39974 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39974 into '.': G . --- Merging r39975 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39975 into '.': G . --- Merging r39976 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39976 into '.': G . --- Merging r39977 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39977 into '.': G . --- Merging r39979 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r39979 into '.': G . --- Merging r39985 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39985 into '.': G . --- Merging r40013 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40013 into '.': G . --- Merging r40018 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolveeval.pas G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40018 into '.': G . --- Merging r40029 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40029 into '.': G . --- Merging r40030 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40030 into '.': G . --- Merging r40032 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40032 into '.': G . --- Merging r40034 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40034 into '.': G . --- Merging r40036 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-js/src/jsbase.pp --- Recording mergeinfo for merge of r40036 into '.': G . --- Merging r40037 into '.': A utils/pas2js/nodepas2js.pp A utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40037 into '.': G . --- Merging r40039 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40039 into '.': G . --- Merging r40040 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40040 into '.': G . --- Merging r40041 into '.': G packages/pastojs/src/pas2jslogger.pp U packages/pastojs/src/pas2jsfileutils.pp U packages/pastojs/src/pas2jsfilecache.pp U packages/pastojs/src/pas2js_defines.inc U packages/pastojs/src/pas2jsfileutilswin.inc G packages/pastojs/src/pas2jscompiler.pp A packages/pastojs/src/pas2jsfileutilsnodejs.inc U packages/pastojs/src/pas2jsfileutilsunix.inc --- Recording mergeinfo for merge of r40041 into '.': G . --- Merging r40042 into '.': U utils/pas2js/pas2js.pp U utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40042 into '.': G . --- Merging r40043 into '.': G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40043 into '.': G . --- Merging r40044 into '.': U packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40044 into '.': G . --- Merging r40045 into '.': G utils/pas2js/nodepas2js.pp U packages/fcl-json/src/jsonscanner.pp --- Recording mergeinfo for merge of r40045 into '.': G . --- Merging r40046 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40046 into '.': G . --- Merging r40047 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40047 into '.': G . --- Merging r40048 into '.': G packages/fcl-js/src/jssrcmap.pas G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40048 into '.': G . --- Merging r40049 into '.': G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfiler.pp G packages/pastojs/src/pas2jsfilecache.pp U packages/pastojs/src/fppjssrcmap.pp G packages/pastojs/src/pas2js_defines.inc G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40049 into '.': G . --- Merging r40051 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40051 into '.': G . --- Merging r40053 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppjssrcmap.pp --- Recording mergeinfo for merge of r40053 into '.': G . --- Merging r40055 into '.': G packages/fcl-json/src/fpjson.pp U packages/fcl-json/tests/testjsondata.pp --- Recording mergeinfo for merge of r40055 into '.': G . --- Merging r40058 into '.': U packages/fcl-json/tests/testjsonparser.pp U packages/fcl-json/tests/testjson.pp U packages/fcl-json/tests/testjson.lpi G packages/fcl-json/tests/testjsondata.pp G packages/fcl-json/src/fpjson.pp G packages/fcl-json/src/jsonscanner.pp --- Recording mergeinfo for merge of r40058 into '.': G . --- Merging r40061 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40061 into '.': G . --- Merging r40062 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/tests/tcfiler.pas G utils/pas2js/nodepas2js.pp U utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40062 into '.': G . --- Merging r40064 into '.': G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/pastojs/src/pas2jsfileutils.pp G packages/fcl-json/src/fpjson.pp G utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40064 into '.': G . --- Merging r40067 into '.': G packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40067 into '.': G . --- Merging r40072 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp G packages/fcl-json/src/fpjson.pp G packages/fcl-js/src/jswriter.pp G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40072 into '.': G . --- Merging r40075 into '.': G packages/fcl-json/src/fpjson.pp G packages/pastojs/src/pas2jscompiler.pp G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40075 into '.': G . --- Merging r40077 into '.': G packages/fcl-js/src/jssrcmap.pas G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40077 into '.': G . --- Merging r40080 into '.': G packages/fcl-js/src/jswriter.pp U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r40080 into '.': G . --- Merging r40082 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r40082 into '.': G . --- Merging r40098 into '.': G utils/pas2js/nodepas2js.pp U utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40098 into '.': G . --- Merging r40099 into '.': G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40099 into '.': G . --- Merging r40100 into '.': G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40100 into '.': G . --- Merging r40108 into '.': G utils/pas2js/nodepas2js.lpi G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40108 into '.': G . --- Merging r40125 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40125 into '.': G . --- Merging r40129 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40129 into '.': G . --- Merging r40136 into '.': G packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r40136 into '.': G . --- Merging r40137 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40137 into '.': G . --- Merging r40144 into '.': G packages/fcl-passrc/src/pasresolveeval.pas G utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40144 into '.': G . --- Merging r40150 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40150 into '.': G . --- Merging r40165 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40165 into '.': G . --- Merging r40166 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40166 into '.': G . --- Merging r40171 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40171 into '.': G . --- Merging r40173 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40173 into '.': G . # revisions: 39851,39853,39854,39855,39856,39857,39898,39899,39904,39906,39908,39919,39921,39926,39928,39929,39932,39937,39939,39940,39942,39944,39946,39966,39968,39974,39975,39976,39977,39979,39985,40013,40018,40029,40030,40032,40034,40036,40037,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40051,40053,40055,40058,40061,40062,40064,40067,40072,40075,40077,40080,40082,40098,40099,40100,40108,40125,40129,40136,40137,40144,40150,40165,40166,40171,40173 git-svn-id: branches/fixes_3_2@40709 - |
||
|
marco
|
da5c47ee16 |
--- Merging r40651 into '.':
U rtl/objpas/classes/classes.inc --- Recording mergeinfo for merge of r40651 into '.': U . # revisions: 40651 git-svn-id: branches/fixes_3_2@40688 - |
||
|
pierre
|
7bcb8e911c |
------------------------------------------------------------------------
r40619 | pierre | 2018-12-23 16:17:49 +0000 (Sun, 23 Dec 2018) | 8 lines
* in lexbase and yaccbase units,
use DirectorySeparator instead of '\' in functions
path, root and addext.
* in plex and pyacc programs, for unix,
try to find installed yyparse.cod using
path of paramstr(0).
------------------------------------------------------------------------
--- Merging r40619 into '.':
U utils/tply/pyacc.pas
U utils/tply/plex.pas
U utils/tply/yaccbase.pas
U utils/tply/lexbase.pas
U utils/tply/pyacc.y
--- Recording mergeinfo for merge of r40619 into '.':
U .
git-svn-id: branches/fixes_3_2@40627 -
|
||
|
pierre
|
de6e6c1443 |
Disable merging of /trunk:r39724,39820,39822-39824,39828-39830
Changes svn:mergeinfo property in: . packages/rtl-objpas/src/inc/rtti.pp packages/rtl-objpas/tests/tests.rtti.pas git-svn-id: branches/fixes_3_2@40626 - |
||
|
pierre
|
9ca0c1c5dc |
Fix compilation error after last commit
git-svn-id: branches/fixes_3_2@40625 - |
||
|
pierre
|
d8b0ded10c |
Marge of more trunk fixes into fixes branch.
------------------------------------------------------------------------ r39725 | pierre | 2018-09-10 13:28:33 +0000 (Mon, 10 Sep 2018) | 1 line Add branches for 3.2.0, 3.2.1 and 3.3.1 versions ------------------------------------------------------------------------ --- Merging r39725 into '.': U tests/utils/testsuite/utests.pp --- Recording mergeinfo for merge of r39725 into '.': U . ------------------------------------------------------------------------ r39733 | pierre | 2018-09-11 08:16:56 +0000 (Tue, 11 Sep 2018) | 1 line sparc64-linux objects recompiled with GCC 7.3.0 ------------------------------------------------------------------------ --- Merging r39733 into '.': U tests/test/cg/obj/readme.txt U tests/test/cg/obj/linux/sparc64/ctest.o U tests/test/cg/obj/linux/sparc64/cpptcl1.o U tests/test/cg/obj/linux/sparc64/cpptcl2.o U tests/test/cg/obj/linux/sparc64/tcext3.o U tests/test/cg/obj/linux/sparc64/tcext4.o U tests/test/cg/obj/linux/sparc64/tcext5.o U tests/test/cg/obj/linux/sparc64/tcext6.o --- Recording mergeinfo for merge of r39733 into '.': G . ------------------------------------------------------------------------ r39808 | pierre | 2018-09-26 09:29:33 +0000 (Wed, 26 Sep 2018) | 1 line Disable libraries not compiling for jvm-java or jvm-android targets ------------------------------------------------------------------------ --- Merging r39808 into '.': U packages/fppkg/fpmake.pp U packages/fcl-base/fpmake.pp U packages/rtl-extra/fpmake.pp U packages/hermes/fpmake.pp U packages/fcl-extra/fpmake.pp U packages/fcl-db/fpmake.pp U packages/unzip/fpmake.pp U packages/odbc/fpmake.pp U packages/gdbm/fpmake.pp U packages/pthreads/fpmake.pp U packages/fcl-json/fpmake.pp U packages/pcap/fpmake.pp U packages/numlib/fpmake.pp U packages/rtl-generics/fpmake.pp U packages/zlib/fpmake.pp U packages/paszlib/fpmake.pp U packages/webidl/fpmake.pp U packages/regexpr/fpmake.pp U packages/libgd/fpmake.pp U packages/fcl-net/fpmake.pp U packages/fcl-res/fpmake.pp U packages/libpng/fpmake.pp U packages/dblib/fpmake.pp U packages/tcl/fpmake.pp U packages/openssl/fpmake.pp U packages/ibase/fpmake.pp U packages/bzip2/fpmake.pp U packages/fcl-sdo/fpmake.pp U packages/fcl-sound/fpmake.pp U packages/fcl-passrc/fpmake.pp U packages/fcl-stl/fpmake.pp U packages/libmicrohttpd/fpmake.pp U packages/mysql/fpmake.pp U packages/postgres/fpmake.pp U packages/httpd22/fpmake.pp U packages/httpd24/fpmake.pp U packages/rtl-console/fpmake.pp U packages/sqlite/fpmake.pp U packages/fftw/fpmake.pp U packages/fcl-pdf/fpmake.pp U packages/rtl-objpas/fpmake.pp U packages/fcl-image/fpmake.pp U packages/pasjpeg/fpmake.pp U packages/chm/fpmake.pp U packages/fcl-registry/fpmake.pp U packages/libtar/fpmake.pp U packages/symbolic/fpmake.pp U packages/libenet/fpmake.pp U packages/imagemagick/fpmake.pp U packages/fcl-xml/fpmake.pp U packages/oracle/fpmake.pp U packages/fcl-fpcunit/fpmake.pp U packages/fcl-js/fpmake.pp U packages/fcl-async/fpmake.pp U packages/fcl-process/fpmake.pp U packages/pastojs/fpmake.pp U packages/hash/fpmake.pp U packages/rtl-unicode/fpmake.pp U packages/fpmkunit/fpmake.pp --- Recording mergeinfo for merge of r39808 into '.': G . ------------------------------------------------------------------------ r40027 | pierre | 2018-10-24 21:37:54 +0000 (Wed, 24 Oct 2018) | 1 line Fix compilation of RTL for watcom target ------------------------------------------------------------------------ --- Merging r40027 into '.': U compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40027 into '.': G . ------------------------------------------------------------------------ r40028 | pierre | 2018-10-25 06:39:42 +0000 (Thu, 25 Oct 2018) | 1 line Try to fix compilation error after commit #40027 ------------------------------------------------------------------------ --- Merging r40028 into '.': G compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40028 into '.': G . ------------------------------------------------------------------------ r40102 | pierre | 2018-10-31 09:07:57 +0000 (Wed, 31 Oct 2018) | 1 line Replace aint (which is a compiler specific type) by ptruint type, which is defined in system unit ------------------------------------------------------------------------ --- Merging r40102 into '.': U tests/test/tarray5.pp --- Recording mergeinfo for merge of r40102 into '.': G . ------------------------------------------------------------------------ r40103 | pierre | 2018-10-31 09:59:45 +0000 (Wed, 31 Oct 2018) | 1 line Use pdword to avoid range check erro in tentryfile.getdword method ------------------------------------------------------------------------ --- Merging r40103 into '.': U compiler/entfile.pas --- Recording mergeinfo for merge of r40103 into '.': G . ------------------------------------------------------------------------ r40104 | pierre | 2018-10-31 10:21:51 +0000 (Wed, 31 Oct 2018) | 1 line Use longint type instead of AWord for Initial parameter in CalcExecutionWeigths (to avoid range error for avr compiler) ------------------------------------------------------------------------ @@ begin Result:=fen_false; n.allocoptinfo; <<<<<<< MINE (select with 'mc') (367) Weight:=PAWord(arg)^; ||||||| ORIGINAL (367) Weight:=max(PAWord(arg)^,1); ======= Weight:=max(plongint(arg)^,1); >>>>>>> THEIRS (select with 'tc') (367) case n.nodetype of casen: begin --- Merging r40104 into '.': C compiler/optutils.pas --- Recording mergeinfo for merge of r40104 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40110 | pierre | 2018-10-31 14:51:23 +0000 (Wed, 31 Oct 2018) | 1 line Avoid range check error in MaskLength evaluation ------------------------------------------------------------------------ --- Merging r40110 into '.': U compiler/x86/aoptx86.pas --- Recording mergeinfo for merge of r40110 into '.': G . ------------------------------------------------------------------------ r40111 | pierre | 2018-10-31 15:47:53 +0000 (Wed, 31 Oct 2018) | 1 line Complement commit 40104, by changing type of executionweight in toptinfo record and adapt pass_2 code ------------------------------------------------------------------------ --- Merging r40111 into '.': U compiler/pass_2.pas U compiler/optbase.pas --- Recording mergeinfo for merge of r40111 into '.': G . ------------------------------------------------------------------------ r40112 | pierre | 2018-10-31 15:48:32 +0000 (Wed, 31 Oct 2018) | 1 line Disable range check completely in arm/cgcpu unit ------------------------------------------------------------------------ --- Merging r40112 into '.': U compiler/arm/cgcpu.pas --- Recording mergeinfo for merge of r40112 into '.': G . ------------------------------------------------------------------------ r40113 | pierre | 2018-10-31 15:49:14 +0000 (Wed, 31 Oct 2018) | 1 line Avoid overflow in code ------------------------------------------------------------------------ --- Merging r40113 into '.': U compiler/symdef.pas --- Recording mergeinfo for merge of r40113 into '.': G . ------------------------------------------------------------------------ r40114 | pierre | 2018-10-31 15:50:26 +0000 (Wed, 31 Oct 2018) | 1 line Add explicit rtlclean/rtl targets in fullcycle rule if DOWPOCYCLE is set ------------------------------------------------------------------------ --- Merging r40114 into '.': U compiler/Makefile.fpc U compiler/Makefile --- Recording mergeinfo for merge of r40114 into '.': G . ------------------------------------------------------------------------ r40120 | pierre | 2018-10-31 23:15:22 +0000 (Wed, 31 Oct 2018) | 1 line Change RemoveCurrentP parameter type to tai, because GetNextInstruction does not always return a taicpu, adapt code in avr/aoptcpu unit ------------------------------------------------------------------------ --- Merging r40120 into '.': U compiler/aoptobj.pas U compiler/avr/aoptcpu.pas --- Recording mergeinfo for merge of r40120 into '.': G . ------------------------------------------------------------------------ r40121 | pierre | 2018-10-31 23:16:51 +0000 (Wed, 31 Oct 2018) | 1 line Add check about tloadnode.symtableentry type before typecast ------------------------------------------------------------------------ --- Merging r40121 into '.': U compiler/ncal.pas --- Recording mergeinfo for merge of r40121 into '.': G . ------------------------------------------------------------------------ r40122 | pierre | 2018-10-31 23:18:09 +0000 (Wed, 31 Oct 2018) | 1 line Fix typecast in FindRegDeAlloc call ------------------------------------------------------------------------ --- Merging r40122 into '.': U compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r40122 into '.': G . ------------------------------------------------------------------------ r40123 | pierre | 2018-10-31 23:19:39 +0000 (Wed, 31 Oct 2018) | 1 line Remove unneeded typecasts in TryTOptimizeMove ------------------------------------------------------------------------ --- Merging r40123 into '.': U compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40123 into '.': G . ------------------------------------------------------------------------ r40124 | pierre | 2018-10-31 23:20:29 +0000 (Wed, 31 Oct 2018) | 1 line Add global range check disable for i8086 cgcpu and x86 nx86add units ------------------------------------------------------------------------ --- Merging r40124 into '.': U compiler/i8086/cgcpu.pas U compiler/x86/nx86add.pas --- Recording mergeinfo for merge of r40124 into '.': G . ------------------------------------------------------------------------ r40131 | pierre | 2018-11-01 07:01:02 +0000 (Thu, 01 Nov 2018) | 1 line Remove another wrong typecast when testing that a tai is an instruction ------------------------------------------------------------------------ --- Merging r40131 into '.': G compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40131 into '.': G . ------------------------------------------------------------------------ r40236 | pierre | 2018-11-06 07:40:31 +0000 (Tue, 06 Nov 2018) | 1 line Really change extension of hs1 local variable in get_exepath ------------------------------------------------------------------------ --- Merging r40236 into '.': U compiler/globals.pas --- Recording mergeinfo for merge of r40236 into '.': G . ------------------------------------------------------------------------ r40237 | pierre | 2018-11-06 07:41:15 +0000 (Tue, 06 Nov 2018) | 1 line Disable range checking in rax86int unit ------------------------------------------------------------------------ --- Merging r40237 into '.': U compiler/x86/rax86int.pas --- Recording mergeinfo for merge of r40237 into '.': G . ------------------------------------------------------------------------ r40278 | pierre | 2018-11-08 20:19:54 +0000 (Thu, 08 Nov 2018) | 1 line Downgrade EXTDEBUG warning to note about zero size temp, as it is used for empty sets ------------------------------------------------------------------------ --- Merging r40278 into '.': U compiler/tgobj.pas --- Recording mergeinfo for merge of r40278 into '.': G . git-svn-id: branches/fixes_3_2@40624 - |
||
|
pierre
|
f0eedd5d71 |
Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2
------------------------------------------------------------------------ r39726 | pierre | 2018-09-10 13:30:42 +0000 (Mon, 10 Sep 2018) | 1 line pass -D__I8086_SMARTLINK_SECTIONS__ to nasm if FPCOPT contains -dTEST_I8086_SMARTLINK_SECTIONS ------------------------------------------------------------------------ --- Merging r39726 into '.': U rtl/msdos/Makefile U rtl/msdos/Makefile.fpc --- Recording mergeinfo for merge of r39726 into '.': U . ------------------------------------------------------------------------ r39732 | pierre | 2018-09-11 08:02:48 +0000 (Tue, 11 Sep 2018) | 1 line Add FPC_SOFT_FPUX80 and FPC_SOFT_FPU128 define handling ------------------------------------------------------------------------ --- Merging r39732 into '.': U rtl/linux/system.pp --- Recording mergeinfo for merge of r39732 into '.': G . ------------------------------------------------------------------------ r39734 | pierre | 2018-09-11 13:08:51 +0000 (Tue, 11 Sep 2018) | 1 line Increase default trace size to 16 ------------------------------------------------------------------------ --- Merging r39734 into '.': U rtl/inc/heaptrc.pp --- Recording mergeinfo for merge of r39734 into '.': G . ------------------------------------------------------------------------ r39735 | pierre | 2018-09-11 13:10:59 +0000 (Tue, 11 Sep 2018) | 1 line Avoid wrap on 32-bit system for StackTop calculation ------------------------------------------------------------------------ --- Merging r39735 into '.': U rtl/inc/system.inc --- Recording mergeinfo for merge of r39735 into '.': G . ------------------------------------------------------------------------ r39736 | pierre | 2018-09-11 13:13:50 +0000 (Tue, 11 Sep 2018) | 5 lines * Add PAGESIZE local constant. + Set LAST_PAGE_GENERATES_SIGNAL macro for linux powerpc/powerpc64. + Use page_size for StackBottom computation. + Use LAST_PAGE_GENERATES_SIGNAL in StackBottom computation. ------------------------------------------------------------------------ --- Merging r39736 into '.': G rtl/linux/system.pp --- Recording mergeinfo for merge of r39736 into '.': G . ------------------------------------------------------------------------ r39801 | pierre | 2018-09-24 22:20:30 +0000 (Mon, 24 Sep 2018) | 1 line define iconv_is_in_libc by default for netbsd OS (can be disabled by adding -dDISABLE_ICONV_LIBC option ------------------------------------------------------------------------ --- Merging r39801 into '.': U rtl/unix/cwstring.pp --- Recording mergeinfo for merge of r39801 into '.': G . ------------------------------------------------------------------------ r39806 | pierre | 2018-09-26 09:25:54 +0000 (Wed, 26 Sep 2018) | 1 line Rename Result parameter to _Result to avoid compilation error for ppcjvm ------------------------------------------------------------------------ --- Merging r39806 into '.': U packages/jni/src/jni.pas --- Recording mergeinfo for merge of r39806 into '.': G . ------------------------------------------------------------------------ r39807 | pierre | 2018-09-26 09:27:33 +0000 (Wed, 26 Sep 2018) | 1 line Explicitly also disable java OS target ------------------------------------------------------------------------ --- Merging r39807 into '.': U packages/sdl/fpmake.pp --- Recording mergeinfo for merge of r39807 into '.': G . ------------------------------------------------------------------------ r40002 | pierre | 2018-10-20 22:30:20 +0000 (Sat, 20 Oct 2018) | 1 line Add explicit typecast to avoid range ccheck error ------------------------------------------------------------------------ --- Merging r40002 into '.': U rtl/linux/termiosproc.inc --- Recording mergeinfo for merge of r40002 into '.': G . ------------------------------------------------------------------------ r40014 | pierre | 2018-10-22 21:14:59 +0000 (Mon, 22 Oct 2018) | 1 line Add missing unicode related units to netware OS ------------------------------------------------------------------------ --- Merging r40014 into '.': U rtl/netware/Makefile U rtl/netware/Makefile.fpc --- Recording mergeinfo for merge of r40014 into '.': G . ------------------------------------------------------------------------ r40358 | pierre | 2018-11-20 22:02:59 +0000 (Tue, 20 Nov 2018) | 1 line Add classes unit ------------------------------------------------------------------------ --- Merging r40358 into '.': U rtl/watcom/Makefile U rtl/watcom/Makefile.fpc --- Recording mergeinfo for merge of r40358 into '.': G . ------------------------------------------------------------------------ r40363 | pierre | 2018-11-23 13:29:01 +0000 (Fri, 23 Nov 2018) | 1 line Also disable fpdoc and pas2jni utils packages for targets not supporting fcl-process package ------------------------------------------------------------------------ --- Merging r40363 into '.': U utils/pas2jni/fpmake.pp U utils/fpdoc/fpmake.pp --- Recording mergeinfo for merge of r40363 into '.': G . ------------------------------------------------------------------------ r40392 | pierre | 2018-11-29 14:23:44 +0000 (Thu, 29 Nov 2018) | 1 line Fix delete of gdbver.inc generated file after gdbint unit compilation when called from packages level ------------------------------------------------------------------------ --- Merging r40392 into '.': U packages/gdbint/fpmake.pp --- Recording mergeinfo for merge of r40392 into '.': G . ------------------------------------------------------------------------ r40397 | pierre | 2018-11-29 16:55:07 +0000 (Thu, 29 Nov 2018) | 1 line Fix cleaning of unicode utils package in fpmake ------------------------------------------------------------------------ --- Merging r40397 into '.': U utils/unicode/fpmake.pp --- Recording mergeinfo for merge of r40397 into '.': G . ------------------------------------------------------------------------ r40481 | pierre | 2018-12-06 17:06:45 +0000 (Thu, 06 Dec 2018) | 1 line Fix compilation of installer for win32 target ------------------------------------------------------------------------ --- Merging r40481 into '.': U installer/Makefile U installer/Makefile.fpc U packages/ide/Makefile.fpc U packages/ide/Makefile --- Recording mergeinfo for merge of r40481 into '.': G . ------------------------------------------------------------------------ r40537 | pierre | 2018-12-13 10:21:58 +0000 (Thu, 13 Dec 2018) | 1 line Always accept empty string as meaning zero is TryRomanToInt, fixes intermittent errors in tromantoint test ------------------------------------------------------------------------ --- Merging r40537 into '.': U packages/rtl-objpas/src/inc/strutils.pp U tests/test/units/strutils/tromantoint.pp --- Recording mergeinfo for merge of r40537 into '.': G . git-svn-id: branches/fixes_3_2@40618 - |
||
|
pierre
|
fa77ae20bc |
* Merge most of fpmkunit related commits from trunk to fixes branch
------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39820 | pierre | 2018-09-27 06:37:37 +0000 (Thu, 27 Sep 2018) | 1 line Fix problem reported in bug report 34343 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39839 | florian | 2018-09-28 20:54:53 +0000 (Fri, 28 Sep 2018) | 1 line * enabled mipsel-embedded also in the fpmkunit, resolves #34345 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40362 | pierre | 2018-11-23 13:12:06 +0000 (Fri, 23 Nov 2018) | 1 line Fix go32v2 utils compilation by using the same OS limitation for utils-fppkg as in fcl-process package ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40371 | pierre | 2018-11-25 21:24:16 +0000 (Sun, 25 Nov 2018) | 6 lines + Add new string SWarnRemoveNonEmptyDirectory * Change SWarnUnregisteredResource into a debug string + Use ExcludeTrailingDelimiter to be sure to get the parent directory in Clean method. + Add call to CmdRemoveTrees if CmdRemmoveDirs fails in Clean method, but only if dir name if $FPCTARGET ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40380 | pierre | 2018-11-28 14:03:45 +0000 (Wed, 28 Nov 2018) | 1 line Add mising disclean help, rephrase help for Clean also ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40381 | pierre | 2018-11-28 16:47:43 +0000 (Wed, 28 Nov 2018) | 1 line Fix i386-aros in fpmkunit ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40388 | pierre | 2018-11-28 22:11:29 +0000 (Wed, 28 Nov 2018) | 7 lines * Change "Clean of package %S completed" level from vlWarning to vlInfo, to be at same level as "Cleaning pacakge %s" message. * Transform "Searching dir" writeln in SearchFiles into a vlDebug level log call. + Add manifest.xml to the list of files to remove. * Only do something in TBuildEngine.Clean method if AllTargets is true or if CPU-OS is supported for APackage parameter. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40389 | pierre | 2018-11-28 23:16:31 +0000 (Wed, 28 Nov 2018) | 1 line Add listing of unremoved files during clean with -d (vlDebug) option ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ --- Merging r39713 into '.': U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39713 into '.': U . ------------------------------------------------------------------------ r39820 | pierre | 2018-09-27 06:37:37 +0000 (Thu, 27 Sep 2018) | 1 line Fix problem reported in bug report 34343 ------------------------------------------------------------------------ @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all <<<<<<< MINE (select with 'mc') (5) MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux ||||||| ORIGINAL (5) MAKEFILETARGETS=x86_64-linux ======= MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded >>>>>>> THEIRS (select with 'tc') (5) BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ endif endif override PACKAGE_NAME=fppkg <<<<<<< MINE (select with 'mc') (333) override PACKAGE_VERSION=3.2.0-beta ||||||| ORIGINAL (335) override PACKAGE_VERSION=3.1.1 ======= override PACKAGE_VERSION=3.3.1 >>>>>>> THEIRS (select with 'tc') (335) FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT)) ifdef OS_TARGET FPC_TARGETOPT+=--os=$(OS_TARGET) @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif <<<<<<< MINE (select with 'mc') (1361,344) ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-iphonesim) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-win16) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ||||||| ORIGINAL (1018,0) ======= ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-iphonesim) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-win16) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv32-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv32-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif >>>>>>> THEIRS (select with 'tc') (1363,360) ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ --- Merging r39713 into '.': U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39713 into '.': U . ------------------------------------------------------------------------ r39839 | florian | 2018-09-28 20:54:53 +0000 (Fri, 28 Sep 2018) | 1 line * enabled mipsel-embedded also in the fpmkunit, resolves #34345 ------------------------------------------------------------------------ @@ { This table is kept OS,Cpu because it is easier to maintain (PFV) } OSCPUSupported : array[TOS,TCpu] of boolean = ( <<<<<<< MINE (select with 'mc') (188,40) { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, true , false, false), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false), { android } ( false, true, false, false, false, true, true, false, false, false, false, true, true , false, true, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false) ||||||| ORIGINAL (188,40) { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64 riscv32 riscv64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true , true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false, false, false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, true , false, false, true , true ), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false) ======= { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64 riscv32 riscv64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true , true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false, false, false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, true, false, true , false, false, true , true ), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false) >>>>>>> THEIRS (select with 'tc') (188,40) ); // Useful --- Merging r39839 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39839 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40362 | pierre | 2018-11-23 13:12:06 +0000 (Fri, 23 Nov 2018) | 1 line Fix go32v2 utils compilation by using the same OS limitation for utils-fppkg as in fcl-process package ------------------------------------------------------------------------ --- Merging r40362 into '.': U utils/fppkg/fpmake.pp --- Recording mergeinfo for merge of r40362 into '.': G . ------------------------------------------------------------------------ r40371 | pierre | 2018-11-25 21:24:16 +0000 (Sun, 25 Nov 2018) | 6 lines + Add new string SWarnRemoveNonEmptyDirectory * Change SWarnUnregisteredResource into a debug string + Use ExcludeTrailingDelimiter to be sure to get the parent directory in Clean method. + Add call to CmdRemoveTrees if CmdRemmoveDirs fails in Clean method, but only if dir name if $FPCTARGET ------------------------------------------------------------------------ --- Merging r40371 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40371 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40380 | pierre | 2018-11-28 14:03:45 +0000 (Wed, 28 Nov 2018) | 1 line Add mising disclean help, rephrase help for Clean also ------------------------------------------------------------------------ --- Merging r40380 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40380 into '.': G . ------------------------------------------------------------------------ r40381 | pierre | 2018-11-28 16:47:43 +0000 (Wed, 28 Nov 2018) | 1 line Fix i386-aros in fpmkunit ------------------------------------------------------------------------ --- Merging r40381 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40381 into '.': G . ------------------------------------------------------------------------ r40388 | pierre | 2018-11-28 22:11:29 +0000 (Wed, 28 Nov 2018) | 7 lines * Change "Clean of package %S completed" level from vlWarning to vlInfo, to be at same level as "Cleaning pacakge %s" message. * Transform "Searching dir" writeln in SearchFiles into a vlDebug level log call. + Add manifest.xml to the list of files to remove. * Only do something in TBuildEngine.Clean method if AllTargets is true or if CPU-OS is supported for APackage parameter. ------------------------------------------------------------------------ --- Merging r40388 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40388 into '.': G . ------------------------------------------------------------------------ r40389 | pierre | 2018-11-28 23:16:31 +0000 (Wed, 28 Nov 2018) | 1 line Add listing of unremoved files during clean with -d (vlDebug) option ------------------------------------------------------------------------ --- Merging r40389 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40389 into '.': G . ------------------------------------------------------------------------ r40390 | pierre | 2018-11-28 23:24:33 +0000 (Wed, 28 Nov 2018) | 1 line Document -d --debug option, and change short version of --doc-folder to -df as -d is already used by debug option ------------------------------------------------------------------------ --- Merging r40390 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40390 into '.': G . ------------------------------------------------------------------------ r40520 | marco | 2018-12-10 22:42:52 +0000 (Mon, 10 Dec 2018) | 2 lines * add similar retries to sysdeletefile as for removedirs. because buildunits sometimes fail to erase. Seems to fix #21868 ------------------------------------------------------------------------ --- Merging r40520 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40520 into '.': G . ------------------------------------------------------------------------ r40614 | marco | 2018-12-22 15:55:44 +0000 (Sat, 22 Dec 2018) | 1 line * fixed formatting parameter in SWarnRetryDeleteFile ------------------------------------------------------------------------ --- Merging r40614 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40614 into '.': G . git-svn-id: branches/fixes_3_2@40617 - |
||
|
pierre
|
1fafc17016 |
Merge of revisions 39731 39825 39849 39912 39913 39914 39924 39935 39999 40000 40001 40026 40115 40132 40163 from trunk to fixes_3_2
------------------------------------------------------------------------
r39731 | pierre | 2018-09-11 08:00:54 +0000 (Tue, 11 Sep 2018) | 1 line
Disable overflow for UDIVX ans SDIVX 64-bit instructions
------------------------------------------------------------------------
--- Merging r39731 into '.':
U compiler/sparcgen/ncpumat.pas
--- Recording mergeinfo for merge of r39731 into '.':
G .
------------------------------------------------------------------------
r39825 | pierre | 2018-09-27 06:59:07 +0000 (Thu, 27 Sep 2018) | 1 line
Add rtl dependency and fix fpcdir value
------------------------------------------------------------------------
--- Merging r39825 into '.':
U packages/ide/compiler/Makefile.fpc
--- Recording mergeinfo for merge of r39825 into '.':
G .
------------------------------------------------------------------------
r39849 | pierre | 2018-10-01 21:50:13 +0000 (Mon, 01 Oct 2018) | 1 line
Use vfpv2 as default fpu for eabihf if cpu is below armv7
------------------------------------------------------------------------
--- Merging r39849 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r39849 into '.':
G .
------------------------------------------------------------------------
r39912 | pierre | 2018-10-11 20:38:39 +0000 (Thu, 11 Oct 2018) | 1 line
Fix ppuload for string type for i8086, use getasizeint for all string defs but short string
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r39912 into '.':
G .
------------------------------------------------------------------------
r39913 | pierre | 2018-10-11 21:02:25 +0000 (Thu, 11 Oct 2018) | 1 line
fix position of ppuload_platform for trecorddef
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r39913 into '.':
G .
------------------------------------------------------------------------
r39914 | pierre | 2018-10-12 06:05:50 +0000 (Fri, 12 Oct 2018) | 1 line
Adapt ppudump to fix introduced in revision 39912
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r39914 into '.':
G .
------------------------------------------------------------------------
r39924 | pierre | 2018-10-13 11:35:34 +0000 (Sat, 13 Oct 2018) | 1 line
Downgrade some warnings to notes for EXTDEBUG
------------------------------------------------------------------------
--- Merging r39924 into '.':
U compiler/pass_2.pas
U compiler/tgobj.pas
--- Recording mergeinfo for merge of r39924 into '.':
G .
------------------------------------------------------------------------
r39935 | pierre | 2018-10-14 22:18:50 +0000 (Sun, 14 Oct 2018) | 1 line
Add missing setting of expectloc for multiplications
------------------------------------------------------------------------
--- Merging r39935 into '.':
U compiler/nadd.pas
--- Recording mergeinfo for merge of r39935 into '.':
G .
------------------------------------------------------------------------
r39999 | pierre | 2018-10-20 18:44:05 +0000 (Sat, 20 Oct 2018) | 1 line
Avoid run time error if compiled with -CR option
------------------------------------------------------------------------
--- Merging r39999 into '.':
U compiler/m68k/cpupara.pas
--- Recording mergeinfo for merge of r39999 into '.':
G .
------------------------------------------------------------------------
r40000 | pierre | 2018-10-20 18:49:53 +0000 (Sat, 20 Oct 2018) | 1 line
Avoid range check error when compiled with -CR
------------------------------------------------------------------------
--- Merging r40000 into '.':
U compiler/m68k/cgcpu.pas
--- Recording mergeinfo for merge of r40000 into '.':
G .
------------------------------------------------------------------------
r40001 | pierre | 2018-10-20 22:19:08 +0000 (Sat, 20 Oct 2018) | 1 line
Add explicit typecast to avoid range check error
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40001 into '.':
G .
------------------------------------------------------------------------
r40026 | pierre | 2018-10-24 21:37:22 +0000 (Wed, 24 Oct 2018) | 1 line
Explicitly disable range checking
------------------------------------------------------------------------
--- Merging r40026 into '.':
U compiler/x86/cgx86.pas
--- Recording mergeinfo for merge of r40026 into '.':
G .
------------------------------------------------------------------------
r40115 | pierre | 2018-10-31 22:53:11 +0000 (Wed, 31 Oct 2018) | 1 line
Avoid range check error in ReadPosInfo
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40115 into '.':
G .
------------------------------------------------------------------------
r40132 | pierre | 2018-11-01 07:09:47 +0000 (Thu, 01 Nov 2018) | 1 line
Only call moved if len>0, as otherwise astring local variable is nil, which leads to a range check error for astring[1]
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40132 into '.':
G .
------------------------------------------------------------------------
r40163 | pierre | 2018-11-01 21:58:54 +0000 (Thu, 01 Nov 2018) | 8 lines
More -CriotR fixes:
* entfile.pas: Change PPU header falgs filed from longint to dword.
* ngtcon.pas: Change local variable startoffset type to aword.
* omfbase.pas: Avoid calling move with a nil string s indexed as s[1],
to avoid a range check error.
* owomflib.pas: Disable range check explicitly in hash computation.
* utils/ppuutils/ppudump.pp: Adapt to flags type change in entfile.pas
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40163 into '.':
G .
git-svn-id: branches/fixes_3_2@40616 -
|
||
|
marco
|
20799193a7 |
--- Merging r40025 into '.':
U rtl/Makefile U rtl/Makefile.fpc --- Recording mergeinfo for merge of r40025 into '.': U . # revisions: 40025 git-svn-id: branches/fixes_3_2@40613 - |
||
|
marco
|
36dc22adb5 |
--- Merging r40561 into '.':
U packages/fcl-process/src/processbody.inc --- Recording mergeinfo for merge of r40561 into '.': U . # revisions: 40561 git-svn-id: branches/fixes_3_2@40612 - |
||
|
yury
|
71d9269b25 |
Merged revision(s) 40585-40586 from trunk:
* ARM: Remove preindexing and postindexing for LDR in some cases when removing superfluous MOVs. It fixes crash when calling Format() if rtl is compiled with -O3. ........ * Improved the comment. ........ git-svn-id: branches/fixes_3_2@40588 - |
||
|
yury
|
7b77856515 |
Merged revision(s) 40552 from trunk:
* Use the "doc" subdir instead of "docs" for non-unix targets. The "doc" name is used in classic makefiles and we've got 2 sub-dirs "doc" and "docs" for non-unix targets. This commit fixes that. ........ git-svn-id: branches/fixes_3_2@40556 - |
||
|
yury
|
3331a30501 |
ds_dwarf_cpp improvements.
Merged revision(s) 40492, 40498 from trunk: * When ds_dwarf_cpp option is enabled, use dwarf2 implementation of strings debug info. It makes LLDB happy. ........ * If ds_dwarf_cpp (C++ emulation) is enabled, add DW_AT_linkage_name attribute for methods. LLDB uses it to display fully qualified method names. Add a simple C++ mangled name without params to achieve at least "Class::Method()" instead of just "Method" in LLDB. ........ git-svn-id: branches/fixes_3_2@40545 - |
||
|
yury
|
302ee0d208 |
pas2jni fixes.
Merged revision(s) 40179, 40462 from trunk: * pas2jni: Added option: -N - Do not generate a Java code for auto-loading of the shared library. * pas2jni: Do not generate TClass helper code if no classes are used at all. ........ * pas2jni: TClass helper must be generated only for the system unit. ........ git-svn-id: branches/fixes_3_2@40544 - |
||
|
yury
|
0dd9e4d6a5 |
Fixes for aarch64.
Merged revision(s) 39948, 39951, 39953 from trunk: * Fixed interface delegation for aarch64 (tdel1 and tdel2 tests). It was broken by r31676 which did not take in account r29953. As a consequence $self was passed in register x1 instead of x0 when the method result is of a managed type. This fix enables changing order of the $self and $result parameters only for aarch64 AND llvm combination where it is actually needed. The issue with interface delegation still exists for aarch64-llvm and need to be fixed separately. Probably by applying llvm-specific workarounds as it was made in r29953 for regular aarch64 targets. ........ * Fixed bug #17413 (and the tw17413 test) for aarch64 by adding additional check. ........ * aarch64: Fixed loading of a function result which is returned in 4 32-bit MM registers to 2 64-bit int registers. Bug #30329. ........ git-svn-id: branches/fixes_3_2@40543 - |
||
|
yury
|
2f08c63947 |
* Updated revision.inc.
git-svn-id: branches/fixes_3_2@40542 - |
||
|
yury
|
2d48bc8b9c |
* Regenerated makefiles.
git-svn-id: branches/fixes_3_2@40541 - |
||
|
yury
|
0654857ce1 |
Merged aarch64-android, x86_64-android targets and fixes for the Android target.
Revision(s) 39739, 39749, 39860, 39862, 39865, 39869, 39871, 39903, 39905, 39917, 39956, 39959-39960, 39969, 39971, 39980, 39987, 40198-40201, 40472, 40532, 40535-40536 from trunk: * Android: The list of supported syscalls has been auto-generated directly from android sources for each CPU. * Minor adjustments to make all compilable with the proper list of Android syscalls. ........ * Re-generated lists of android syscalls by a new script. The lists are more correct now. The script's location: https://svn.freepascal.org/svn/fpcbuild/scripts/android ........ * Fixed UnhookSignal when RTL_SIGDEFAULT is passed. The bug have caused crash on aarch64-android due to out of bounds read of the rtlsig2ossig[] array. ........ + Added support for the aarch64-android target. ........ * Set ICU data dir if it is not set by the system. It fixes issues on newer Android versions. * Added more predefined ICU versions. ........ * android: Use the current dir as temp. ........ * Corrected TUContext record for aarch64-linux and aarch64-android. It fixes obtaining of an address of the instruction where a signal has thrown. ........ * Enabled safecall support for aarch64 to be on par with other cpus. ........ * Android: Reworked the startup code to use no assembly instructions. Generic assembler startup files contains only section data and are compiled for each CPU. * Android: argc and argv are correct for shared libraries. ........ * Use syscall_nr_renameat for android. ........ + added support for x86_64-android target. ........ + Added the auto-generated list syscalls for mips64-android. It will be needed when mips64 is supported. ........ * x86_64-android requires sigreturn for proper signal handling. ........ * Register external gas assembler for aarch64-android and x86_64-android. ........ * Enabled compilation of the cpu unit for arm-android and x86_64-android. ........ * ucnv_open() must be called with some SSE exception masked on x86_64-android. * Call u_init() during initialization. ........ * Create the ".note.gnu.build-id" section for android. It fixes debugging of shared libs in Android Studio. ........ * android: Removed cwstring from the uses clause of the unix unit. Use cwstring indirectly. It allows to avoid using cwstring if needed. ........ * ICU v3.8 on Android 1.5-2.1 is buggy and can't be unloaded properly. ........ * Fixed locale detection on new Android versions. ........ * Fixed obtaining a time zone information for 64-bit android. ........ * Since Android 8 the net.dnsX properties can't be read. Use Google Public DNS servers. ........ * android: Use libc for sockets since the "accept" syscall is blocked by SECCOMP, but the "accept4" alternative is not available on old Android versions (2.3 and older). ........ * android: Regenerated syscalls. ........ * android: Disabled usage of the "pselect6" and "ppoll" syscalls for arm-android. These syscalls are not available on old Android versions (2.3 or older). ........ git-svn-id: branches/fixes_3_2@40540 - |
||
|
marco
|
1f921d4ac0 |
--- Merging r39866 into '.':
U rtl/unix/sysutils.pp --- Recording mergeinfo for merge of r39866 into '.': U . --- Merging r39870 into '.': U utils/bin2obj.pp --- Recording mergeinfo for merge of r39870 into '.': G . --- Merging r39973 into '.': U packages/fcl-image/src/fpimage.pp --- Recording mergeinfo for merge of r39973 into '.': G . --- Merging r39995 into '.': U packages/gmp/src/gmp.pas U rtl/objpas/math.pp --- Recording mergeinfo for merge of r39995 into '.': G . --- Merging r40215 into '.': U packages/paszlib/src/zipper.pp --- Recording mergeinfo for merge of r40215 into '.': G . # revisions: 39866,39870,39973,39995,40215, git-svn-id: branches/fixes_3_2@40528 - |
||
|
marco
|
fa58ed1df7 |
--- Merging r39691 into '.':
U packages/chm/src/chmcmd.lpi --- Recording mergeinfo for merge of r39691 into '.': U . --- Merging r39758 into '.': U packages/fcl-base/src/fpexprpars.pp --- Recording mergeinfo for merge of r39758 into '.': G . --- Merging r39831 into '.': U packages/fcl-net/src/ssockets.pp --- Recording mergeinfo for merge of r39831 into '.': G . --- Merging r39840 into '.': U rtl/inc/fexpand.inc U tests/test/units/dos/tfexpand.pp --- Recording mergeinfo for merge of r39840 into '.': G . --- Merging r39843 into '.': U rtl/objpas/sysutils/syshelp.inc --- Recording mergeinfo for merge of r39843 into '.': G . # revisions: 39691,39758,39831,39840,39843 git-svn-id: branches/fixes_3_2@40527 - |
||
|
marco
|
3ecb0ecc11 |
--- Merging r39992 into '.':
U rtl/objpas/math.pp --- Recording mergeinfo for merge of r39992 into '.': U . --- Merging r39994 into '.': U packages/rtl-objpas/src/inc/stdconvs.pp G rtl/objpas/math.pp --- Recording mergeinfo for merge of r39994 into '.': G . # revisions: 39992,39994 git-svn-id: branches/fixes_3_2@40526 - |
||
|
marco
|
9712af7fc4 |
--- Merging r39984 into '.':
U rtl/objpas/types.pp --- Recording mergeinfo for merge of r39984 into '.': U . # revisions: 39984 git-svn-id: branches/fixes_3_2@40525 - |
||
|
pierre
|
6205e530aa |
Merge commits 39912, 39914, 40001, 40115, 40132 and 40163
------------------------------------------------------------------------
r39912 | pierre | 2018-10-11 22:38:39 +0200 (Thu, 11 Oct 2018) | 1 line
Fix ppuload for string type for i8086, use getasizeint for all string defs but short string
------------------------------------------------------------------------
------------------------------------------------------------------------
r39914 | pierre | 2018-10-12 08:05:50 +0200 (Fri, 12 Oct 2018) | 1 line
Adapt ppudump to fix introduced in revision 39912
------------------------------------------------------------------------
------------------------------------------------------------------------
r40001 | pierre | 2018-10-21 00:19:08 +0200 (Sun, 21 Oct 2018) | 1 line
Add explicit typecast to avoid range check error
------------------------------------------------------------------------
------------------------------------------------------------------------
r40115 | pierre | 2018-10-31 23:53:11 +0100 (Wed, 31 Oct 2018) | 1 line
Avoid range check error in ReadPosInfo
------------------------------------------------------------------------
------------------------------------------------------------------------
r40132 | pierre | 2018-11-01 08:09:47 +0100 (Thu, 01 Nov 2018) | 1 line
Only call moved if len>0, as otherwise astring local variable is nil, which leads to a range check error for astring[1]
------------------------------------------------------------------------
------------------------------------------------------------------------
r40163 | pierre | 2018-11-01 22:58:54 +0100 (Thu, 01 Nov 2018) | 8 lines
More -CriotR fixes:
* entfile.pas: Change PPU header falgs filed from longint to dword.
* ngtcon.pas: Change local variable startoffset type to aword.
* omfbase.pas: Avoid calling move with a nil string s indexed as s[1],
to avoid a range check error.
* owomflib.pas: Disable range check explicitly in hash computation.
* utils/ppuutils/ppudump.pp: Adapt to flags type change in entfile.pas
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@40519 -
|
||
|
pierre
|
36f9ce1cb2 |
Merge of trunk commits 39983,39986,40109
------------------------------------------------------------------------ r39983 | florian | 2018-10-18 20:28:03 +0200 (Thu, 18 Oct 2018) | 3 lines * properly take care of register allocations between the first and second instruction for the FoldLea optimization * check for ait_instruction after a GetNextInstruction function call * cosmetics ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39986 | pierre | 2018-10-18 22:21:54 +0200 (Thu, 18 Oct 2018) | 1 line Fix for bug report #34380 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40109 | pierre | 2018-10-31 15:43:18 +0100 (Wed, 31 Oct 2018) | 1 line Use correct field for sl_absolutetype or sl_typeconv ppropaccesslistitem type (revealed by compilation with -CriotR) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@40482 - |
||
|
marco
|
cddd8fbbf5 |
--- Merging r40213 into '.':
U packages/fcl-stl/src/gdeque.pp U packages/fcl-stl/src/gstack.pp --- Recording mergeinfo for merge of r40213 into '.': U . --- Merging r40214 into '.': U packages/fcl-stl/src/gvector.pp G packages/fcl-stl/src/gdeque.pp --- Recording mergeinfo for merge of r40214 into '.': G . --- Merging r40292 into '.': G packages/fcl-stl/src/gdeque.pp --- Recording mergeinfo for merge of r40292 into '.': G . # revisions: 40213,40214,40292 git-svn-id: branches/fixes_3_2@40301 - |
||
|
marco
|
6574f0974a |
--- Merging r40284 into '.':
U compiler/pdecvar.pas --- Recording mergeinfo for merge of r40284 into '.': U . --- Merging r40285 into '.': D tests/webtbs/tw27880.pp A tests/webtbf/tw27880.pp A tests/tbf/tb0261.pp A tests/tbf/tb0262.pp A tests/tbf/tb0263.pp A tests/tbf/tb0264.pp A tests/tbf/tb0265.pp U compiler/pdecl.pas --- Recording mergeinfo for merge of r40285 into '.': G . # revisions: 40284,40285 git-svn-id: branches/fixes_3_2@40289 - |
||
|
marco
|
3661b7bcfa |
--- Merging r39886 into '.':
U packages/rtl-objpas/src/inc/rtti.pp U packages/rtl-objpas/tests/tests.rtti.pas --- Recording mergeinfo for merge of r39886 into '.': U . --- Recording mergeinfo for merge of r39886 into 'packages/rtl-objpas/src/inc/rtti.pp': U packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39886 into 'packages/rtl-objpas/tests/tests.rtti.pas': U packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39887 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39887 into '.': G . --- Recording mergeinfo for merge of r39887 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39887 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39888 into '.': G packages/rtl-objpas/tests/tests.rtti.pas G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39888 into '.': G . --- Recording mergeinfo for merge of r39888 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39888 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39889 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39889 into '.': G . --- Recording mergeinfo for merge of r39889 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39889 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39890 into '.': U packages/libffi/src/ffi.manager.pp --- Recording mergeinfo for merge of r39890 into '.': G . --- Recording mergeinfo for merge of r39890 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39890 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39891 into '.': G packages/libffi/src/ffi.manager.pp --- Recording mergeinfo for merge of r39891 into '.': G . --- Recording mergeinfo for merge of r39891 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39891 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39892 into '.': G packages/libffi/src/ffi.manager.pp --- Recording mergeinfo for merge of r39892 into '.': G . --- Recording mergeinfo for merge of r39892 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39892 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39893 into '.': U packages/rtl-objpas/tests/tests.rtti.invoke.pas G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39893 into '.': G . --- Recording mergeinfo for merge of r39893 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39893 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39894 into '.': U packages/rtl-objpas/fpmake.pp A packages/rtl-objpas/src/x86_64 A packages/rtl-objpas/src/x86_64/invoke.inc G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39894 into '.': G . --- Recording mergeinfo for merge of r39894 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39894 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39895 into '.': U packages/rtl-objpas/tests/testrunner.rtlobjpas.pp --- Recording mergeinfo for merge of r39895 into '.': G . --- Recording mergeinfo for merge of r39895 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39895 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39896 into '.': G packages/rtl-objpas/tests/testrunner.rtlobjpas.pp --- Recording mergeinfo for merge of r39896 into '.': G . --- Recording mergeinfo for merge of r39896 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39896 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39897 into '.': G packages/rtl-objpas/tests/tests.rtti.invoke.pas --- Recording mergeinfo for merge of r39897 into '.': G . --- Recording mergeinfo for merge of r39897 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39897 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas # revisions: 39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,39896,39897 git-svn-id: branches/fixes_3_2@40288 - |
||
|
marco
|
6f88dbd9d5 |
--- Merging r39878 into '.':
U packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39878 into '.': U . --- Recording mergeinfo for merge of r39878 into 'packages/rtl-objpas/src/inc/rtti.pp': U packages/rtl-objpas/src/inc/rtti.pp --- Merging r39879 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39879 into '.': G . --- Recording mergeinfo for merge of r39879 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Merging r39880 into '.': U packages/libffi/src/ffi.manager.pp --- Recording mergeinfo for merge of r39880 into '.': G . --- Recording mergeinfo for merge of r39880 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Merging r39881 into '.': G packages/rtl-objpas/src/inc/rtti.pp G packages/libffi/src/ffi.manager.pp --- Recording mergeinfo for merge of r39881 into '.': G . --- Recording mergeinfo for merge of r39881 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Merging r39883 into '.': U packages/rtl-objpas/tests/tests.rtti.pas --- Recording mergeinfo for merge of r39883 into '.': G . --- Recording mergeinfo for merge of r39883 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39883 into 'packages/rtl-objpas/tests/tests.rtti.pas': U packages/rtl-objpas/tests/tests.rtti.pas --- Merging r39884 into '.': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39884 into '.': G . --- Recording mergeinfo for merge of r39884 into 'packages/rtl-objpas/src/inc/rtti.pp': G packages/rtl-objpas/src/inc/rtti.pp --- Recording mergeinfo for merge of r39884 into 'packages/rtl-objpas/tests/tests.rtti.pas': G packages/rtl-objpas/tests/tests.rtti.pas # revisions: 39878,39879,39880,39881,39883,39884 git-svn-id: branches/fixes_3_2@40287 - |
||
|
marco
|
f42dffb36d |
--- Merging r39877 into '.':
U compiler/x86_64/rax64att.pas --- Recording mergeinfo for merge of r39877 into '.': U . --- Merging r39882 into '.': U compiler/nld.pas A tests/webtbf/tw34355.pp --- Recording mergeinfo for merge of r39882 into '.': G . --- Merging r39885 into '.': U compiler/ncgrtti.pas --- Recording mergeinfo for merge of r39885 into '.': G . # revisions: 39877,39882,39885 git-svn-id: branches/fixes_3_2@40286 - |
||
|
marco
|
e1d32d0fef |
# revisions: 39793,39850,39852,39910,40020,40021,40022,40024,40096
git-svn-id: branches/fixes_3_2@40097 - |
||
|
marco
|
338873d7a7 |
--- Merging r39785 into '.':
U packages/fcl-stl/src/gset.pp --- Recording mergeinfo for merge of r39785 into '.': U . --- Merging r39786 into '.': A tests/tbs/tb0651.pp U compiler/symdef.pas --- Recording mergeinfo for merge of r39786 into '.': G . --- Merging r39787 into '.': U compiler/pexpr.pas A tests/webtbs/uw34287a.pp A tests/webtbs/tw34287.pp A tests/webtbs/uw34287b.pp --- Recording mergeinfo for merge of r39787 into '.': G . --- Merging r39788 into '.': U compiler/nbas.pas --- Recording mergeinfo for merge of r39788 into '.': G . --- Merging r39812 into '.': G compiler/pexpr.pas --- Recording mergeinfo for merge of r39812 into '.': G . # revisions: 39785,39786,39787,39788,39812 git-svn-id: branches/fixes_3_2@39835 - |
||
|
marco
|
2b01261f36 |
--- Recording mergeinfo for merge of r39673 into '.':
U . --- Merging r39693 into '.': A tests/tbs/tb0650.pp U compiler/symtable.pas --- Recording mergeinfo for merge of r39693 into '.': U . --- Merging r39700 into '.': U compiler/msg/errore.msg --- Recording mergeinfo for merge of r39700 into '.': G . --- Merging r39701 into '.': U compiler/msgtxt.inc U compiler/msgidx.inc --- Recording mergeinfo for merge of r39701 into '.': G . --- Merging r39702 into '.': U compiler/pdecsub.pas A tests/test/tgeneric105.pp --- Recording mergeinfo for merge of r39702 into '.': G . --- Merging r39703 into '.': A tests/test/tgenfunc18.pp A tests/test/tgenfunc17.pp G compiler/pdecsub.pas --- Recording mergeinfo for merge of r39703 into '.': G . --- Merging r39715 into '.': U packages/rtl-extra/src/inc/objects.pp A tests/webtbs/tw34239.pp --- Recording mergeinfo for merge of r39715 into '.': G . --- Merging r39727 into '.': G packages/rtl-extra/src/inc/objects.pp --- Recording mergeinfo for merge of r39727 into '.': G . # revisions: 39673,39693,39700,39701,39702,39703,39715,39727 git-svn-id: branches/fixes_3_2@39834 - |
||
|
marco
|
9135b53764 |
--- Merging r39770 into '.':
U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39770 into '.': U . # revisions: 39770 git-svn-id: branches/fixes_3_2@39814 - |
||
|
marco
|
2f4f80a406 |
--- Merging r39747 into '.':
U packages/fcl-image/src/fpcolcnv.inc --- Recording mergeinfo for merge of r39747 into '.': U . --- Merging r39748 into '.': U packages/fcl-image/src/fpinterpolation.inc U packages/fcl-image/src/fpcanvas.inc --- Recording mergeinfo for merge of r39748 into '.': G . # revisions: 39747,39748 git-svn-id: branches/fixes_3_2@39811 - |
||
|
marco
|
ee7090b118 |
--- Merging r39711 into '.':
U compiler/symtable.pas --- Recording mergeinfo for merge of r39711 into '.': U . --- Merging r39728 into '.': G compiler/symtable.pas --- Recording mergeinfo for merge of r39728 into '.': G . --- Merging r39692 into '.': U compiler/psub.pas A tests/test/tgeneric104.pp A tests/test/ugeneric104.pp --- Recording mergeinfo for merge of r39692 into '.': G . --- Merging r39699 into '.': U packages/libffi/src/ffi.manager.pp --- Recording mergeinfo for merge of r39699 into '.': G . # revisions: 39711,39728,39692,39699 git-svn-id: branches/fixes_3_2@39810 - |
||
|
marco
|
edf32cd5dc |
The Important Ones:
- 39683, 39684, 39685, 39686 (rework of Interface Method RTTI) - 39687, 39688, 39689, 39690, 39709, 39710 (change of PPU version) git-svn-id: branches/fixes_3_2@39809 - |
||
|
marco
|
ced4e6c27d |
--- Merging r39714 into '.':
U compiler/arm/aasmcpu.pas --- Recording mergeinfo for merge of r39714 into '.': U . # revisions: 39714 git-svn-id: branches/fixes_3_2@39794 - |