paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-16 01:50:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ELF linker: moved some code (which must be executed only once when linking with separate debug file) from MemPos_Start into AfterUnusedSectionRemoval, this removes some checks and simplifies things.

Browse Source 
* Simplified .shstrtab handling between passes by using oso_debug_copy attribute on it.
- Don't recreate segment mapping: only debug sections are removed between passes, and they are never part of any segment.

git-svn-id: trunk@22914 -
This commit is contained in:
sergei 2012-11-02 06:41:03 +00:00
parent 9d4d7d748c
commit 4410fe86d2
1 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
compiler/ogelf.pas
View File

@ -176,7 +176,7 @@ interface
phdrseg: TElfSegment;
shstrtabsect: TElfObjSection;
symtab: TElfSymtab;
shoffset: longint;
shoffset: aword;
gotwritten: boolean;
{ dynamic linking }
dynamiclink: boolean;
@ -2511,6 +2511,40 @@ implementation
if dynamiclink then
WriteDynamicSymbolsHash;
{ Create .shstrtab section, which is needed in both exe and .dbg files }
shstrtabsect:=TElfObjSection.Create_ext(internalObjData,'.shstrtab',SHT_STRTAB,0,1,0);
shstrtabsect.SecOptions:=[oso_debug_copy];
AttachSection(shstrtabsect);
{ Create the static symtable (.symtab and .strtab) }
if (cs_link_separate_dbg_file in current_settings.globalswitches) or
not(cs_link_strip in current_settings.globalswitches) then
begin
symtab:=TElfSymtab.Create(internalObjData,esk_exe);
symtab.SecOptions:=[oso_debug];
symtab.fstrsec.SecOptions:=[oso_debug];
AttachSection(symtab);
AttachSection(symtab.fstrsec);
end;
{ Re-enable sections which end up to contain some data
(.got, .rel[a].dyn, .rel[a].plt (includes .rel[a].iplt) and .hash }
if gotobjsec.size<>0 then
Exclude(gotobjsec.ExeSection.SecOptions,oso_disabled);
if assigned(dynrelocsec) and (dynrelocsec.size<>0) then
Exclude(dynrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(pltrelocsec) and (pltrelocsec.size>0) then
Exclude(pltrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(ipltrelocsec) and (ipltrelocsec.size>0) then
Exclude(ipltrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(hashobjsec) then
Exclude(hashobjsec.ExeSection.SecOptions,oso_disabled);
RemoveDisabledSections;
MapSectionsToSegments;
if dynamiclink then
FinishDynamicTags;
end;
@ -2522,60 +2556,17 @@ implementation
objsec: TObjSection;
tempmempos: qword;
begin
{ If using -Xg, .shstrtab needs oso_debug flag, otherwise it won't be written
to .dbg file. RemoveDebugInfo will then destroy ExeSection named .shstrtab,
objsection remains intact but its contents must be rewritten. }
if Assigned(shstrtabsect) then
{ Remove any existing .shstrtab contents }
if (shstrtabsect.size>0) then
begin
shstrtabsect.ReleaseData;
shstrtabsect.Size:=0;
shstrtabsect.SecOptions:=[oso_data];
end
else
shstrtabsect:=TElfObjSection.create_ext(internalObjData,'.shstrtab',SHT_STRTAB,0,1,0);
if (cs_link_separate_dbg_file in current_settings.globalswitches) then
shstrtabsect.SecOptions:=[oso_debug];
AttachSection(shstrtabsect);
shstrtabsect.writezeros(1);
if (not gotwritten) then
begin
{ Create the static symtable (.symtab and .strtab) }
if (cs_link_separate_dbg_file in current_settings.globalswitches) or
not(cs_link_strip in current_settings.globalswitches) then
begin
symtab:=TElfSymtab.Create(internalObjData,esk_exe);
symtab.SecOptions:=[oso_debug];
symtab.fstrsec.SecOptions:=[oso_debug];
AttachSection(symtab);
AttachSection(symtab.fstrsec);
end;
{ Re-enable sections which end up to contain some data
(.got, .rel[a].dyn, .rel[a].plt (includes .rel[a].iplt) and .hash }
if gotobjsec.size<>0 then
Exclude(gotobjsec.ExeSection.SecOptions,oso_disabled);
if assigned(dynrelocsec) and (dynrelocsec.size<>0) then
Exclude(dynrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(pltrelocsec) and (pltrelocsec.size>0) then
Exclude(pltrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(ipltrelocsec) and (ipltrelocsec.size>0) then
Exclude(ipltrelocsec.ExeSection.SecOptions,oso_disabled);
if assigned(hashobjsec) then
Exclude(hashobjsec.ExeSection.SecOptions,oso_disabled);
end;
RemoveDisabledSections;
SegmentList.Clear;
textseg:=nil;
dataseg:=nil;
phdrseg:=nil;
noteseg:=nil;
MapSectionsToSegments;
{ Assign section indices and fill .shstrtab
List of sections cannot be modified after this point. }
shstrtabsect.writezeros(1);
for i:=0 to ExeSectionList.Count-1 do
begin
exesec:=TElfExeSection(ExeSectionList[i]);
@ -2585,9 +2576,6 @@ implementation
if dynamiclink then
begin
if (not gotwritten) then
FinishDynamicTags;
{ fixup sh_link/sh_info members of various dynamic sections }
TElfExeSection(hashobjsec.ExeSection).shlink:=TElfExeSection(dynsymtable.ExeSection).secshidx;
i:=TElfExeSection(dynsymtable.fstrsec.ExeSection).secshidx;