U compiler/scandir.pas
A tests/webtbs/tw37095.pp
A tests/webtbs/tw37095d
A tests/webtbs/tw37095d/uw37095.pp
G .
--- Recording mergeinfo for merge of r45412 into '.':
G .
git-svn-id: tags/release_3_2_0@45413 -
U compiler/scandir.pas
A tests/webtbs/tw37095.pp
A tests/webtbs/tw37095d
A tests/webtbs/tw37095d/uw37095.pp
--- Recording mergeinfo for merge of r45410 into '.':
U .
# revisions: 45410
r45410 | jonas | 2020-05-17 23:27:00 +0200 (Sun, 17 May 2020) | 2 lines
Changed paths:
M /trunk/compiler/scandir.pas
A /trunk/tests/webtbs/tw37095.pp
A /trunk/tests/webtbs/tw37095d
A /trunk/tests/webtbs/tw37095d/uw37095.pp
* fixed unitdir directive for relative paths in case the current module's
path is not set, broken by r43312 (mantis #37095)
git-svn-id: branches/fixes_3_2@45412 -
handle LOC_(C)SUBSETREF/REG. The optimisation itself has been fixed
in trunk (r45301-r45305), the changes are too invasive to merge to
fixes_3_2 at this time (mantis #37018)
git-svn-id: branches/fixes_3_2@45317 -
U compiler/powerpc64/cpupara.pas
A tests/webtbs/tw36934.pp
--- Recording mergeinfo for merge of r45199 into '.':
U .
git-svn-id: branches/fixes_3_2@45235 -
* fix WinAPI directive: the purpose is to present the OS' default calling convention which for Windows means stdcall (at least on those platforms that support stdcall) on other platforms it is cdecl (for now)
........
git-svn-id: branches/fixes_3_2@45070 -
------------------------------------------------------------------------
r44108 | pierre | 2020-02-03 22:35:25 +0000 (Mon, 03 Feb 2020) | 1 line
Fix invalid typecast revealed by -CriotR option
------------------------------------------------------------------------
--- Merging r44108 into '.':
U compiler/ncnv.pas
--- Recording mergeinfo for merge of r44108 into '.':
U .
git-svn-id: branches/fixes_3_2@44680 -
U compiler/ncnv.pas
--- Recording mergeinfo for merge of r44055 into '.':
U .
--- Merging r44098 into '.':
G compiler/ncnv.pas
--- Recording mergeinfo for merge of r44098 into '.':
G .
--- Merging r44099 into '.':
G compiler/ncnv.pas
--- Recording mergeinfo for merge of r44099 into '.':
G .
# revisions: 44055,44098,44099
git-svn-id: branches/fixes_3_2@44223 -
U compiler/utils/samplecfg
U utils/fpcmkcfg/fppkg.cfg
U utils/fpcmkcfg/fppkg.inc
--- Recording mergeinfo for merge of r41184 into '.':
U .
git-svn-id: branches/fixes_3_2@44213 -
* fix for Mantis #36631: it's an error if a POINT after an array is not followed by an identifier
+ added tests
........
git-svn-id: branches/fixes_3_2@44143 -
* have the module keep track whether it was loaded from a PPU with a different endianess than the current host system
........
* for deciding whether to swap a generic's buffer use the module's flag instead of the def's
........
- remove generic_buf_needs_swapping again as that is now handled with tmodule.change_endian of the generic's module
........
git-svn-id: branches/fixes_3_2@44080 -
------------------------------------------------------------------------
r44056 | pierre | 2020-01-28 23:43:56 +0000 (Tue, 28 Jan 2020) | 1 line
Hopefully fix problems related to loading of ppufile generated with other endianess for generics
------------------------------------------------------------------------
--- Merging r44056 into '.':
U compiler/pdecl.pas
U compiler/pgenutil.pas
U compiler/scanner.pas
U compiler/symdef.pas
--- Recording mergeinfo for merge of r44056 into '.':
U .
git-svn-id: branches/fixes_3_2@44060 -
* android: Changed additions to the linker script to prevent misalignment of the .data section. It fixes crash when linking using recent versions of LD where the "relro" option is default. Issue #35641.
* android: Always pass "-z relro" to the linker.
........
git-svn-id: branches/fixes_3_2@44044 -
U packages/univint/fpmake.pp
...
--- Recording mergeinfo for merge of r42499 into '.':
U .
--- Merging r42500 into '.':
U packages/cocoaint/fpmake.pp
...
--- Recording mergeinfo for merge of r42500 into '.':
G .
--- Merging r42548 into '.':
G packages/univint/src/AUComponent.pas
G packages/univint/src/AudioUnitProperties.pas
--- Recording mergeinfo for merge of r42548 into '.':
G .
--- Merging r43684 into '.':
U compiler/msg/errore.msg
...
--- Recording mergeinfo for merge of r43684 into '.':
G .
--- Merging r43687 into '.':
G packages/univint/src/AudioComponents.pas
U packages/univint/src/AudioServices.pas
--- Recording mergeinfo for merge of r43687 into '.':
G .
git-svn-id: branches/fixes_3_2@44035 -
U compiler/ninl.pas
--- Recording mergeinfo for merge of r40180 into '.':
U .
--- Merging r40216 into '.':
U compiler/htypechk.pas
G compiler/ninl.pas
U tests/tbf/tb0258.pp
A tests/tbf/tb0259.pp
A tests/tbf/tb0260.pp
A tests/tbs/tb0653.pp
--- Recording mergeinfo for merge of r40216 into '.':
G .
--- Merging r40217 into '.':
U compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r40217 into '.':
G .
--- Merging r40218 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r40218 into '.':
G .
git-svn-id: branches/fixes_3_2@44000 -
U compiler/i386/n386flw.pas
--- Recording mergeinfo for merge of r42115 into '.':
U .
--- Merging r43830 into '.':
U compiler/i386/cpunode.pas
U compiler/options.pas
--- Recording mergeinfo for merge of r43830 into '.':
G .
git-svn-id: branches/fixes_3_2@43978 -
U compiler/systems/t_bsd.pas
U utils/fppkg/fpmake.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43696 in ».«:
U .
git-svn-id: branches/fixes_3_2@43708 -
U compiler/i386/cpupi.pas
U compiler/ncgcal.pas
U compiler/ncgutil.pas
U compiler/systems/i_bsd.pas
U compiler/systems/i_linux.pas
U compiler/systems.inc
git-svn-id: branches/fixes_3_2@43683 -
------------------------------------------------------------------------
r43604 | pierre | 2019-11-28 14:50:55 +0000 (Thu, 28 Nov 2019) | 1 line
Set default stack size for i8086-embedded target: 16384 for far data model, and 2048 for other memory models
------------------------------------------------------------------------
--- Merging r43604 into '.':
U compiler/parser.pas
--- Recording mergeinfo for merge of r43604 into '.':
U .
git-svn-id: branches/fixes_3_2@43667 -
------------------------------------------------------------------------
r43634 | pierre | 2019-12-03 16:05:30 +0000 (Tue, 03 Dec 2019) | 1 line
Use PInt64(@value_currency)^ construct to avoid internal error when starting from 3.0.4 ppcarm compiler
------------------------------------------------------------------------
--- Merging r43634 into '.':
U compiler/nadd.pas
--- Recording mergeinfo for merge of r43634 into '.':
U .
------------------------------------------------------------------------
r43635 | florian | 2019-12-03 19:31:50 +0000 (Tue, 03 Dec 2019) | 1 line
* more currency fixes, should resolve#36176
------------------------------------------------------------------------
--- Merging r43635 into '.':
G compiler/nadd.pas
U tests/test/tcurrency1.pp
--- Recording mergeinfo for merge of r43635 into '.':
G .
git-svn-id: branches/fixes_3_2@43661 -
------------------------------------------------------------------------
--- Merging r43631 into '.':
U compiler/nadd.pas
--- Recording mergeinfo for merge of r43631 into '.':
U .
git-svn-id: branches/fixes_3_2@43633 -
U compiler/nadd.pas
U compiler/ncnv.pas
U compiler/ncon.pas
U compiler/node.pas
A tests/test/tcurrency1.pp
A tests/webtbs/tw33963.pp
A tests/webtbs/tw36179.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43620 in ».«:
U .
git-svn-id: branches/fixes_3_2@43621 -
------------------------------------------------------------------------
r43598 | pierre | 2019-11-27 22:15:23 +0000 (Wed, 27 Nov 2019) | 1 line
Use defined(aarch64) instead of defined(cpuaarch64) for FPC_HAS_INTERNAL_ABS_INT64
------------------------------------------------------------------------
--- Merging r43598 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r43598 into '.':
U .
git-svn-id: branches/fixes_3_2@43606 -
------------------------------------------------------------------------
r43165 | pierre | 2019-10-10 21:57:07 +0000 (Thu, 10 Oct 2019) | 1 line
Fix m68k errors with -CriotR option
------------------------------------------------------------------------
--- Merging r43165 into '.':
U compiler/m68k/cgcpu.pas
U compiler/m68k/ra68kmot.pas
--- Recording mergeinfo for merge of r43165 into '.':
U .
git-svn-id: branches/fixes_3_2@43516 -
------------------------------------------------------------------------
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 -
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 -
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 -
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 -
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 -
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 -
