paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 00:29:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r31003 into '.':

Browse Source 
U    compiler/systems/i_morph.pas
--- Recording mergeinfo for merge of r31003 into '.':
 U   .
--- Merging r31004 into '.':
U    compiler/systems/t_morph.pas
--- Recording mergeinfo for merge of r31004 into '.':
 G   .

# revisions: 31003,31004

git-svn-id: branches/fixes_3_0@35302 -
This commit is contained in:
marco 2017-01-14 15:54:46 +00:00
parent 0cbab2e3e3
commit 7a574dd899
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/systems/i_morph.pas
View File

@ -66,7 +66,7 @@ unit i_morph;
link : ld_none;
linkextern : ld_morphos;
ar : ar_gnu_ar;
res : res_none;
res : res_elf;
dbg : dbg_stabs;
script : script_amiga;
endian : endian_big;

3
compiler/systems/t_morph.pas
View File

@ -31,7 +31,7 @@ implementation
uses
SysUtils,
cutils,cfileutl,cclasses,
cutils,cfileutl,cclasses,rescmn,comprsrc,
globtype,globals,systems,verbose,script,fmodule,i_morph,link;
type
@ -265,4 +265,5 @@ end;
initialization
RegisterLinker(ld_morphos,TLinkerMorphOS);
RegisterTarget(system_powerpc_morphos_info);
RegisterRes(res_elf_info, TWinLikeResourceFile);
end.