Commit Graph

36 Commits

Author SHA1 Message Date
marco
74aff88586 --- Merging r49045 into '.':
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 -
2021-05-20 20:03:52 +00:00
marco
07601d23a9 --- Merging r47446 into '.':
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 -
2020-11-30 17:33:17 +00:00
pierre
0830edbde5 Regenerate all Makefile's after ios introduction and macos->macosclassic changes inside utils/fpcm/fpcmake.ini
git-svn-id: branches/fixes_3_2@46923 -
2020-09-23 09:47:20 +00:00
Jonas Maebe
b6eafa3039 * regenerated Makefiles
git-svn-id: branches/fixes_3_2@46868 -
2020-09-15 19:54:06 +00:00
marco
788d91e0ae # revisions: 45771
git-svn-id: branches/fixes_3_2@46831 -
2020-09-10 14:07:22 +00:00
marco
09e9b70562 # revisions: 44255
git-svn-id: branches/fixes_3_2@45690 -
2020-06-24 18:09:54 +00:00
marco
066ef146f5 --- Merging r44186 into '.':
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 -
2020-06-23 08:08:15 +00:00
marco
522350a85d * fixes to 3.2.1
git-svn-id: branches/fixes_3_2@45662 -
2020-06-20 16:47:24 +00:00
marco
95217ad437 --- Merging r45406 into '.':
U    packages/ide/wchmhwrap.pas
--- Recording mergeinfo for merge of r45406 into '.':
 U   .

# revisions: 45406

git-svn-id: branches/fixes_3_2@45407 -
2020-05-17 18:29:57 +00:00
marco
4eedce268c * spell fix
git-svn-id: branches/fixes_3_2@45385 -
2020-05-16 14:26:52 +00:00
pierre
eec778bcd5 Merge of commit 44246 from trunk branch
+ 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 -
2020-02-27 16:52:50 +00:00
joost
313ff530ff --- Merging (from foreign repository) r44152 into '.':
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 -
2020-02-21 14:50:44 +00:00
marco
114fad8b83 --- Merging r43572 into '.':
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 -
2020-01-16 13:33:43 +00:00
pierre
12c54a62e7 Update all Makefile's to enable x86_64-haiku target
git-svn-id: branches/fixes_3_2@42135 -
2019-05-28 22:07:11 +00:00
marco
3de6dfa4fb * some IDE fixes merged
* gnutls with associated fcl-net revisions merged.

git-svn-id: branches/fixes_3_2@41900 -
2019-04-19 14:26:20 +00:00
marco
15b84360ab --- Merging r40804 into '.':
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 -
2019-04-18 12:51:40 +00:00
pierre
163a3918e2 ------------------------------------------------------------------------
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 -
2019-02-03 16:03:59 +00:00
pierre
f0eedd5d71 Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2
------------------------------------------------------------------------
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 -
2018-12-23 14:44:32 +00:00
pierre
1fafc17016 Merge of revisions 39731 39825 39849 39912 39913 39914 39924 39935 39999 40000 40001 40026 40115 40132 40163 from trunk to fixes_3_2
------------------------------------------------------------------------
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 -
2018-12-22 22:19:05 +00:00
yury
2d48bc8b9c * Regenerated makefiles.
git-svn-id: branches/fixes_3_2@40541 -
2018-12-13 18:18:24 +00:00
marco
340c62d2e7 more version updates
git-svn-id: branches/fixes_3_2@39634 -
2018-08-18 15:26:38 +00:00
marco
bceb71bf9f * version to 3.2.0-beta
git-svn-id: branches/fixes_3_2@39633 -
2018-08-18 15:25:41 +00:00
pierre
0064860f75 Changes for symbian target OS
git-svn-id: trunk@39577 -
2018-08-06 15:14:25 +00:00
pierre
a93fe1b363 Regenerated Makefile's after addition of ppas and ppaslink script removal in rev 38745
git-svn-id: trunk@38751 -
2018-04-12 15:26:33 +00:00
pierre
040ce05360 Fix error in condition to compile IDE package for cross-compilation, should solve bug report 33174
git-svn-id: trunk@38244 -
2018-02-15 13:12:20 +00:00
pierre
33188fb5ba Add CROSSGDB macro for cross-cpu IDEs
git-svn-id: trunk@38158 -
2018-02-07 22:29:24 +00:00
pierre
1ff69ee0fa Fix compilation with SUPPORT_REMOTE macro defined
git-svn-id: trunk@38157 -
2018-02-07 22:28:39 +00:00
pierre
5ee7682313 Add Makefile targets for IDE targetting different CPUs
git-svn-id: trunk@38146 -
2018-02-06 22:40:11 +00:00
pierre
253cf4abe1 Allow compilation for JVM CPU
git-svn-id: trunk@38145 -
2018-02-06 22:39:17 +00:00
pierre
21a18de003 Use newly added SetExeName TTarget method to specify full name of IDE for cross-CPU
git-svn-id: trunk@38144 -
2018-02-06 22:14:40 +00:00
pierre
09995b820e Pass --NOGDBMI=1 to fpmake if NOGDBMI is set
git-svn-id: trunk@38132 -
2018-02-06 12:41:54 +00:00
pierre
1512f9a34c Add NOGDBMI fpmake option to explicitly disable GDBMI support, and add GDBMI_DEFAULT_OSes to default to GDBMI
git-svn-id: trunk@38131 -
2018-02-06 12:40:58 +00:00
pierre
0cabadca2c Fix i386 compilation error for PIC code by using local stack variable
git-svn-id: trunk@38127 -
2018-02-06 10:17:18 +00:00
florian
9915de038f * build x86-64 with optimizer as well, it is unclear, why -dNOOPT was added
git-svn-id: trunk@37932 -
2018-01-07 16:23:15 +00:00
florian
8714ddafa5 * fix pathes of IDE package
* 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 -
2018-01-07 14:56:44 +00:00
florian
3ce7927096 * made the ide a package, so it can be build in parallel with the other packages, reasons:
- 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 -
2018-01-06 20:22:30 +00:00