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

Linker script: fix crash when discarding section 

If section contains local symbols ldd crashes, because local
symbols are added to symbol table before section is discarded
by linker script processor. This patch calls copyLocalSymbols()
after createSections, so discarded section symbols are not copied

llvm-svn: 282244
This commit is contained in:
Eugene Leviant 2016-09-23 13:17:16 +00:00
parent c8ccd1f1c5
commit d4dea164dd
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/ELF/Writer.cpp
View File

@ -244,8 +244,6 @@ template <class ELFT> static std::vector<DefinedCommon *> getCommonSymbols() {
// The main function of the writer.
template <class ELFT> void Writer<ELFT>::run() {
if (Config->Discard != DiscardPolicy::All)
copyLocalSymbols();
addReservedSymbols();
if (Target->NeedsThunks)
@ -262,6 +260,9 @@ template <class ELFT> void Writer<ELFT>::run() {
Script<ELFT>::X->processCommands(Factory);
}
if (Config->Discard != DiscardPolicy::All)
copyLocalSymbols();
finalizeSections();
if (HasError)
return;

10
lld/test/ELF/linkerscript/discard-section.s Normal file
View File

@ -0,0 +1,10 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: echo "SECTIONS { /DISCARD/ : { *(.aaa*) } }" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -section-headers %t1 | FileCheck %s
# CHECK-NOT: .aaa
.section .aaa,"a"
aaa:
.quad 0