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

+ Initial work to support versions of ELF dynamic symbols.

Browse Source 
git-svn-id: trunk@23170 -
This commit is contained in:
sergei 2012-12-18 08:25:57 +00:00
parent da67d3be15
commit 0196c62ee8
2 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
compiler/ogelf.pas
View File

@ -216,6 +216,11 @@ interface
dynsymtable: TElfSymtab;
interpobjsec: TObjSection;
FInterpreter: pshortstring;
verneedcount,
verdefcount: longword;
symversec,
verdefsec,
verneedsec,
dynamicsec,
hashobjsec: TElfObjSection;
neededlist: TFPHashList;
@ -2340,6 +2345,12 @@ implementation
Exclude(ipltrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(hashobjsec) then
Exclude(hashobjsec.ExeSection.SecOptions,oso_disabled);
if assigned(symversec) and (symversec.size<>0) then
Exclude(symversec.ExeSection.SecOptions,oso_disabled);
if assigned(verneedsec) and (verneedsec.size<>0) then
Exclude(verneedsec.ExeSection.SecOptions,oso_disabled);
if assigned(verdefsec) and (verdefsec.size<>0) then
Exclude(verneedsec.ExeSection.SecOptions,oso_disabled);
RemoveDisabledSections;
MapSectionsToSegments;
@ -2351,6 +2362,7 @@ implementation
procedure TElfExeOutput.MemPos_Start;
var
i,j: longint;
dynstrndx,dynsymndx: longword;
seg: TElfSegment;
exesec: TElfExeSection;
objsec: TObjSection;
@ -2377,19 +2389,27 @@ implementation
if dynamiclink then
begin
{ fixup sh_link/sh_info members of various dynamic sections }
TElfExeSection(hashobjsec.ExeSection).shlink:=TElfExeSection(dynsymtable.ExeSection).secshidx;
i:=TElfExeSection(dynsymtable.fstrsec.ExeSection).secshidx;
TElfExeSection(dynamicsec.ExeSection).shlink:=i;
TElfExeSection(dynsymtable.ExeSection).shlink:=i;
dynstrndx:=TElfExeSection(dynsymtable.fstrsec.ExeSection).secshidx;
dynsymndx:=TElfExeSection(dynsymtable.ExeSection).secshidx;
TElfExeSection(hashobjsec.ExeSection).shlink:=dynsymndx;
TElfExeSection(dynamicsec.ExeSection).shlink:=dynstrndx;
TElfExeSection(dynsymtable.ExeSection).shlink:=dynstrndx;
if assigned(pltrelocsec) then
begin
TElfExeSection(pltrelocsec.ExeSection).shlink:=TElfExeSection(dynsymtable.ExeSection).secshidx;
TElfExeSection(pltrelocsec.ExeSection).shlink:=dynsymndx;
TElfExeSection(pltrelocsec.ExeSection).shinfo:=TElfExeSection(pltobjsec.ExeSection).secshidx;
end;
if assigned(dynrelocsec) and assigned(dynrelocsec.ExeSection) then
TElfExeSection(dynrelocsec.ExeSection).shlink:=TElfExeSection(dynsymtable.ExeSection).secshidx;
TElfExeSection(dynrelocsec.ExeSection).shlink:=dynsymndx;
if symversec.size>0 then
TElfExeSection(symversec.ExeSection).shlink:=dynsymndx;
if verdefsec.size>0 then
TElfExeSection(verdefsec.ExeSection).shlink:=dynstrndx;
if verneedsec.size>0 then
TElfExeSection(verneedsec.ExeSection).shlink:=dynstrndx;
end
else if assigned(ipltrelocsec) then
TElfExeSection(ipltrelocsec.ExeSection).shinfo:=TElfExeSection(pltobjsec.ExeSection).secshidx;
@ -2621,6 +2641,16 @@ implementation
dynrelocsec.SecOptions:=[oso_keep];
dynreloclist:=TFPObjectList.Create(true);
symversec:=TElfObjSection.create_ext(internalObjData,'.gnu.version',
SHT_GNU_VERSYM,SHF_ALLOC,sizeof(word),sizeof(word));
symversec.SecOptions:=[oso_keep];
verdefsec:=TElfObjSection.create_ext(internalObjData,'.gnu.version_d',
SHT_GNU_VERDEF,SHF_ALLOC,sizeof(pint),0);
verdefsec.SecOptions:=[oso_keep];
verneedsec:=TElfObjSection.create_ext(internalObjData,'.gnu.version_r',
SHT_GNU_VERNEED,SHF_ALLOC,sizeof(pint),0);
verneedsec.SecOptions:=[oso_keep];
end;
@ -2808,6 +2838,20 @@ implementation
if (relative_reloc_count>0) then
writeDynTag(relcnttags[rela],relative_reloc_count);
end;
if (verdefcount>0) or (verneedcount>0) then
begin
if (verdefcount>0) then
begin
writeDynTag(DT_VERDEF,verdefsec);
writeDynTag(DT_VERDEFNUM,verdefcount);
end;
if (verneedcount>0) then
begin
writeDynTag(DT_VERNEED,verneedsec);
writeDynTag(DT_VERNEEDNUM,verneedcount);
end;
writeDynTag(DT_VERSYM,symversec);
end;
writeDynTag(DT_NULL,0);
end;

9
compiler/systems/t_linux.pas
View File

@ -1325,6 +1325,15 @@ begin
Concat('EXESECTION .dynstr');
Concat(' OBJSECTION .dynstr');
Concat('ENDEXESECTION');
Concat('EXESECTION .gnu.version');
Concat(' OBJSECTION .gnu.version');
Concat('ENDEXESECTION');
Concat('EXESECTION .gnu.version_d');
Concat(' OBJSECTION .gnu.version_d');
Concat('ENDEXESECTION');
Concat('EXESECTION .gnu.version_r');
Concat(' OBJSECTION .gnu.version_r');
Concat('ENDEXESECTION');
{$ifdef x86_64}
Concat('EXESECTION .rela.dyn');
Concat(' OBJSECTION .rela.dyn');