diff options
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 15 | ||||
| -rw-r--r-- | lld/ELF/LinkerScript.h | 2 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/Inputs/keep.s | 2 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/sections-keep.s | 11 |
4 files changed, 24 insertions, 6 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 5cdee7082e1..b0a83d8d5cf 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -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); diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h index 47b7b683a34..ac73d4ea7b2 100644 --- a/lld/ELF/LinkerScript.h +++ b/lld/ELF/LinkerScript.h @@ -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; diff --git a/lld/test/ELF/linkerscript/Inputs/keep.s b/lld/test/ELF/linkerscript/Inputs/keep.s new file mode 100644 index 00000000000..20fa41c1adf --- /dev/null +++ b/lld/test/ELF/linkerscript/Inputs/keep.s @@ -0,0 +1,2 @@ +.section .keep, "a" + .long 0x41414141 diff --git a/lld/test/ELF/linkerscript/sections-keep.s b/lld/test/ELF/linkerscript/sections-keep.s index 72837303ec1..0758007e924 100644 --- a/lld/test/ELF/linkerscript/sections-keep.s +++ b/lld/test/ELF/linkerscript/sections-keep.s @@ -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 |
