The merge of the two commits generate 3 conflicts, but those are easily solved. See attached patch.
Olivier, did you test the fixes_3_2 branch?
Do you think it is reasonable to enable x86_64-haiku target in that branch?
charlie, you wrote those patches, thus
it is probably best if you or Olivier decide:
Should I merge them?
Pierre
Le 26/05/2019 à 15:17, Pierre Muller a écrit :
Show quoted text 47 lines
Hi al,
almost every haiku RTL changes have been merged,
but there are also two compiler changes:
pas]$ svn log -v -c 40753 trunk/fpcsrc/
------------------------------------------------------------------------
r40753 | karoly | 2019-01-04 02:16:24 +0000 (Fri, 04 Jan 2019) | 1 line
Changed paths:
M /trunk/compiler/options.pas
M /trunk/compiler/systems/i_haiku.pas
M /trunk/compiler/systems/t_haiku.pas
M /trunk/compiler/systems.inc
M /trunk/compiler/utils/ppuutils/ppudump.pp
M /trunk/compiler/x86/agx86att.pas
M /trunk/compiler/x86_64/cpuelf.pas
M /trunk/compiler/x86_64/cputarg.pas
M /trunk/packages/fpmkunit/src/fpmkunit.pp
M /trunk/utils/fpcm/fpcmmain.pp
haiku-x86_64: add target to the compiler and ppudump, enable it in fpmake and fpcmake
------------------------------------------------------------------------
pas]$ svn log -v -c 40756 trunk/fpcsrc/
------------------------------------------------------------------------
r40756 | karoly | 2019-01-04 03:00:03 +0000 (Fri, 04 Jan 2019) | 1 line
Changed paths:
M /trunk/compiler/systems/t_haiku.pas
M /trunk/compiler/systems.pas
haiku: linker support code for internal sysinit and make the x86_64 port use it
------------------------------------------------------------------------
Shoudln't these two be also merged to fixes?
Pierre
<https://svn.freepascal.org/cgi-bin/viewvc.cgi?root=fpc&view=rev&rev=42117>
_______________________________________________
core site list
https://idefix.freepascal.org/cgi-bin/mailman/listinfo/core