[ELF] - Allow discarding .dynsym from the linker script.

This is a part of https://bugs.llvm.org/show_bug.cgi?id=39810.
The patch allows discarding the .dynsym section using linker script.

Differential revision: https://reviews.llvm.org/D55218

llvm-svn: 348748
This commit is contained in:
George Rimar 2018-12-10 09:13:36 +00:00
parent 2eb1f5432f
commit ad667661c4
3 changed files with 12 additions and 8 deletions

View File

@ -415,8 +415,8 @@ LinkerScript::computeInputSections(const InputSectionDescription *Cmd) {
void LinkerScript::discard(ArrayRef<InputSection *> V) {
for (InputSection *S : V) {
if (S == In.ShStrTab || S == In.Dynamic || S == In.DynSymTab ||
S == In.RelaDyn || S == In.RelrDyn)
if (S == In.ShStrTab || S == In.Dynamic || S == In.RelaDyn ||
S == In.RelrDyn)
error("discarding " + S->Name + " section is not allowed");
// You can discard .hash and .gnu.hash sections by linker scripts. Since

View File

@ -1508,7 +1508,10 @@ void RelocationBaseSection::finalizeContents() {
// relocations due to IFUNC (e.g. strcpy). sh_link will be set to 0 in that
// case.
InputSection *SymTab = Config->Relocatable ? In.SymTab : In.DynSymTab;
getParent()->Link = SymTab ? SymTab->getParent()->SectionIndex : 0;
if (SymTab && SymTab->getParent())
getParent()->Link = SymTab->getParent()->SectionIndex;
else
getParent()->Link = 0;
if (In.RelaIplt == this || In.RelaPlt == this)
getParent()->Info = In.GotPlt->getParent()->SectionIndex;
@ -2126,7 +2129,8 @@ GnuHashTableSection::GnuHashTableSection()
}
void GnuHashTableSection::finalizeContents() {
getParent()->Link = In.DynSymTab->getParent()->SectionIndex;
if (OutputSection *Sec = In.DynSymTab->getParent())
getParent()->Link = Sec->SectionIndex;
// Computes bloom filter size in word size. We want to allocate 12
// bits for each symbol. It must be a power of two.
@ -2256,7 +2260,8 @@ HashTableSection::HashTableSection()
}
void HashTableSection::finalizeContents() {
getParent()->Link = In.DynSymTab->getParent()->SectionIndex;
if (OutputSection *Sec = In.DynSymTab->getParent())
getParent()->Link = Sec->SectionIndex;
unsigned NumEntries = 2; // nbucket and nchain.
NumEntries += In.DynSymTab->getNumSymbols(); // The chain entries.

View File

@ -12,10 +12,9 @@
# RUN: FileCheck -check-prefix=DYNAMIC %s
# DYNAMIC: discarding .dynamic section is not allowed
## We allow discarding .dynsym, check we don't crash.
# RUN: echo "SECTIONS { /DISCARD/ : { *(.dynsym) } }" > %t.script
# RUN: not ld.lld -pie -o %t --script %t.script %t.o 2>&1 | \
# RUN: FileCheck -check-prefix=DYNSYM %s
# DYNSYM: discarding .dynsym section is not allowed
# RUN: ld.lld -pie -o %t --script %t.script %t.o
## We allow discarding .dynstr, check we don't crash.
# RUN: echo "SECTIONS { /DISCARD/ : { *(.dynstr) } }" > %t.script