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 -
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 -
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 -
------------------------------------------------------------------------
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 -
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 -
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 -
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 -
--- Merging r42815 through r42817 into '.':
U tests/test/tobjc34.pp
U tests/test/tobjc36.pp
U tests/test/tobjcl2.pp
A tests/test/units/cocoaall
A tests/test/units/cocoaall/tw35994.pp
U compiler/defcmp.pas
U compiler/ncal.pas
C compiler/pdecl.pas
C compiler/symconst.pas
C compiler/utils/ppuutils/ppudump.pp
U compiler/symtable.pas
--- Recording mergeinfo for merge of r42815 through r42817 into '.':
U .
--- Merging r42857 into '.':
G compiler/symtable.pas
--- Recording mergeinfo for merge of r42857 into '.':
G .
git-svn-id: branches/fixes_3_2@42883 -
U compiler/arm/narmmat.pas
--- Recording mergeinfo for merge of r42860 into '.':
U .
------------------------------------------------------------------------
r42860 | pierre | 2019-08-28 07:38:35 +0000 (Wed, 28 Aug 2019) | 1 line
Fix code generated in tarmnotnode.second_boolean
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@42879 -
* fixed an i8086 inline assembler bug, where 'call word ptr [label]' (an
indirect call) was assembled as 'call near label' (direct call) instead of
'call near [label]' and 'call dword ptr [label]' was assembled as
'call near label' instead of 'call far [label]'
........
Add {$goto on} if FPC macro is defined
........
git-svn-id: branches/fixes_3_2@42215 -
r40756 | karoly | 2019-01-04 03:00:03 +0000 (Fri, 04 Jan 2019) | 1 line
haiku: linker support code for internal sysinit and make the x86_64 port use it
------------------------------------------------------------------------
--- Merging r40756 into '.':
G compiler/systems/t_haiku.pas
U compiler/systems.pas
--- Recording mergeinfo for merge of r40756 into '.':
G .
------------------------------------------------------------------------
------------------------------------------------------------------------
r40791 | karoly | 2019-01-07 12:58:02 +0000 (Mon, 07 Jan 2019) | 1 line
haiku: move i386 also to internal sysinit
------------------------------------------------------------------------
U compiler/systems.pas
U rtl/haiku/system.pp
--- Recording mergeinfo for merge of r40791 into '.':
U .
git-svn-id: branches/fixes_3_2@42136 -
------------------------------------------------------------------------
r40753 | karoly | 2019-01-04 02:16:24 +0000 (Fri, 04 Jan 2019) | 1 line
haiku-x86_64: add target to the compiler and ppudump, enable it in fpmake and fpcmake
------------------------------------------------------------------------
--- Merging r40753 into '.':
U compiler/options.pas
U compiler/systems/i_haiku.pas
U compiler/systems/t_haiku.pas
U compiler/systems.inc
U compiler/utils/ppuutils/ppudump.pp
U compiler/x86/agx86att.pas
U compiler/x86_64/cpuelf.pas
U compiler/x86_64/cputarg.pas
U utils/fpcm/fpcmmain.pp
--- Recording mergeinfo for merge of r40753 into '.':
U .
------------------------------------------------------------------------
r40756 | karoly | 2019-01-04 03:00:03 +0000 (Fri, 04 Jan 2019) | 1 line
haiku: linker support code for internal sysinit and make the x86_64 port use it
------------------------------------------------------------------------
--- Merging r40756 into '.':
G compiler/systems/t_haiku.pas
U compiler/systems.pas
--- Recording mergeinfo for merge of r40756 into '.':
G .
git-svn-id: branches/fixes_3_2@42133 -
C compiler/systems.pas
--- Recording mergeinfo for merge of r41709 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 41709
git-svn-id: branches/fixes_3_2@41989 -
U packages/opengl/src/gl.pp
U packages/opengl/src/glu.pp
U packages/opengl/src/glut.pp
--- Recording mergeinfo for merge of r41646 into '.':
U .
--- Merging r41647 into '.':
G packages/opengl/src/gl.pp
G packages/opengl/src/glu.pp
G packages/opengl/src/glut.pp
--- Recording mergeinfo for merge of r41647 into '.':
G .
--- Merging r41675 into '.':
U compiler/systems/i_bsd.pas
--- Recording mergeinfo for merge of r41675 into '.':
G .
--- Merging r41695 into '.':
A rtl/openbsd/si_impl.inc
U rtl/openbsd/si_intf.inc
U rtl/openbsd/si_prc.pp
U rtl/openbsd/x86_64/si_prc.inc
--- Recording mergeinfo for merge of r41695 into '.':
G .
--- Merging r41696 into '.':
U compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41696 into '.':
G .
--- Merging r41697 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41697 into '.':
G .
--- Merging r41698 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41698 into '.':
G .
--- Merging r41699 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41699 into '.':
G .
--- Merging r41700 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41700 into '.':
G .
--- Merging r41701 into '.':
U rtl/openbsd/si_impl.inc
G rtl/openbsd/si_intf.inc
G rtl/openbsd/x86_64/si_prc.inc
--- Recording mergeinfo for merge of r41701 into '.':
G .
# revisions: 41646,41647,41675,41695,41696,41697,41698,41699,41700,41701
git-svn-id: branches/fixes_3_2@41985 -
U rtl/inc/objc.pp
--- Recording mergeinfo for merge of r41243 into '.':
U .
--- Merging r41335 into '.':
U compiler/arm/cgcpu.pas
U compiler/cgobj.pas
--- Recording mergeinfo for merge of r41335 into '.':
G .
--- Merging r41422 into '.':
U compiler/scanner.pas
--- Recording mergeinfo for merge of r41422 into '.':
G .
--- Merging r41474 into '.':
U compiler/pexpr.pas
A tests/webtbf/tw35149a.pp
A tests/webtbs/tw35149.pp
--- Recording mergeinfo for merge of r41474 into '.':
G .
--- Merging r41650 into '.':
U compiler/aarch64/racpugas.pas
--- Recording mergeinfo for merge of r41650 into '.':
G .
--- Merging r41651 into '.':
U tests/test/taarch64abi.pp
--- Recording mergeinfo for merge of r41651 into '.':
G .
--- Merging r41905 into '.':
U compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r41905 into '.':
G .
git-svn-id: branches/fixes_3_2@41943 -
U compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41637 into '.':
U .
--- Merging r41638 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41638 into '.':
G .
--- Merging r41639 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41639 into '.':
G .
--- Merging r41652 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41652 into '.':
G .
--- Merging r41668 into '.':
G compiler/systems/t_bsd.pas
--- Recording mergeinfo for merge of r41668 into '.':
G .
# revisions: 41637,41638,41639,41652,41668
r41637 | nickysn | 2019-03-08 16:59:00 +0100 (Fri, 08 Mar 2019) | 2 lines
Changed paths:
M /trunk/compiler/systems/t_bsd.pas
* Correct library search path for OpenBSD. Based on 1/3 of OpenBSD ports patch
patch-fpcsrc_compiler_systems_t_bsd_pas
r41638 | nickysn | 2019-03-08 17:01:30 +0100 (Fri, 08 Mar 2019) | 2 lines
Changed paths:
M /trunk/compiler/systems/t_bsd.pas
* always add -nopie to linker flags on OpenBSD. Based on 2/3 of OpenBSD ports
patch patch-fpcsrc_compiler_systems_t_bsd_pas
r41639 | nickysn | 2019-03-08 17:04:48 +0100 (Fri, 08 Mar 2019) | 2 lines
Changed paths:
M /trunk/compiler/systems/t_bsd.pas
* Do not link to /usr/libexec/ld.so as a shared library on OpenBSD. Based on 3/3
of OpenBSD ports patch patch-fpcsrc_compiler_systems_t_bsd_pas
r41652 | nickysn | 2019-03-09 17:11:52 +0100 (Sat, 09 Mar 2019) | 3 lines
Changed paths:
M /trunk/compiler/systems/t_bsd.pas
* link with -nopie on OpenBSD only if PIC code generation is disabled
r41668 | nickysn | 2019-03-10 16:56:09 +0100 (Sun, 10 Mar 2019) | 5 lines
Changed paths:
M /trunk/compiler/systems/t_bsd.pas
+ pass the -dynamic-linker option to the linker even when making a static binary
on OpenBSD, because that seems to be needed in order to produce a static
position independent executable in the correct format for that platform
git-svn-id: branches/fixes_3_2@41901 -
