paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-24 22:51:38 +02: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', '.idata$2','.idata$4','.idata$5','.idata$6','.idata$7','.edata',
'.eh_frame', '.eh_frame',
'.debug_frame','.debug_info','.debug_line','.debug_abbrev', '.debug_frame','.debug_info','.debug_line','.debug_abbrev',
'fpc', '.fpc',
'.toc', '.toc',
'.init' '.init'
); );
@ -598,7 +598,7 @@ implementation
'.idata$2','.idata$4','.idata$5','.idata$6','.idata$7','.edata', '.idata$2','.idata$4','.idata$5','.idata$6','.idata$7','.edata',
'.eh_frame', '.eh_frame',
'.debug_frame','.debug_info','.debug_line','.debug_abbrev', '.debug_frame','.debug_info','.debug_line','.debug_abbrev',
'fpc', '.fpc',
'.toc', '.toc',
'.init' '.init'
); );
@ -614,14 +614,17 @@ implementation
if (use_smartlink_section and if (use_smartlink_section and
(aname<>'')) or (atype=sec_fpc) then (aname<>'')) or (atype=sec_fpc) then
begin begin
case aorder of if (atype=sec_fpc) and (aname='resptrs') then
secorder_begin : sep:='.'
sep:='.b_'; else
secorder_end : case aorder of
sep:='.z_'; secorder_begin :
else sep:='.b_';
sep:='.n_'; secorder_end :
end; sep:='.z_';
else
sep:='.n_';
end;
result:=secname+sep+aname result:=secname+sep+aname
end end
else else

4
compiler/systems/t_linux.pas
View File

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