Commit Graph

54596 Commits

Author SHA1 Message Date
pierre
1b4fb37948 Merge commit r42337, to fix avr-embedded packages compilation
------------------------------------------------------------------------
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 -
2019-11-19 22:28:04 +00:00
michael
d27126b64c * Merging revisions 43511 from trunk:
------------------------------------------------------------------------
    r43511 | michael | 2019-11-17 23:27:28 +0100 (Sun, 17 Nov 2019) | 1 line
    
    * Fix bug ID #36147
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43512 -
2019-11-17 22:28:21 +00:00
florian
319b575012 -- Aufzeichnung der Informationen für Zusammenführung von r43503 in ».«:
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 -
2019-11-17 20:16:02 +00:00
Jonas Maebe
afa7c478a2 --- Merging r43504 into '.':
U    compiler/nmat.pas
--- Recording mergeinfo for merge of r43504 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43505 -
2019-11-16 17:58:36 +00:00
Jonas Maebe
d201755ba2 --- Merging r40658 into '.':
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 -
2019-11-16 15:19:24 +00:00
Jonas Maebe
858bf743ef --- Merging r43347 into '.':
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 -
2019-11-16 15:18:43 +00:00
marco
375d21b29f --- Recording mergeinfo for merge of r41459 into '.':
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 -
2019-11-10 20:56:25 +00:00
marco
d24f4b0926 --- Merging r42998 into '.':
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 -
2019-11-10 16:12:48 +00:00
Jonas Maebe
9a58d7bb65 --- Merging r43185 into '.':
U    compiler/ncgcal.pas

git-svn-id: branches/fixes_3_2@43437 -
2019-11-10 12:03:56 +00:00
florian
7cdb39b3f9 -- Aufzeichnung der Informationen für Zusammenführung von r43005 in ».«:
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 -
2019-11-09 22:07:33 +00:00
marco
4fbb2d9cf0 --- Merging r42809 into '.':
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 -
2019-11-09 13:28:55 +00:00
marco
f6d44edc07 --- Merging r42088 into '.':
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 -
2019-11-09 12:23:56 +00:00
Jonas Maebe
83f4803773 --- Merging r43374 into '.':
C    compiler/options.pas

git-svn-id: branches/fixes_3_2@43422 -
2019-11-09 11:25:32 +00:00
Jonas Maebe
153ddaffc9 --- Merging r43279 into '.':
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 -
2019-11-09 10:59:39 +00:00
marco
ff0a27b85c * record-only merge 40655. msgs already regenerated during merge of r40654
git-svn-id: branches/fixes_3_2@43411 -
2019-11-07 10:05:09 +00:00
marco
037583ef4e --- Merging r40654 into '.':
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 -
2019-11-07 10:04:13 +00:00
marco
f131ff18ad # revisions: 42717,42718,42719,42754
git-svn-id: branches/fixes_3_2@43403 -
2019-11-05 16:46:30 +00:00
marco
f1ba9ac665 *
git-svn-id: branches/fixes_3_2@43402 -
2019-11-05 16:37:09 +00:00
marco
c4b9529d6b # revisions: 42328,42329
git-svn-id: branches/fixes_3_2@43401 -
2019-11-05 16:22:23 +00:00
marco
89e051bac9 # revisions: 41828,41830,41831,41832,41833,41834,41835,41836,41837,41838,41839,41841,41842,42025,42031,42032,42033,42034,42035,42036,42065,42066,42067,42068,42069,42070,42071,42072,42073,42089,42150,42151,42181,42182,42183,42184,42185,42219,42220,42221,42222
git-svn-id: branches/fixes_3_2@43400 -
2019-11-05 16:17:53 +00:00
marco
9c8a2d29e1 # revisions: 40702,40703,40704,40747,40750,40765,41277,41535,41536,41537,41548,41549,41770
git-svn-id: branches/fixes_3_2@43399 -
2019-11-05 16:08:58 +00:00
marco
9987e790f8 # revisions: 40657,40701
git-svn-id: branches/fixes_3_2@43398 -
2019-11-05 16:05:22 +00:00
marco
a85fa3a3d8 # revisions: 40660,40661,40662,40663,40664,40665,40666,40667,40668,40669,40670,40673,40692,40693,40694,40695,40696,40697,40698,40699,40700
git-svn-id: branches/fixes_3_2@43397 -
2019-11-05 15:53:08 +00:00
marco
0f4e7b65b2 # revisions: 41843,41844,42700
git-svn-id: branches/fixes_3_2@43396 -
2019-11-05 15:35:13 +00:00
marco
c067bf7751 # revisions: 42774,42796,42797
git-svn-id: branches/fixes_3_2@43395 -
2019-11-05 15:33:47 +00:00
marco
a4864e36f2 # revisions: 39668,39669,39671,39672,40652,41280,41281,42240,42244,42245,42286,42326,42456,42461,43048,43107,43108,43109,43110,43111,43112,43113
git-svn-id: branches/fixes_3_2@43394 -
2019-11-05 15:31:21 +00:00
marco
b8e3d6efa1 # revisions: 41570,41571,41938,42457,42327,42556,42557
git-svn-id: branches/fixes_3_2@43393 -
2019-11-05 15:16:28 +00:00
pierre
6b0a663b24 Merge commit 42281, to fix i8086 compiler
------------------------------------------------------------------------
r42281 | pierre | 2019-06-25 04:24:56 +0000 (Tue, 25 Jun 2019) | 1 line

 Use tcgint typecast instead of aint, as it is the type of the second parameter of loadconst taicpu method
