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 -
A packages/ide/fparm.lpi
U packages/ide/fpmopts.inc
U packages/ide/fpx64.lpi
--- Recording mergeinfo for merge of r47446 into '.':
U .
# revisions: 47446
r47446 | florian | 2020-11-18 22:19:14 +0100 (Wed, 18 Nov 2020) | 3 lines
Changed paths:
A /trunk/packages/ide/fparm.lpi (from /trunk/packages/ide/fpx64.lpi:47445)
M /trunk/packages/ide/fpmopts.inc
M /trunk/packages/ide/fpx64.lpi
* made Compiler Options window large enough to show all CPUs
+ project file for IDE targetting arm
* write binary to bin/<full target>/fp
git-svn-id: branches/fixes_3_2@47644 -
U packages/ide/fpdebug.pas
--- Recording mergeinfo for merge of r44186 into '.':
U .
--- Merging r44187 into '.':
G packages/ide/fpdebug.pas
--- Recording mergeinfo for merge of r44187 into '.':
G .
--- Merging r44190 into '.':
G packages/ide/fpdebug.pas
--- Recording mergeinfo for merge of r44190 into '.':
G .
# revisions: 44186,44187,44190
git-svn-id: branches/fixes_3_2@45681 -
+ other fixes to packages/*/fpmake.pp with wrong versions.
Fixes shortsrc target in fixes_3_2 branch.
------------------------------------------------------------------------
r44246 | pierre | 2020-02-27 07:32:00 +0000 (Thu, 27 Feb 2020) | 3 lines
* Fix sourcezip make target, correcting mixed case input file names.
------------------------------------------------------------------------
--- Merging r44246 into '.':
U packages/ide/fpmake.pp
U packages/libgbafpc/fpmake.pp
U packages/libndsfpc/fpmake.pp
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r44246 into '.':
U .
git-svn-id: branches/fixes_3_2@44247 -
U fpmake.pp
U packages/fpmake.pp
U packages/ide/fpmake.pp
--- Merging (from foreign repository) r44154 into '.':
G packages/ide/fpmake.pp
git-svn-id: branches/fixes_3_2@44229 -
A .gitignore
--- Recording mergeinfo for merge of r43572 into '.':
U .
--- Merging r43581 into '.':
U .gitignore
--- Recording mergeinfo for merge of r43581 into '.':
G .
--- Merging r43582 into '.':
G .gitignore
--- Recording mergeinfo for merge of r43582 into '.':
G .
--- Merging r43916 into '.':
A packages/ide/fpx64.lpi
--- Recording mergeinfo for merge of r43916 into '.':
G .
# revisions: 43572,43581,43582,43916
git-svn-id: branches/fixes_3_2@43956 -
U packages/ide/fpmwnd.inc
U packages/ide/fpide.pas
--- Recording mergeinfo for merge of r40804 into '.':
U .
--- Merging r40811 into '.':
U packages/fv/src/editors.pas
U packages/fv/src/statuses.pas
U packages/fv/src/validate.pas
--- Recording mergeinfo for merge of r40811 into '.':
G .
# revisions: 40804,40811
r40804 | michael | 2019-01-08 05:15:38 +0100 (Tue, 08 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/ide/fpide.pas
M /trunk/packages/ide/fpmwnd.inc
* Apply patch from Margers to fix bug ID #6496
r40811 | marco | 2019-01-09 11:18:36 +0100 (Wed, 09 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/fv/src/editors.pas
M /trunk/packages/fv/src/statuses.pas
M /trunk/packages/fv/src/validate.pas
* patch from Margers that fixes parameter arrays formatstr, mantis 34839
git-svn-id: branches/fixes_3_2@41895 -
r39826 | pierre | 2018-09-27 07:01:58 +0000 (Thu, 27 Sep 2018) | 1 line
Update Makefile.fpc to pacakages location
------------------------------------------------------------------------
--- Merging r39826 into '.':
U packages/ide/fakegdb/Makefile.fpc
--- Recording mergeinfo for merge of r39826 into '.':
U .
git-svn-id: branches/fixes_3_2@41187 -
------------------------------------------------------------------------
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 -
------------------------------------------------------------------------
r39731 | pierre | 2018-09-11 08:00:54 +0000 (Tue, 11 Sep 2018) | 1 line
Disable overflow for UDIVX ans SDIVX 64-bit instructions
------------------------------------------------------------------------
--- Merging r39731 into '.':
U compiler/sparcgen/ncpumat.pas
--- Recording mergeinfo for merge of r39731 into '.':
G .
------------------------------------------------------------------------
r39825 | pierre | 2018-09-27 06:59:07 +0000 (Thu, 27 Sep 2018) | 1 line
Add rtl dependency and fix fpcdir value
------------------------------------------------------------------------
--- Merging r39825 into '.':
U packages/ide/compiler/Makefile.fpc
--- Recording mergeinfo for merge of r39825 into '.':
G .
------------------------------------------------------------------------
r39849 | pierre | 2018-10-01 21:50:13 +0000 (Mon, 01 Oct 2018) | 1 line
Use vfpv2 as default fpu for eabihf if cpu is below armv7
------------------------------------------------------------------------
--- Merging r39849 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r39849 into '.':
G .
------------------------------------------------------------------------
r39912 | pierre | 2018-10-11 20:38:39 +0000 (Thu, 11 Oct 2018) | 1 line
Fix ppuload for string type for i8086, use getasizeint for all string defs but short string
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r39912 into '.':
G .
------------------------------------------------------------------------
r39913 | pierre | 2018-10-11 21:02:25 +0000 (Thu, 11 Oct 2018) | 1 line
fix position of ppuload_platform for trecorddef
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r39913 into '.':
G .
------------------------------------------------------------------------
r39914 | pierre | 2018-10-12 06:05:50 +0000 (Fri, 12 Oct 2018) | 1 line
Adapt ppudump to fix introduced in revision 39912
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r39914 into '.':
G .
------------------------------------------------------------------------
r39924 | pierre | 2018-10-13 11:35:34 +0000 (Sat, 13 Oct 2018) | 1 line
Downgrade some warnings to notes for EXTDEBUG
------------------------------------------------------------------------
--- Merging r39924 into '.':
U compiler/pass_2.pas
U compiler/tgobj.pas
--- Recording mergeinfo for merge of r39924 into '.':
G .
------------------------------------------------------------------------
r39935 | pierre | 2018-10-14 22:18:50 +0000 (Sun, 14 Oct 2018) | 1 line
Add missing setting of expectloc for multiplications
------------------------------------------------------------------------
--- Merging r39935 into '.':
U compiler/nadd.pas
--- Recording mergeinfo for merge of r39935 into '.':
G .
------------------------------------------------------------------------
r39999 | pierre | 2018-10-20 18:44:05 +0000 (Sat, 20 Oct 2018) | 1 line
Avoid run time error if compiled with -CR option
------------------------------------------------------------------------
--- Merging r39999 into '.':
U compiler/m68k/cpupara.pas
--- Recording mergeinfo for merge of r39999 into '.':
G .
------------------------------------------------------------------------
r40000 | pierre | 2018-10-20 18:49:53 +0000 (Sat, 20 Oct 2018) | 1 line
Avoid range check error when compiled with -CR
------------------------------------------------------------------------
--- Merging r40000 into '.':
U compiler/m68k/cgcpu.pas
--- Recording mergeinfo for merge of r40000 into '.':
G .
------------------------------------------------------------------------
r40001 | pierre | 2018-10-20 22:19:08 +0000 (Sat, 20 Oct 2018) | 1 line
Add explicit typecast to avoid range check error
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40001 into '.':
G .
------------------------------------------------------------------------
r40026 | pierre | 2018-10-24 21:37:22 +0000 (Wed, 24 Oct 2018) | 1 line
Explicitly disable range checking
------------------------------------------------------------------------
--- Merging r40026 into '.':
U compiler/x86/cgx86.pas
--- Recording mergeinfo for merge of r40026 into '.':
G .
------------------------------------------------------------------------
r40115 | pierre | 2018-10-31 22:53:11 +0000 (Wed, 31 Oct 2018) | 1 line
Avoid range check error in ReadPosInfo
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40115 into '.':
G .
------------------------------------------------------------------------
r40132 | pierre | 2018-11-01 07:09:47 +0000 (Thu, 01 Nov 2018) | 1 line
Only call moved if len>0, as otherwise astring local variable is nil, which leads to a range check error for astring[1]
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40132 into '.':
G .
------------------------------------------------------------------------
r40163 | pierre | 2018-11-01 21:58:54 +0000 (Thu, 01 Nov 2018) | 8 lines
More -CriotR fixes:
* entfile.pas: Change PPU header falgs filed from longint to dword.
* ngtcon.pas: Change local variable startoffset type to aword.
* omfbase.pas: Avoid calling move with a nil string s indexed as s[1],
to avoid a range check error.
* owomflib.pas: Disable range check explicitly in hash computation.
* utils/ppuutils/ppudump.pp: Adapt to flags type change in entfile.pas
------------------------------------------------------------------------
--- Recording mergeinfo for merge of r40163 into '.':
G .
git-svn-id: branches/fixes_3_2@40616 -
* cosmetic changes (indention)
* cross IDE gets now the CPU name as a prefix
* cross IDE units are build into a seperate dir, so after a full build, a cross IDE can be easily build
git-svn-id: trunk@37929 -
- lowers build times
- ide is not that important anymore than years before
- other utils like pastojs are also located in the packages tree
git-svn-id: trunk@37926 -