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/rtl-objpas/src/inc/fmtbcd.pp
--- Recording mergeinfo for merge of r48876 into '.':
G .
--- Merging r49021 into '.':
U packages/fcl-process/src/win/process.inc
--- Recording mergeinfo for merge of r49021 into '.':
G .
# revisions: 48876,49021
r48876 | marco | 2021-03-04 11:37:50 +0100 (Thu, 04 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/rtl-objpas/src/inc/fmtbcd.pp
* Patch from Lacak. Better fix for mantis 30853
r49021 | marco | 2021-03-20 22:45:19 +0100 (Sat, 20 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-process/src/win/process.inc
* also assign threadid. mantis 38645
git-svn-id: branches/fixes_3_2@49039 -
U packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r48982 into '.':
U .
# revisions: 48982
r48982 | marco | 2021-03-15 16:58:05 +0100 (Mon, 15 Mar 2021) | 1 line
Changed paths:
M /trunk/packages/fcl-process/src/processbody.inc
* buffer overflow in ReadInputStream if a stream read> READ_BYTES (=64k) large. The overloaded tstream one is ok.
git-svn-id: branches/fixes_3_2@49007 -
------------------------------------------------------------------------
r46369 | michael | 2020-08-12 12:58:24 +0200 (Wed, 12 Aug 2020) | 1 line
* Fix bug #37546, improvement to pass log filename to server
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46617 -
------------------------------------------------------------------------
r46301 | michael | 2020-08-06 23:16:21 +0200 (Thu, 06 Aug 2020) | 1 line
* Fix bug ID #37504: allow to send processID in messages
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@46611 -
Revision: 46342
Author: ondrej
Date: Sonntag, 9. August 2020 18:28:55
Message:
TProcessnamemacro: move FProcessID, FThreadID, FProcessHandle, FThreadHandle to the protected section so that descendants can fill them in overridden Execute procedure
git-svn-id: branches/fixes_3_2@46344 -
U packages/fcl-process/src/process.pp
U packages/fcl-process/src/win/process.inc
--- Recording mergeinfo for merge of r45228 into '.':
U .
# revisions: 45228
git-svn-id: branches/fixes_3_2@45229 -
U packages/fcl-process/src/amicommon/process.inc
--- Recording mergeinfo for merge of r42301 into '.':
U .
--- Merging r42760 into '.':
U packages/amunits/src/coreunits/intuition.pas
--- Recording mergeinfo for merge of r42760 into '.':
G .
--- Merging r44045 into '.':
U packages/amunits/src/coreunits/amigados.pas
--- Recording mergeinfo for merge of r44045 into '.':
G .
--- Merging r44059 into '.':
U packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r44059 into '.':
G .
--- Merging r44102 into '.':
G packages/arosunits/src/amigados.pas
--- Recording mergeinfo for merge of r44102 into '.':
G .
--- Merging r44105 into '.':
U packages/amunits/src/coreunits/agraphics.pas
U packages/amunits/src/coreunits/datatypes.pas
U packages/amunits/src/coreunits/exec.pas
G packages/amunits/src/coreunits/intuition.pas
U packages/amunits/src/coreunits/locale.pas
U packages/amunits/src/otherlibs/cybergraphics.pas
U packages/morphunits/src/keymap.pas
U packages/morphunits/src/mui.pas
--- Recording mergeinfo for merge of r44105 into '.':
G .
# revisions: 42301,42760,44045,44059,44102,44105
git-svn-id: branches/fixes_3_2@44106 -
U packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r43208 into '.':
U .
# revisions: 43208
git-svn-id: branches/fixes_3_2@43217 -
------------------------------------------------------------------------
r42696 | svenbarth | 2019-08-15 11:41:36 +0000 (Thu, 15 Aug 2019) | 3 lines
* fix for Mantis #35964: reestablish pre r42594 behavior for WinCE as at least Windows Mobile does not support the required COM functions
Note: in theory Windows CE *can* support these functions, but it dependends on the provider whether they're indeed supported (e.g. Windows Mobile does not). Probably this should be revisited once we support the "delayed" directive.
------------------------------------------------------------------------
--- Merging r42696 into '.':
U packages/winunits-base/src/comobj.pp
--- Recording mergeinfo for merge of r42696 into '.':
U .
------------------------------------------------------------------------
r42745 | pierre | 2019-08-20 12:11:17 +0000 (Tue, 20 Aug 2019) | 1 line
Add x86_64-aros and m68k-macos to OSCPUSupported table
------------------------------------------------------------------------
--- Merging r42745 into '.':
C packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r42745 into '.':
G .
Summary of conflicts:
Text conflicts: 1
------------------------------------------------------------------------
r42761 | pierre | 2019-08-22 13:01:08 +0000 (Thu, 22 Aug 2019) | 1 line
Also use ACPU and AOS parameters to call GetUnitConfigOutputFilename
------------------------------------------------------------------------
--- Merging r42761 into '.':
G packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r42761 into '.':
G .
------------------------------------------------------------------------
r42762 | pierre | 2019-08-22 15:33:45 +0000 (Thu, 22 Aug 2019) | 6 lines
* Fix errors in sourcezip generation:
in fcl-process, by adding src subdirectory also as include dir.
in winceunits, by removing activex from implicit unit list for wince target,
as it already is in the explicit unit list.
------------------------------------------------------------------------
--- Merging r42762 into '.':
U packages/fcl-process/fpmake.pp
U packages/winceunits/fpmake.pp
--- Recording mergeinfo for merge of r42762 into '.':
G .
git-svn-id: branches/fixes_3_2@43036 -
------------------------------------------------------------------------
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/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r40561 into '.':
U .
# revisions: 40561
git-svn-id: branches/fixes_3_2@40612 -
U packages/fcl-process/src/process.pp
U packages/fcl-process/src/win/process.inc
U packages/fcl-process/src/unix/process.inc
--- Recording mergeinfo for merge of r39681 into '.':
U .
# revisions: 39681
git-svn-id: branches/fixes_3_2@39682 -
U rtl/linux/arm/stat.inc
U rtl/linux/m68k/stat.inc
U rtl/linux/aarch64/stat.inc
U rtl/linux/powerpc64/stat.inc
U rtl/linux/i386/stat.inc
U rtl/linux/x86_64/stat.inc
--- Recording mergeinfo for merge of r39644 into '.':
U .
--- Merging r39651 into '.':
U packages/fcl-process/src/process.pp
U packages/fcl-process/src/processunicode.pp
U packages/fcl-process/src/processbody.inc
--- Recording mergeinfo for merge of r39651 into '.':
G .
--- Merging r39655 into '.':
U rtl/linux/powerpc/stat.inc
--- Recording mergeinfo for merge of r39655 into '.':
G .
# revisions: 39644,39651,39655
git-svn-id: branches/fixes_3_2@39656 -
* first misc files & rename process.pp -> processbody.inc
Next commit will add new process.pp + update of processbody.inc to preserve history.
git-svn-id: trunk@39626 -
* clean some stale variable declarations
* variable with class to instantiate in runcommand. This allows hooking runcommand* with a derivative.
git-svn-id: trunk@39625 -
