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 -
with fpmkunit change.
------------------------------------------------------------------------
r40365 | pierre | 2018-11-24 15:14:57 +0000 (Sat, 24 Nov 2018) | 4 lines
+ Add Debug message when resource file is found, but not registered.
+ Add missing "T.ResourceStrings:=True;" for all source units
that generate the new debug message above.
------------------------------------------------------------------------
--- Merging r40365 into '.':
U packages/mysql/fpmake.pp
U packages/fcl-base/fpmake.pp
U packages/fcl-web/fpmake.pp
U packages/fcl-db/fpmake.pp
U packages/fcl-pdf/fpmake.pp
U packages/fcl-image/fpmake.pp
U packages/pastojs/fpmake.pp
U packages/fcl-passrc/fpmake.pp
U packages/rtl-objpas/fpmake.pp
U packages/openssl/fpmake.pp
U packages/winunits-base/fpmake.pp
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r40365 into '.':
U .
------------------------------------------------------------------------
r40391 | pierre | 2018-11-28 23:45:35 +0000 (Wed, 28 Nov 2018) | 1 line
Add several missing unit references in fpmake files
------------------------------------------------------------------------
--- Merging r40391 into '.':
U utils/pas2ut/fpmake.pp
U utils/fpdoc/fpmake.pp
U utils/pas2js/fpmake.pp
U utils/fppkg/fpmake.pp
U utils/fpcmkcfg/fpmake.pp
U utils/fpmake.pp
U utils/unicode/fpmake.pp
--- Recording mergeinfo for merge of r40391 into '.':
G .
------------------------------------------------------------------------
r40899 | pierre | 2019-01-19 10:26:51 +0000 (Sat, 19 Jan 2019) | 1 line
Activate fpc-web package for android OS, except for jvm compiler
------------------------------------------------------------------------
--- Merging r40899 into '.':
G packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r40899 into '.':
G .
------------------------------------------------------------------------
r41069 | pierre | 2019-01-25 12:58:21 +0000 (Fri, 25 Jan 2019) | 1 line
Disable targets that do not support fcl-base for utils packages that need fcl-base
------------------------------------------------------------------------
--- Merging r41069 into '.':
G utils/pas2ut/fpmake.pp
G utils/fpdoc/fpmake.pp
U utils/json2pas/fpmake.pp
U utils/fpcreslipo/fpmake.pp
G utils/fpcmkcfg/fpmake.pp
G utils/fpmake.pp
U utils/fpcres/fpmake.pp
U utils/fpcm/fpmake.pp
G utils/unicode/fpmake.pp
U utils/pas2fpm/fpmake.pp
U utils/instantfpc/fpmake.pp
U utils/importtl/fpmake.pp
--- Recording mergeinfo for merge of r41069 into '.':
G .
------------------------------------------------------------------------
r41070 | pierre | 2019-01-25 14:39:12 +0000 (Fri, 25 Jan 2019) | 1 line
Enable paszlib package and disable utils/fpcm and utils/fpcmkcfg for nativent OS
------------------------------------------------------------------------
--- Merging r41070 into '.':
U packages/paszlib/fpmake.pp
G utils/fpcmkcfg/fpmake.pp
G utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r41070 into '.':
G .
------------------------------------------------------------------------
r41076 | pierre | 2019-01-26 10:17:58 +0000 (Sat, 26 Jan 2019) | 1 line
Also use installed ppudump for ppu testing in utils directory
------------------------------------------------------------------------
--- Merging r41076 into '.':
U utils/Makefile.fpc
U utils/Makefile
--- Recording mergeinfo for merge of r41076 into '.':
G .
------------------------------------------------------------------------
r41104 | pierre | 2019-01-28 17:43:15 +0000 (Mon, 28 Jan 2019) | 1 line
-Xr is also supported for systems_android
------------------------------------------------------------------------
--- Merging r41104 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r41104 into '.':
G .
------------------------------------------------------------------------
r41106 | pierre | 2019-01-29 09:01:42 +0000 (Tue, 29 Jan 2019) | 1 line
Disable jvm-android and jvm-java targets for fprcp, h2pas and tply packages because they use memory allocation or fpc_get_output
------------------------------------------------------------------------
--- Merging r41106 into '.':
U utils/fprcp/fpmake.pp
U utils/h2pas/fpmake.pp
U utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41106 into '.':
G .
------------------------------------------------------------------------
r41119 | pierre | 2019-01-29 13:46:43 +0000 (Tue, 29 Jan 2019) | 1 line
Disable palmos in fprcp, h2pas and tply packages
------------------------------------------------------------------------
--- Merging r41119 into '.':
G utils/fprcp/fpmake.pp
G utils/h2pas/fpmake.pp
G utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41119 into '.':
G .
------------------------------------------------------------------------
r41120 | pierre | 2019-01-29 14:08:03 +0000 (Tue, 29 Jan 2019) | 1 line
Disable fprcp, h2pas and tply pacakges for msdos and win16 because the programs are too big
------------------------------------------------------------------------
--- Merging r41120 into '.':
G utils/fprcp/fpmake.pp
G utils/h2pas/fpmake.pp
G utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41120 into '.':
G .
------------------------------------------------------------------------
r41121 | pierre | 2019-01-29 14:17:53 +0000 (Tue, 29 Jan 2019) | 1 line
Disable atari target for fpcm and fpcmkcfg because it depends on unsupported fpmkunit package
------------------------------------------------------------------------
--- Merging r41121 into '.':
G utils/fpcmkcfg/fpmake.pp
G utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r41121 into '.':
G .
------------------------------------------------------------------------
r41122 | pierre | 2019-01-29 14:32:28 +0000 (Tue, 29 Jan 2019) | 1 line
Disable some packages for avr-embedded and i8086-embedded targets
------------------------------------------------------------------------
--- Merging r41122 into '.':
G utils/fprcp/fpmake.pp
G utils/h2pas/fpmake.pp
G utils/tply/fpmake.pp
--- Recording mergeinfo for merge of r41122 into '.':
G .
------------------------------------------------------------------------
r41142 | pierre | 2019-01-30 12:55:04 +0000 (Wed, 30 Jan 2019) | 1 line
Disable jvm-android as fcl-json is not supported for this target
------------------------------------------------------------------------
--- Merging r41142 into '.':
G utils/pas2js/fpmake.pp
--- Recording mergeinfo for merge of r41142 into '.':
G .
------------------------------------------------------------------------
r41150 | pierre | 2019-01-31 11:20:34 +0000 (Thu, 31 Jan 2019) | 1 line
Disable pas2js for jvm compiler
------------------------------------------------------------------------
--- Merging r41150 into '.':
G utils/pas2js/fpmake.pp
--- Recording mergeinfo for merge of r41150 into '.':
G .
git-svn-id: branches/fixes_3_2@41193 -
------------------------------------------------------------------------
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 -