------------------------------------------------------------------------
--- Merging r42281 into '.':
U    compiler/x86/aoptx86.pas
--- Recording mergeinfo for merge of r42281 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43388 -
2019-11-04 09:29:16 +00:00
pierre
1f20cfe991 Merge of several commits related to enhancements in PPU writing
and more precisely to cross reading/writing fixes.

------------------------------------------------------------------------
r41896 | pierre | 2019-04-18 14:08:03 +0000 (Thu, 18 Apr 2019) | 15 lines

  Integrate patch from bug report 35409.
  Add possibiliy to throw InternalError
  for unhandled case values inside tentryfile,
  But avoid adding dependency on verbose unit
  as this would break ppudump handling of ppu files.

  Add RaiseAssertion virtual method to tentryfile class.
  Call RaiseAssertion in tentryfile methods
  where an internal error is wanted.
  Override RaiseAssertion method in symtype.pas unit
  to call InternalError.
  Add new class tppudumpfile to override RaiseAssertion
  in utils/ppuutils/ppudump.pp unit.


------------------------------------------------------------------------
--- Merging r41896 into '.':
U    compiler/entfile.pas
U    compiler/pcp.pas
U    compiler/symtype.pas
U    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r41896 into '.':
 U   .
------------------------------------------------------------------------
r42111 | pierre | 2019-05-20 22:06:57 +0000 (Mon, 20 May 2019) | 1 line

 List TSettings partially and improve generic output
------------------------------------------------------------------------
--- Merging r42111 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42111 into '.':
 G   .
------------------------------------------------------------------------
r42322 | pierre | 2019-07-03 13:35:05 +0000 (Wed, 03 Jul 2019) | 1 line

 Systematically include fpcdefs.inc at sart of all units used by compiler
------------------------------------------------------------------------
--- Merging r42322 into '.':
U    compiler/aarch64/cpuinfo.pas
U    compiler/arm/cpuinfo.pas
U    compiler/avr/cpuinfo.pas
U    compiler/ccharset.pas
U    compiler/generic/cpuinfo.pas
U    compiler/jvm/cpuinfo.pas
U    compiler/m68k/cpuinfo.pas
U    compiler/macho.pas
U    compiler/machoutils.pas
U    compiler/mips/cpuinfo.pas
G    compiler/pcp.pas
U    compiler/powerpc/cpuinfo.pas
U    compiler/powerpc64/cpuinfo.pas
U    compiler/systems/i_wii.pas
--- Recording mergeinfo for merge of r42322 into '.':
 G   .

------------------------------------------------------------------------
r42323 | pierre | 2019-07-04 15:24:49 +0000 (Thu, 04 Jul 2019) | 7 lines

  * Set ControllerSupport to false for sparc/sparc64 and x86_64 CPUs.
    This boolean must only be set to true if TControllerType is not simply (ct_none)
  * ppu.pas: Increment CurrentPPULongVersion constant as the above modification
    changes the number of fields of the TSettings record that is saved to
    PPU in ST_LOADSETTINGS field. { not mereged }


