--- Merging r31003 into '.':

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 -

compiler/systems/i_morph.pas

@@ -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;

compiler/systems/t_morph.pas

@@ -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.