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

[ELF] make KEEP command recognize file patterns 

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

llvm-svn: 283305
This commit is contained in:
Eugene Leviant 2016-10-05 09:36:59 +00:00
parent 014181e7f4
commit cf43f179b1
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lld/ELF/LinkerScript.cpp
View File

@ -108,9 +108,15 @@ template <class ELFT> LinkerScript<ELFT>::~LinkerScript() {}
template <class ELFT>
bool LinkerScript<ELFT>::shouldKeep(InputSectionBase<ELFT> *S) {
for (Regex *Re : Opt.KeptSections)
if (Re->match(S->Name))
return true;
for (InputSectionDescription *ID : Opt.KeptSections) {
StringRef Filename = S->getFile()->getName();
if (!ID->FileRe.match(sys::path::filename(Filename)))
continue;
for (SectionPattern &P : ID->SectionPatterns)
if (P.SectionRe.match(S->Name))
return true;
}
return false;
}
@ -1247,8 +1253,7 @@ ScriptParser::readInputSectionDescription(StringRef Tok) {
StringRef FilePattern = next();
InputSectionDescription *Cmd = readInputSectionRules(FilePattern);
expect(")");
for (SectionPattern &Pat : Cmd->SectionPatterns)
Opt.KeptSections.push_back(&Pat.SectionRe);
Opt.KeptSections.push_back(Cmd);
return Cmd;
}
return readInputSectionRules(Tok);

2
lld/ELF/LinkerScript.h
View File

@ -184,7 +184,7 @@ struct ScriptConfiguration {
// List of section patterns specified with KEEP commands. They will
// be kept even if they are unused and --gc-sections is specified.
std::vector<llvm::Regex *> KeptSections;
std::vector<InputSectionDescription *> KeptSections;
};
extern ScriptConfiguration *ScriptConfig;

2
lld/test/ELF/linkerscript/Inputs/keep.s Normal file
View File

@ -0,0 +1,2 @@
.section .keep, "a"
.long 0x41414141

11
lld/test/ELF/linkerscript/sections-keep.s
View File

@ -1,5 +1,6 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/keep.s -o %t2.o
## First check that section "keep" is garbage collected without using KEEP
# RUN: echo "SECTIONS { \
@ -69,6 +70,16 @@
# MIXED2-NEXT: 5 .shstrtab 0000002f 0000000000000000
# MIXED2-NEXT: 6 .strtab 00000012 0000000000000000
# Check file pattern for kept sections.
# RUN: echo "SECTIONS { \
# RUN: . = SIZEOF_HEADERS; \
# RUN: .keep : { KEEP(*2.o(.keep)) } \
# RUN: }" > %t.script
# RUN: ld.lld --gc-sections -o %t1 --script %t.script %t2.o %t
# RUN: llvm-objdump -s %t1 | FileCheck -check-prefix=FILEMATCH %s
# FILEMATCH: Contents of section .keep:
# FILEMATCH-NEXT: 00e8 41414141 AAAA
.global _start
_start:
mov temp, %eax