------------------------------------------------------------------------
--- Merging r42323 into '.':
C    compiler/ppu.pas { not mereged }
U    compiler/sparc/cpuinfo.pas
U    compiler/sparc64/cpuinfo.pas
U    compiler/x86_64/cpuinfo.pas
--- Recording mergeinfo for merge of r42323 into '.':
 G   .

------------------------------------------------------------------------
r42324 | pierre | 2019-07-04 15:25:40 +0000 (Thu, 04 Jul 2019) | 1 line

 Correctly read saved tsettings
------------------------------------------------------------------------
--- Merging r42324 into '.':
C    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42324 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1
------------------------------------------------------------------------
r42325 | marcus | 2019-07-04 16:49:26 +0000 (Thu, 04 Jul 2019) | 1 line

Fixed ppudump compilation on big endian platforms after r42324
------------------------------------------------------------------------
--- Merging r42325 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42325 into '.':
 G   .
------------------------------------------------------------------------
r42353 | svenbarth | 2019-07-12 16:25:33 +0000 (Fri, 12 Jul 2019) | 1 line

* write an entry name for the property options
------------------------------------------------------------------------
--- Merging r42353 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42353 into '.':
 G   .
------------------------------------------------------------------------
r42354 | svenbarth | 2019-07-12 16:25:36 +0000 (Fri, 12 Jul 2019) | 1 line

* write a name for the none property access entry (looks nicer than a "(Nil)" at the start of the line)
------------------------------------------------------------------------
--- Merging r42354 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42354 into '.':
 G   .
------------------------------------------------------------------------
r42527 | pierre | 2019-07-29 05:33:00 +0000 (Mon, 29 Jul 2019) | 22 lines

  Fix recordtoken writing into ppu files to allow correct
  handling in cross-configuration with different endianess.

  The code has been modified to use the same scheme as the writing of
  the other parts of the ppu, i.e. change_endian filed has been
  added also to tscannerfile class of scanner unit.
  This field is then used to swap values that required endianess
  conversion.

  * scanner.pas: change_endian filed added to tscannerfile class.
    The value of this field is set as the same field in tentryfile class of entfile unit.
    Token read and write methods converted to use change_endian field.

  * ppu.pas: Increase CurrentPPILongVersion

  * utils/ppuutils/ppudump.pp: Remove unneeded FPC_BIG_ENDIAN code
    which was needed because tokens were previously written using a
    different rule.




------------------------------------------------------------------------
--- Merging r42527 into '.':
C    compiler/ppu.pas
U    compiler/scanner.pas
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42527 into '.':
 G   .
Summary of conflicts:
  Text conflicts: 1
------------------------------------------------------------------------
r42528 | pierre | 2019-07-29 11:54:27 +0000 (Mon, 29 Jul 2019) | 1 line
Changed paths:
   M /trunk/compiler/scanner.pas

Try to fix bug introduced in previous commit #42527, hopefully fixing bug report 35902
------------------------------------------------------------------------

--- Merging r42528 into '.':
G    compiler/scanner.pas
--- Recording mergeinfo for merge of r42528 into '.':
 G   .------------------------------------------------------------------------
r42530 | pierre | 2019-07-29 16:40:58 +0000 (Mon, 29 Jul 2019) | 8 lines

   Try to fix ppudump for generic/inline.

   * entfile.pas: Differenciate ibsymtableoptions and ibrecsymtableoptions.
   * ppu.pas: Increase ppu unit CurrentPPULongVersion value.
   * utils/ppuutils/ppudump.pp: Add current_symtable_options variable.
     Change readsymtableoptions from procedure to function returning
     the new tsymtableoptions.

------------------------------------------------------------------------
--- Merging r42530 into '.':
G    compiler/entfile.pas
G    compiler/ppu.pas
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42530 into '.':
 G   .
------------------------------------------------------------------------
r42583 | pierre | 2019-08-05 09:15:12 +0000 (Mon, 05 Aug 2019) | 1 line

 Reorganize token buffer output to be able to use it for generics and inlined functions
------------------------------------------------------------------------
--- Merging r42583 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42583 into '.':
 G   .
------------------------------------------------------------------------
r42591 | pierre | 2019-08-06 06:32:52 +0000 (Tue, 06 Aug 2019) | 1 line

 Add mode and optimizer switches names, and check that no unknown switch is set
------------------------------------------------------------------------
--- Merging r42591 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42591 into '.':
 G   .
