Hello,

Is it possible to merge rev. 16418 from trunk to FPC 2.4.4?

http://svn.freepascal.org/cgi-bin/viewvc.cgi?view=rev&revision=16418

In our previous episode, cobines said:

Is it possible to merge rev. 16418 from trunk to FPC 2.4.4? http://svn.freepascal.org/cgi-bin/viewvc.cgi?view=rev&revision=16418

I've mostly avoided the subject of shared libs, so sb else will have to judge that.

However it can't be merged as such:

fixes24]$ fpcmerge 16418
Merging 16418 from fpc/trunk ( /home/marcov/fpc ) to /home/marcov/fixes24 ( /home/marcov/fixes24 )
--- Merging r16418 into '.':
U rtl/linux/powerpc64/dllprt0.as
U rtl/linux/i386/si_dll.inc
C rtl/linux/x86_64/dllprt0.as
U compiler/systems/t_linux.pas
Summary of conflicts:
Text conflicts: 1
fixes24]$

Probably 14184 (also by Jonas)

And only after RC1, RC1's sources are being uploaded.

cobines wrote

Is it possible to merge rev. 16418 from trunk to FPC 2.4.4?

No, see http://bugs.freepascal.org/view.php?id=18831

Jonas

Is there a workaround? Runtime switching of MSEgui language modules is not possible because of the problem.

Martin

I don't think so, since it requires changesin the assembler code of the startup files.

Jonas

2011/3/4 Jonas Maebe :

I see, OK.