C Makefile
C Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/Makefile
M /trunk/Makefile.fpc
* support building with FPC 3.2.2
git-svn-id: branches/fixes_3_2@49384 -
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r49071 into '.':
U .
--- Merging r49125 into '.':
G packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r49125 into '.':
G .
# revisions: 49071,49125
r49071 | marco | 2021-03-28 14:48:20 +0200 (Sun, 28 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/chm/src/chmfilewriter.pas
* more fixes from serbod repo. Make paths relative.
r49125 | marco | 2021-04-05 21:29:19 +0200 (Mon, 05 Apr 2021) | 1 line
Changed paths:
M /trunk/packages/chm/src/chmfilewriter.pas
* attempt to fix mantis #28321. Use path of project file as base of chm.
git-svn-id: branches/fixes_3_2@49127 -
U packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r47703 into '.':
U .
# revisions: 47703
r47703 | marco | 2020-12-06 21:17:48 +0100 (Sun, 06 Dec 2020) | 1 line
Changed paths:
M /trunk/packages/chm/src/chmreader.pas
* tried to apply patch of mantis #38169 in a more minimal way and fixing some of the omissions.
git-svn-id: branches/fixes_3_2@47735 -
U utils/instantfpc/instantfpc.pas
--- Recording mergeinfo for merge of r43026 into '.':
U .
--- Merging r43087 into '.':
U packages/hash/src/hmac.pp
--- Recording mergeinfo for merge of r43087 into '.':
G .
--- Merging r43091 into '.':
U packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43091 into '.':
G .
--- Merging r43095 into '.':
G packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43095 into '.':
G .
--- Merging r43097 into '.':
U rtl/unix/dl.pp
--- Recording mergeinfo for merge of r43097 into '.':
G .
--- Merging r43098 into '.':
G packages/winunits-base/src/winhttp.pp
--- Recording mergeinfo for merge of r43098 into '.':
G .
--- Merging r43117 into '.':
U packages/chm/src/chmwriter.pas
--- Recording mergeinfo for merge of r43117 into '.':
G .
# revisions: 43026,43087,43091,43095,43097,43098,43117
git-svn-id: branches/fixes_3_2@43172 -
U utils/ptopu.pp
--- Recording mergeinfo for merge of r43137 into '.':
U .
--- Merging r43141 into '.':
U packages/chm/src/htmlutil.pas
--- Recording mergeinfo for merge of r43141 into '.':
G .
--- Merging r43142 into '.':
U packages/libcurl/src/libcurl.pp
--- Recording mergeinfo for merge of r43142 into '.':
G .
--- Merging r43144 into '.':
U packages/rtl-objpas/fpmake.pp
A packages/rtl-objpas/src/inc/system.uitypes.pp
--- Recording mergeinfo for merge of r43144 into '.':
G .
# revisions: 43137,43141,43142,43144
git-svn-id: branches/fixes_3_2@43170 -
U packages/winunits-base/src/comobj.pp
U packages/winunits-base/src/comserv.pp
--- Recording mergeinfo for merge of r42594 into '.':
U .
--- Merging r42908 into '.':
U packages/fcl-stl/doc/hashmapexample.pp
U packages/fcl-stl/src/ghashmap.pp
--- Recording mergeinfo for merge of r42908 into '.':
G .
--- Merging r42909 into '.':
G packages/fcl-stl/src/ghashmap.pp
U packages/fcl-stl/src/gvector.pp
--- Recording mergeinfo for merge of r42909 into '.':
G .
--- Merging r42910 into '.':
U packages/fcl-stl/doc/mapexample.pp
U packages/fcl-stl/src/gmap.pp
--- Recording mergeinfo for merge of r42910 into '.':
G .
--- Merging r42914 into '.':
U packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r42914 into '.':
G .
--- Merging r42915 into '.':
U packages/fcl-stl/src/ghashset.pp
U packages/fcl-stl/src/gset.pp
--- Recording mergeinfo for merge of r42915 into '.':
G .
# revisions: 42594,42908,42909,42910,42914,42915
git-svn-id: branches/fixes_3_2@42922 -
G packages/chm/src/chmsitemap.pas
--- Recording mergeinfo for merge of r42129 into '.':
G .
--- Merging r42137 into '.':
G packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r42137 into '.':
G .
--- Merging r42138 into '.':
G utils/fpdoc/dw_htmlchm.inc
--- Recording mergeinfo for merge of r42138 into '.':
G .
--- Merging r42140 into '.':
G utils/fpdoc/dw_htmlchm.inc
--- Recording mergeinfo for merge of r42140 into '.':
G .
--- Merging r42141 into '.':
G utils/fpdoc/dw_htmlchm.inc
--- Recording mergeinfo for merge of r42141 into '.':
G .
--- Merging r42142 into '.':
G packages/chm/src/chmfilewriter.pas
G packages/chm/src/chmwriter.pas
--- Recording mergeinfo for merge of r42142 into '.':
G .
--- Merging r42156 into '.':
G packages/chm/src/chmfilewriter.pas
U packages/chm/src/chmtypes.pas
--- Recording mergeinfo for merge of r42156 into '.':
G .
# revisions: 42129,42137,42138,42140,42141,42142,42156
git-svn-id: branches/fixes_3_2@42306 -
------------------------------------------------------------------------
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 -
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 -
U packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r39707 into '.':
U .
--- Merging r39708 into '.':
U packages/chm/src/chmwriter.pas
U packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r39708 into '.':
G .
--- Merging r39743 into '.':
U rtl/objpas/sysutils/finah.inc
--- Recording mergeinfo for merge of r39743 into '.':
G .
--- Merging r39744 into '.':
U packages/fcl-image/src/fpimage.pp
--- Recording mergeinfo for merge of r39744 into '.':
G .
--- Merging r39784 into '.':
U utils/data2inc.exm
--- Recording mergeinfo for merge of r39784 into '.':
G .
# revisions: 39707,39708,39743,39744,39784
git-svn-id: branches/fixes_3_2@39790 -
- off by one error that causes keywords that only occur once from not
being included in the full text search
- support for scanning files referenced in css file url()
- fix bug in sitemap wrt "merge" entry
git-svn-id: trunk@39378 -