------------------------------------------------------------------------
r42596 | pierre | 2019-08-06 21:32:51 +0000 (Tue, 06 Aug 2019) | 1 line

 Fix gettokenbufshortint, as shortint is one byte long, not two
------------------------------------------------------------------------
--- Merging r42596 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42596 into '.':
 G   .
------------------------------------------------------------------------
r42609 | pierre | 2019-08-09 09:29:50 +0000 (Fri, 09 Aug 2019) | 1 line

 Correct size of asizeint, which is still 4-byte long even when CpuAddrBitSize is 16 as for avr and i8086
------------------------------------------------------------------------
--- Merging r42609 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42609 into '.':
 G   .
------------------------------------------------------------------------
r42670 | pierre | 2019-08-13 06:20:23 +0000 (Tue, 13 Aug 2019) | 1 line

 Reduce cpu-os dependency on real constant printout by using system.str
------------------------------------------------------------------------
--- Merging r42670 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42670 into '.':
 G   .
------------------------------------------------------------------------
r42906 | pierre | 2019-09-02 16:00:15 +0000 (Mon, 02 Sep 2019) | 1 line

 Fix problems with big endian systems without 80-bit floating point support
------------------------------------------------------------------------
--- Merging r42906 into '.':
G    compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42906 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43387 -
2019-11-04 08:50:42 +00:00
marco
cf2b4ee4f7 # revisions: 43198,43199,43201,43202,43204,43206,43207,43209,43210,43212,43213,43214,43215,43216,43219,43220,43221,43222,43223,43224,43225,43228,43229,43285,43286,43287,43288,43295,43296,43297,43303,43304,43310,43316,43317,43318,43320,43321,43322,43323,43325,43326,43329,43330,43331,43332,43333
git-svn-id: branches/fixes_3_2@43380 -
2019-11-03 14:20:49 +00:00
marco
95202dc8c4 # revisions: 42759,42769,42770,42771,42811,42818,42819,42824,42826,42827,42828,42830,42866,42869,42870,42874,42877,42878,42880,42881,42889,42890,42893,42894,42895,42896,42918,42948,42950,42951,42952,42953,42954,43020,43021,43031,43032,43049,43050,43051,43052,43053,43056,43057,43077,43078,43079,43084,43090,43099,43101,43145,43146,43147,43148,43149,43150,43151,43159,43160,43161,43164,43166,43168
git-svn-id: branches/fixes_3_2@43379 -
2019-11-03 14:13:54 +00:00
marco
4e1f4bf7a1 # revisions: 42502,42503,42504,42505,42506,42517,42518,42523,42524,42529,42532,42534,42544,42576,42577,42578,42592,42598,42599,42602,42608,42623,42624,42640,42644,42663,42664,42669,42678,42680,42688,42689,42690,42702,42703,42704,42712,42714,42715,42716,42721,42735,42736,,42502,42503,42504,42505,42506,42517,42518,42523,42524,42529,42532,42534,42544
git-svn-id: branches/fixes_3_2@43378 -
2019-11-03 14:10:42 +00:00
marco
46f3f08f6a # revisions: 41903,42177,42217,42218,42227,42251,42252,42258,42287,42288,42289,42290,42291,42292,42293,42310,42347,42348,42355,42445,42450,42451,42453,42454,42462,42465,42466,42468,42472,42473,42474,42475
git-svn-id: branches/fixes_3_2@43377 -
2019-11-03 14:00:03 +00:00
florian
b6e7ebdd3c -- Zusammenführen von r42272 in ».«:
U    compiler/defutil.pas
A    tests/webtbf/tw35671.pp
-- Aufzeichnung der Informationen für Zusammenführung von r42272 in ».«:
 U   .
-- Zusammenführen von r42274 in ».«:
U    compiler/cgbase.pas
-- Aufzeichnung der Informationen für Zusammenführung von r42274 in ».«:
 G   .
-- Zusammenführen von r42275 in ».«:
U    compiler/defcmp.pas
C    compiler/defutil.pas
U    compiler/ncnv.pas
U    compiler/ncon.pas
U    compiler/ngtcon.pas
U    compiler/ninl.pas
U    compiler/pstatmnt.pas
A    tests/webtbf/tw35753.pp
-- Aufzeichnung der Informationen für Zusammenführung von r42275 in ».«:
 G   .

