paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-04 07:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed resources support on Linux when internal assembler is used.

Browse Source 
* Enabled multiple resources support on Linux.

git-svn-id: trunk@7883 -
This commit is contained in:
yury 2007-06-30 23:01:22 +00:00
parent a7a8bd88e5
commit b5e38fd2c8
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/ogelf.pas
View File

@ -581,7 +581,7 @@ implementation
'.idata$2','.idata$4','.idata$5','.idata$6','.idata$7','.edata',
'.eh_frame',
'.debug_frame','.debug_info','.debug_line','.debug_abbrev',
'fpc',
'.fpc',
'.toc',
'.init'
);
@ -598,7 +598,7 @@ implementation
'.idata$2','.idata$4','.idata$5','.idata$6','.idata$7','.edata',
'.eh_frame',
'.debug_frame','.debug_info','.debug_line','.debug_abbrev',
'fpc',
'.fpc',
'.toc',
'.init'
);
@ -614,14 +614,17 @@ implementation
if (use_smartlink_section and
(aname<>'')) or (atype=sec_fpc) then
begin
case aorder of
secorder_begin :
sep:='.b_';
secorder_end :
sep:='.z_';
else
sep:='.n_';
end;
if (atype=sec_fpc) and (aname='resptrs') then
sep:='.'
else
case aorder of
secorder_begin :
sep:='.b_';
secorder_end :
sep:='.z_';
else
sep:='.n_';
end;
result:=secname+sep+aname
end
else

4
compiler/systems/t_linux.pas
View File

@ -927,7 +927,7 @@ initialization
RegisterImport(system_i386_linux,timportliblinux);
RegisterExport(system_i386_linux,texportliblinux);
RegisterTarget(system_i386_linux_info);
RegisterRes(res_elf32_info,TResourceFile);
RegisterRes(res_elf32_info,TWinLikeResourceFile);
RegisterExternalLinker(system_x86_6432_linux_info,TLinkerLinux);
RegisterImport(system_x86_6432_linux,timportliblinux);
@ -963,7 +963,7 @@ initialization
RegisterImport(system_x86_64_linux,timportliblinux);
RegisterExport(system_x86_64_linux,texportliblinux);
RegisterTarget(system_x86_64_linux_info);
RegisterRes(res_elf64_info,TResourceFile);
RegisterRes(res_elf64_info,TWinLikeResourceFile);
{$endif x86_64}
{$ifdef SPARC}
RegisterExternalLinker(system_sparc_linux_info,TLinkerLinux);