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 -
------------------------------------------------------------------------
r48814 | pierre | 2021-02-26 17:15:30 +0000 (Fri, 26 Feb 2021) | 1 line
Do not add libgcc directory to library directories with -Fl option if -Xd option is used
------------------------------------------------------------------------
------------------------------------------------------------------------
r42843 | pierre | 2019-08-26 21:41:41 +0000 (Mon, 26 Aug 2019) | 1 line
Partial update for go32v2 and sources
------------------------------------------------------------------------
--- Merging r44112 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r44112 into '.':
G .
------------------------------------------------------------------------
r48836 | hajny | 2021-02-28 02:08:17 +0000 (Sun, 28 Feb 2021) | 1 line
* package tplylib added, corrections for more than 31 items on a tab
------------------------------------------------------------------------
--- Merging r48836 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r48836 into '.':
G .
------------------------------------------------------------------------
r49035 | pierre | 2021-03-22 23:26:26 +0000 (Mon, 22 Mar 2021) | 1 line
Try to fix short package name issues in install.dat and add missing go32v2 packages
------------------------------------------------------------------------
--- Merging r49035 into '.':
G installer/install.dat
--- Recording mergeinfo for merge of r49035 into '.':
G .
git-svn-id: branches/fixes_3_2@49041 -
U installer/install.dat
U installer/install.pas
--- Recording mergeinfo for merge of r45238 into '.':
U .
# revisions: 45238
git-svn-id: branches/fixes_3_2@45240 -
------------------------------------------------------------------------
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 -