git-svn-id: branches/fixes_3_2@43367 -
2019-11-02 18:07:58 +00:00
pierre
baa1603371 ------------------------------------------------------------------------
r42084 | pierre | 2019-05-16 12:17:32 +0000 (Thu, 16 May 2019) | 1 line

Fix compilation of compiler with -dPREPROCWRITE
------------------------------------------------------------------------
--- Merging r42084 into '.':
U    compiler/parser.pas
U    compiler/scanner.pas
--- Recording mergeinfo for merge of r42084 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43340 -
2019-10-31 08:54:15 +00:00
michael
118dcac881 * Merging revisions r42982 from trunk:
------------------------------------------------------------------------
    r42982 | michael | 2019-09-13 18:22:14 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Fix uninitialized var warning
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43271 -
2019-10-20 08:12:44 +00:00
michael
3fed351374 * Merging revisions r42899 from trunk:
------------------------------------------------------------------------
    r42899 | michael | 2019-09-02 09:22:01 +0200 (Mon, 02 Sep 2019) | 1 line
    
    * Fix some warnings/hints
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43270 -
2019-10-20 08:11:43 +00:00
michael
af8e4a77bd * Merging revisions r42884 from trunk:
------------------------------------------------------------------------
    r42884 | michael | 2019-08-31 15:48:00 +0200 (Sat, 31 Aug 2019) | 1 line
    
    * Speed rework, second iteration
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43269 -
2019-10-20 08:07:35 +00:00
michael
8afba43447 * Merging revisions r42270 from trunk:
------------------------------------------------------------------------
    r42270 | michael | 2019-06-22 16:01:06 +0200 (Sat, 22 Jun 2019) | 1 line
    
    * Fix parsing of command-line in ParseSource
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43268 -
2019-10-20 08:06:38 +00:00
michael
cd1a714336 * Merging revisions 43227 from trunk:
------------------------------------------------------------------------
    r43227 | michael | 2019-10-19 15:09:04 +0200 (Sat, 19 Oct 2019) | 1 line
    
    Search for .inc .pp .pas if an include file name has no extension
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43263 -
2019-10-19 14:56:52 +00:00
michael
db1eb537c9 * Merging revisions 43138 from trunk:
------------------------------------------------------------------------
    r43138 | michael | 2019-10-06 10:04:10 +0200 (Sun, 06 Oct 2019) | 1 line
    
    * Fix bug ID #36136, wrong reference count caused by missing const in param 
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43262 -
2019-10-19 14:56:14 +00:00
michael
3cbce0f7de * Merging revisions 43060,43061,43063,43064,43065,43066,43080,43096,43100,43104 from trunk:
------------------------------------------------------------------------
    r43060 | michael | 2019-09-23 17:14:35 +0200 (Mon, 23 Sep 2019) | 1 line
    
    * Fix appending path info and setting headers
    ------------------------------------------------------------------------
    r43061 | michael | 2019-09-23 17:19:25 +0200 (Mon, 23 Sep 2019) | 1 line
    
    * Use AppendPathInfo
    ------------------------------------------------------------------------
    r43063 | michael | 2019-09-25 16:06:28 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Add (cust)microhttpapp, high-concurrency standalone server
    ------------------------------------------------------------------------
    r43064 | michael | 2019-09-25 17:38:20 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Improve header & get variable fetching
    ------------------------------------------------------------------------
    r43065 | michael | 2019-09-25 17:40:19 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * remove forced debug flag
    ------------------------------------------------------------------------
    r43066 | michael | 2019-09-25 17:49:28 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Construct query string, needed in proxy
    ------------------------------------------------------------------------
    r43080 | michael | 2019-09-26 15:29:26 +0200 (Thu, 26 Sep 2019) | 1 line
    
    * Set namevalueseparator for headers
    ------------------------------------------------------------------------
    r43096 | michael | 2019-09-29 23:42:53 +0200 (Sun, 29 Sep 2019) | 1 line
    
    * Specify dependency on libmicrohttpd
    ------------------------------------------------------------------------
    r43100 | karoly | 2019-09-30 15:01:22 +0200 (Mon, 30 Sep 2019) | 1 line
    
    fcl-web: re-enabled platforms which were disabled in r43096
    ------------------------------------------------------------------------
    r43104 | pierre | 2019-10-01 21:21:30 +0200 (Tue, 01 Oct 2019) | 1 line
    
     Use same list of supported OSes for libmicrohttpd package in libmicrohttpd and fcl-web, and adapt packages/fpmake_proc.inc
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43261 -
2019-10-19 14:50:08 +00:00
michael
ee93aa0798 * Merging revisions 43060,43061,43063,43064,43065,43066,43080,43081 from trunk:
------------------------------------------------------------------------
    r43060 | michael | 2019-09-23 17:14:35 +0200 (Mon, 23 Sep 2019) | 1 line
    
    * Fix appending path info and setting headers
    ------------------------------------------------------------------------
    r43061 | michael | 2019-09-23 17:19:25 +0200 (Mon, 23 Sep 2019) | 1 line
    
    * Use AppendPathInfo
    ------------------------------------------------------------------------
    r43063 | michael | 2019-09-25 16:06:28 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Add (cust)microhttpapp, high-concurrency standalone server
    ------------------------------------------------------------------------
    r43064 | michael | 2019-09-25 17:38:20 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Improve header & get variable fetching
    ------------------------------------------------------------------------
    r43065 | michael | 2019-09-25 17:40:19 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * remove forced debug flag
    ------------------------------------------------------------------------
    r43066 | michael | 2019-09-25 17:49:28 +0200 (Wed, 25 Sep 2019) | 1 line
    
    * Construct query string, needed in proxy
    ------------------------------------------------------------------------
    r43080 | michael | 2019-09-26 15:29:26 +0200 (Thu, 26 Sep 2019) | 1 line
    
    * Set namevalueseparator for headers
    ------------------------------------------------------------------------
    r43081 | michael | 2019-09-26 15:54:23 +0200 (Thu, 26 Sep 2019) | 1 line
    
    * Allow max-age for cache control
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43260 -
2019-10-19 14:49:37 +00:00
michael
b2fb59716e * Merging revisions 42993 from trunk:
------------------------------------------------------------------------
    r42993 | michael | 2019-09-14 15:05:03 +0200 (Sat, 14 Sep 2019) | 1 line
    
    * Fix bug ID #36075
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43259 -
2019-10-19 14:48:24 +00:00
michael
9d1975338a * Merging revisions 42981,42983,42984,42985 from trunk:
------------------------------------------------------------------------
    r42981 | michael | 2019-09-13 18:21:44 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Fix warnings about method visibilty
    ------------------------------------------------------------------------
    r42983 | michael | 2019-09-13 18:22:35 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Fix uninitialized result warning
    ------------------------------------------------------------------------
    r42984 | michael | 2019-09-13 18:28:48 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Add fpwebproxy
    ------------------------------------------------------------------------
    r42985 | michael | 2019-09-13 18:29:38 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Add .ini config file possibility, plus simple proxy server config
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43258 -
2019-10-19 14:47:47 +00:00
michael
916e4ca83b * Merging revisions 42980 from trunk:
------------------------------------------------------------------------
    r42980 | michael | 2019-09-13 18:21:19 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Remove unused variable name
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43257 -
2019-10-19 14:47:08 +00:00
michael
b1347be8f7 * Merging revisions 42979 from trunk:
------------------------------------------------------------------------
    r42979 | michael | 2019-09-13 18:20:59 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Fix uninitialized var warning
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43256 -
2019-10-19 14:46:59 +00:00
michael
9acb68ee32 * Merging revisions 42978 from trunk:
------------------------------------------------------------------------
    r42978 | michael | 2019-09-13 18:20:39 +0200 (Fri, 13 Sep 2019) | 1 line
    
    * Fix some deprecated warnings
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43255 -
2019-10-19 14:46:50 +00:00
michael
b4ac2e2027 * Merging revisions 42904 from trunk:
------------------------------------------------------------------------
    r42904 | michael | 2019-09-02 14:36:37 +0200 (Mon, 02 Sep 2019) | 1 line
    
    * Additional case where whitespace can mess up (bug ID 36037)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43254 -
2019-10-19 14:46:44 +00:00
michael
d785134a57 * Merging revisions 42888 from trunk:
------------------------------------------------------------------------
    r42888 | mattias | 2019-09-01 15:39:23 +0200 (Sun, 01 Sep 2019) | 1 line
    
    fcl-json: fixed compile with fpc 3.0.4
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43253 -
2019-10-19 14:46:35 +00:00