U compiler/systems/t_bsd.pas
U utils/fppkg/fpmake.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43696 in ».«:
U .
git-svn-id: branches/fixes_3_2@43708 -
U compiler/i386/cpupi.pas
U compiler/ncgcal.pas
U compiler/ncgutil.pas
U compiler/systems/i_bsd.pas
U compiler/systems/i_linux.pas
U compiler/systems.inc
git-svn-id: branches/fixes_3_2@43683 -
------------------------------------------------------------------------
r43604 | pierre | 2019-11-28 14:50:55 +0000 (Thu, 28 Nov 2019) | 1 line
Set default stack size for i8086-embedded target: 16384 for far data model, and 2048 for other memory models
------------------------------------------------------------------------
--- Merging r43604 into '.':
U compiler/parser.pas
--- Recording mergeinfo for merge of r43604 into '.':
U .
git-svn-id: branches/fixes_3_2@43667 -
------------------------------------------------------------------------
r43634 | pierre | 2019-12-03 16:05:30 +0000 (Tue, 03 Dec 2019) | 1 line
Use PInt64(@value_currency)^ construct to avoid internal error when starting from 3.0.4 ppcarm compiler
------------------------------------------------------------------------
--- Merging r43634 into '.':
U compiler/nadd.pas
--- Recording mergeinfo for merge of r43634 into '.':
U .
------------------------------------------------------------------------
r43635 | florian | 2019-12-03 19:31:50 +0000 (Tue, 03 Dec 2019) | 1 line
* more currency fixes, should resolve#36176
------------------------------------------------------------------------
--- Merging r43635 into '.':
G compiler/nadd.pas
U tests/test/tcurrency1.pp
--- Recording mergeinfo for merge of r43635 into '.':
G .
git-svn-id: branches/fixes_3_2@43661 -
------------------------------------------------------------------------
r43655 | michael | 2019-12-06 10:57:10 +0100 (Fri, 06 Dec 2019) | 1 line
* Indicate and use sqSequences connection info, fix bug #0035241 (statement for sqlite next sequence value)
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43657 -
------------------------------------------------------------------------
r43615 | joost | 2019-11-30 12:04:19 +0100 (Sat, 30 Nov 2019) | 1 line
* Fix for timestamps very close to a whole day in Firebird
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43656 -
------------------------------------------------------------------------
r43648 | michael | 2019-12-05 17:16:08 +0100 (Thu, 05 Dec 2019) | 1 line
* Make sure open/close use same options in CSV close/open writing
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43649 -
------------------------------------------------------------------------
r43641 | michael | 2019-12-05 11:43:02 +0100 (Thu, 05 Dec 2019) | 1 line
* Fix bug #0036361, use buffer when reading csv
------------------------------------------------------------------------
r43642 | michael | 2019-12-05 13:51:14 +0100 (Thu, 05 Dec 2019) | 1 line
* Fix 16 bit support for PNM (bug ID 35080)
------------------------------------------------------------------------
r43643 | michael | 2019-12-05 15:01:43 +0100 (Thu, 05 Dec 2019) | 1 line
* Rework default file mechanism in bufdataset to fix bug #34435
------------------------------------------------------------------------
r43644 | michael | 2019-12-05 15:02:03 +0100 (Thu, 05 Dec 2019) | 1 line
* Fix name array
------------------------------------------------------------------------
r43645 | michael | 2019-12-05 15:54:15 +0100 (Thu, 05 Dec 2019) | 1 line
* Fix bug #32532: AV when killing daemon app
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43647 -
------------------------------------------------------------------------
r43636 | michael | 2019-12-04 12:30:04 +0100 (Wed, 04 Dec 2019) | 1 line
* Patch by Werner Pamler to delete builtin (bug ID 36396)
------------------------------------------------------------------------
r43637 | michael | 2019-12-04 12:42:48 +0100 (Wed, 04 Dec 2019) | 1 line
* Added possibility for array arguments
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43638 -
------------------------------------------------------------------------
--- Merging r43631 into '.':
U compiler/nadd.pas
--- Recording mergeinfo for merge of r43631 into '.':
U .
git-svn-id: branches/fixes_3_2@43633 -
------------------------------------------------------------------------
r43627 | michael | 2019-12-02 22:42:32 +0100 (Mon, 02 Dec 2019) | 1 line
* Patch from Klaus (computertechnik@web.de) to read/write columncount/columngap
------------------------------------------------------------------------
r43630 | michael | 2019-12-03 00:00:11 +0100 (Tue, 03 Dec 2019) | 1 line
* Enable compilation for Win64 bit
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@43632 -
U compiler/nadd.pas
U compiler/ncnv.pas
U compiler/ncon.pas
U compiler/node.pas
A tests/test/tcurrency1.pp
A tests/webtbs/tw33963.pp
A tests/webtbs/tw36179.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43620 in ».«:
U .
git-svn-id: branches/fixes_3_2@43621 -
------------------------------------------------------------------------
r43603 | pierre | 2019-11-28 13:47:47 +0000 (Thu, 28 Nov 2019) | 1 line
Disable ucomplex and matrix units for i8086-embedded target, because no fpu is installed in RTL by default
------------------------------------------------------------------------
--- Merging r43603 into '.':
U packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r43603 into '.':
U .
git-svn-id: branches/fixes_3_2@43619 -
------------------------------------------------------------------------
r43598 | pierre | 2019-11-27 22:15:23 +0000 (Wed, 27 Nov 2019) | 1 line
Use defined(aarch64) instead of defined(cpuaarch64) for FPC_HAS_INTERNAL_ABS_INT64
------------------------------------------------------------------------
--- Merging r43598 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r43598 into '.':
U .
git-svn-id: branches/fixes_3_2@43606 -
------------------------------------------------------------------------
r43165 | pierre | 2019-10-10 21:57:07 +0000 (Thu, 10 Oct 2019) | 1 line
Fix m68k errors with -CriotR option
------------------------------------------------------------------------
--- Merging r43165 into '.':
U compiler/m68k/cgcpu.pas
U compiler/m68k/ra68kmot.pas
--- Recording mergeinfo for merge of r43165 into '.':
U .
git-svn-id: branches/fixes_3_2@43516 -
------------------------------------------------------------------------
r42337 | laksen | 2019-07-07 14:37:45 +0000 (Sun, 07 Jul 2019) | 1 line
- Fix result type of SizeOf and BitSizeOf to use sizesint instead of sint.
------------------------------------------------------------------------
--- Merging r42337 into '.':
U compiler/ninl.pas
U compiler/pexpr.pas
--- Recording mergeinfo for merge of r42337 into '.':
U .
git-svn-id: branches/fixes_3_2@43514 -
U .
-- Zusammenführen von r43506 in ».«:
U compiler/x86/cgx86.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43506 in ».«:
G .
-- Zusammenführen von r43508 in ».«:
U compiler/i386/n386cal.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43508 in ».«:
G .
git-svn-id: branches/fixes_3_2@43510 -
A tests/webtbf/tw4541.pp
A tests/webtbf/uw4541.pp
D tests/webtbs/tw4541.pp
D tests/webtbs/uw4541.pp
--- Recording mergeinfo for merge of r40658 into '.':
U .
git-svn-id: branches/fixes_3_2@43499 -
C compiler/nmat.pas
--- Recording mergeinfo for merge of r43347 into '.':
G .
--- Merging r43436 into '.':
U compiler/defutil.pas
U compiler/nadd.pas
U compiler/ncnv.pas
U compiler/ncon.pas
U compiler/ngtcon.pas
U compiler/ninl.pas
G compiler/nmat.pas
U compiler/nutils.pas
U compiler/pstatmnt.pas
--- Recording mergeinfo for merge of r43436 into '.':
G .
--- Merging r43438 into '.':
A tests/test/tinlrange1.pp
A tests/test/tinlrange2.pp
A tests/test/tinlrange3.pp
--- Recording mergeinfo for merge of r43438 into '.':
G .
--- Merging r43451 into '.':
U tests/test/tinlrange1.pp
--- Recording mergeinfo for merge of r43451 into '.':
G .
--- Merging r43497 into '.':
C compiler/nmat.pas
A tests/test/tinlrange4.pp
--- Recording mergeinfo for merge of r43497 into '.':
G .
git-svn-id: branches/fixes_3_2@43498 -
U .
--- Merging r43364 into '.':
U rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r43364 into '.':
G .
--- Merging r43375 into '.':
U utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43375 into '.':
G .
--- Merging r43376 into '.':
U utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r43376 into '.':
G .
--- Merging r43381 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43381 into '.':
G .
--- Merging r43383 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43383 into '.':
G .
--- Merging r43386 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43386 into '.':
G .
# revisions: 41459,43364,43375,43376,43381,43383,43386
git-svn-id: branches/fixes_3_2@43446 -
U compiler/blockutl.pas
U compiler/jvm/njvmutil.pas
U compiler/jvm/pjvm.pas
U compiler/ncal.pas
U compiler/ninl.pas
U compiler/pdecl.pas
U compiler/pdecsub.pas
U compiler/pdecvar.pas
U compiler/pexpr.pas
U compiler/pgenutil.pas
U compiler/pmodules.pas
U compiler/pparautl.pas
U compiler/pstatmnt.pas
U compiler/psub.pas
U compiler/psystem.pas
U compiler/ptype.pas
U compiler/symcreat.pas
U compiler/symdef.pas
U compiler/symsym.pas
U compiler/symutil.pas
--- Recording mergeinfo for merge of r42998 into '.':
U .
--- Merging r43116 into '.':
G compiler/symsym.pas
A tests/webtbf/tw36114.pp
--- Recording mergeinfo for merge of r43116 into '.':
G .
# revisions: 42998,43116
git-svn-id: branches/fixes_3_2@43442 -
G .
-- Aufzeichnung der Informationen für Zusammenführung von r43006 in ».«:
G .
-- Aufzeichnung der Informationen für Zusammenführung von r43007 in ».«:
G .
-- Aufzeichnung der Informationen für Zusammenführung von r43008 in ».«:
G .
-- Zusammenführen von r43000 in ».«:
U compiler/pp.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43000 in ».«:
G .
-- Zusammenführen von r43011 in ».«:
U rtl/inc/system.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43011 in ».«:
G .
-- Zusammenführen von r43012 in ».«:
U rtl/i386/i386.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43012 in ».«:
G .
-- Zusammenführen von r43013 in ».«:
U rtl/linux/i386/si_c21.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43013 in ».«:
G .
-- Zusammenführen von r43014 in ».«:
U compiler/systems/i_linux.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43014 in ».«:
G .
-- Zusammenführen von r43176 in ».«:
U compiler/i386/cpupi.pas
U compiler/i386/n386cal.pas
U compiler/ncgcal.pas
U compiler/ncgutil.pas
G compiler/systems/i_linux.pas
U compiler/systems.inc
C compiler/systems.pas
G tests/webtbs/tw7808.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43176 in ».«:
G .
Konfliktübersicht:
Textkonflikte: 1
Konfliktübersicht:
Textkonflikte: 1
git-svn-id: branches/fixes_3_2@43434 -
U packages/rtl-objpas/tests/tests.rtti.util.pas
--- Recording mergeinfo for merge of r42809 into '.':
U .
--- Merging r42810 into '.':
U packages/rtl-objpas/tests/tests.rtti.pas
G packages/rtl-objpas/tests/tests.rtti.util.pas
--- Recording mergeinfo for merge of r42810 into '.':
G .
--- Recording mergeinfo for merge of r42810 into 'packages/rtl-objpas/tests/tests.rtti.pas':
U packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42988 into '.':
U compiler/aarch64/racpugas.pas
--- Recording mergeinfo for merge of r42988 into '.':
G .
--- Recording mergeinfo for merge of r42988 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42989 into '.':
G compiler/aarch64/racpugas.pas
--- Recording mergeinfo for merge of r42989 into '.':
G .
--- Recording mergeinfo for merge of r42989 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42990 into '.':
U packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42990 into '.':
G .
--- Recording mergeinfo for merge of r42990 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42991 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42991 into '.':
G .
--- Recording mergeinfo for merge of r42991 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r43016 into '.':
U compiler/aarch64/aasmcpu.pas
U compiler/aarch64/agcpugas.pas
G compiler/aarch64/racpugas.pas
--- Recording mergeinfo for merge of r43016 into '.':
G .
--- Recording mergeinfo for merge of r43016 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
# revisions: 42809,42810,42988,42989,42990,42991,43016
git-svn-id: branches/fixes_3_2@43424 -
U packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42088 into '.':
U .
--- Merging r42708 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42708 into '.':
G .
--- Merging r42709 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42709 into '.':
G .
--- Merging r42710 into '.':
U packages/rtl-objpas/tests/tests.rtti.impl.pas
--- Recording mergeinfo for merge of r42710 into '.':
G .
--- Merging r42720 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42720 into '.':
G .
--- Merging r42731 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42731 into '.':
G .
--- Merging r42732 into '.':
U packages/rtl-objpas/tests/tests.rtti.pas
--- Recording mergeinfo for merge of r42732 into '.':
G .
--- Recording mergeinfo for merge of r42732 into 'packages/rtl-objpas/tests/tests.rtti.pas':
U packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42733 into '.':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Recording mergeinfo for merge of r42733 into '.':
G .
--- Recording mergeinfo for merge of r42733 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42734 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42734 into '.':
G .
--- Recording mergeinfo for merge of r42734 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42738 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42738 into '.':
G .
--- Recording mergeinfo for merge of r42738 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42740 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42740 into '.':
G .
--- Recording mergeinfo for merge of r42740 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42755 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42755 into '.':
G .
--- Recording mergeinfo for merge of r42755 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42756 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42756 into '.':
G .
--- Recording mergeinfo for merge of r42756 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42757 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42757 into '.':
G .
--- Recording mergeinfo for merge of r42757 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42758 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42758 into '.':
G .
--- Recording mergeinfo for merge of r42758 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42780 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42780 into '.':
G .
--- Recording mergeinfo for merge of r42780 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42801 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42801 into '.':
G .
--- Recording mergeinfo for merge of r42801 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42802 into '.':
U rtl/objpas/typinfo.pp
--- Recording mergeinfo for merge of r42802 into '.':
G .
--- Recording mergeinfo for merge of r42802 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42803 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42803 into '.':
G .
--- Recording mergeinfo for merge of r42803 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42804 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42804 into '.':
G .
--- Recording mergeinfo for merge of r42804 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42805 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42805 into '.':
G .
--- Recording mergeinfo for merge of r42805 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
--- Merging r42806 into '.':
G packages/rtl-objpas/src/inc/rtti.pp
--- Recording mergeinfo for merge of r42806 into '.':
G .
--- Recording mergeinfo for merge of r42806 into 'packages/rtl-objpas/tests/tests.rtti.pas':
G packages/rtl-objpas/tests/tests.rtti.pas
# revisions: 42088,42708,42709,42710,42720,42731,42732,42733,42734,42738,42740,42755,42756,42757,42758,42780,42801,42802,42803,42804,42805,42806
git-svn-id: branches/fixes_3_2@43423 -
U compiler/cfileutl.pas
U compiler/options.pas
U compiler/systems/t_bsd.pas
C compiler/systems/t_linux.pas
--- Merging r43302 into '.':
G compiler/cfileutl.pas
--- Merging r43306 into '.':
G compiler/cfileutl.pas
--- Merging r43312 into '.':
G compiler/cfileutl.pas
G compiler/options.pas
U compiler/scandir.pas
U compiler/systems/t_aix.pas
U compiler/systems/t_beos.pas
G compiler/systems/t_bsd.pas
U compiler/systems/t_haiku.pas
C compiler/systems/t_linux.pas
U compiler/systems/t_macos.pas
U compiler/systems/t_sunos.pas
git-svn-id: branches/fixes_3_2@43421 -
U compiler/msg/errore.msg
--- Recording mergeinfo for merge of r40654 into '.':
U .
--- Merging r40656 into '.':
U compiler/pdecvar.pas
A tests/tbf/tb0266a.pp
A tests/tbf/tb0266b.pp
--- Recording mergeinfo for merge of r40656 into '.':
G .
--- Merging r41308 into '.':
U tests/webtbs/tw35027.pp
--- Recording mergeinfo for merge of r41308 into '.':
G .
--- Merging r41829 into '.':
U compiler/htypechk.pas
U compiler/ncal.pas
A tests/tbs/tb0656.pp
--- Recording mergeinfo for merge of r41829 into '.':
G .
--- Merging r42511 into '.':
U packages/rtl-objpas/src/inc/rtti.pp
U rtl/objpas/typinfo.pp
U tests/test/trtti19.pp
--- Recording mergeinfo for merge of r42511 into '.':
G .
# revisions: 40654,40656,41308,41829,42511
git-svn-id: branches/fixes_3_2@43410 -
