maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Refactor how .gnu.hash and .hash are discarded 

Switch to the D114180 approach which is simpler and allows gnuHashTab/hashTab to
switch to unique_ptr.
This commit is contained in:
Fangrui Song 2022-01-12 12:47:07 -08:00
parent b592cbf329
commit 43d927984c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lld/ELF/LinkerScript.cpp
View File

@ -564,14 +564,6 @@ void LinkerScript::discard(InputSectionBase &s) {
if (&s == in.shStrTab.get())
error("discarding " + s.name + " section is not allowed");
// You can discard .hash and .gnu.hash sections by linker scripts.
// Since they are synthesized sections, we need to handle them differently
// than other regular sections.
if (&s == mainPart->gnuHashTab)
mainPart->gnuHashTab = nullptr;
else if (&s == mainPart->hashTab)
mainPart->hashTab = nullptr;
s.markDead();
s.parent = nullptr;
for (InputSection *sec : s.dependentSections)

4
lld/ELF/SyntheticSections.cpp
View File

@ -1464,9 +1464,9 @@ DynamicSection<ELFT>::computeContents() {
addInt(DT_STRSZ, part.dynStrTab->getSize());
if (!config->zText)
addInt(DT_TEXTREL, 0);
if (part.gnuHashTab)
if (part.gnuHashTab && part.gnuHashTab->getParent())
addInSec(DT_GNU_HASH, *part.gnuHashTab);
if (part.hashTab)
if (part.hashTab && part.hashTab->getParent())
addInSec(DT_HASH, *part.hashTab);
if (isMain) {