Index: ELF/LinkerScript.h =================================================================== --- ELF/LinkerScript.h +++ ELF/LinkerScript.h @@ -84,8 +84,9 @@ struct InputSectionDescription : BaseCommand { InputSectionDescription() : BaseCommand(InputSectionKind) {} static bool classof(const BaseCommand *C); + StringRef FilePattern; std::vector ExcludedFiles; - std::vector Patterns; + std::vector SectionPatterns; }; struct PhdrsCommand { Index: ELF/LinkerScript.cpp =================================================================== --- ELF/LinkerScript.cpp +++ ELF/LinkerScript.cpp @@ -92,20 +92,27 @@ return Ret; } +static bool fileMatches(const InputSectionDescription *Desc, + StringRef Filename) { + if (!globMatch(Desc->FilePattern, Filename)) + return false; + return Desc->ExcludedFiles.empty() || !match(Desc->ExcludedFiles, Filename); +} + // Returns input sections filtered by given glob patterns. template std::vector *> LinkerScript::getInputSections(const InputSectionDescription *I) { - ArrayRef Patterns = I->Patterns; - ArrayRef ExcludedFiles = I->ExcludedFiles; + ArrayRef Patterns = I->SectionPatterns; std::vector *> Ret; for (const std::unique_ptr> &F : - Symtab::X->getObjectFiles()) - for (InputSectionBase *S : F->getSections()) - if (!isDiscarded(S) && !S->OutSec && match(Patterns, S->getSectionName())) - if (ExcludedFiles.empty() || - !match(ExcludedFiles, sys::path::filename(F->getName()))) + Symtab::X->getObjectFiles()) { + if (fileMatches(I, sys::path::filename(F->getName()))) + for (InputSectionBase *S : F->getSections()) + if (!isDiscarded(S) && !S->OutSec && + match(Patterns, S->getSectionName())) Ret.push_back(S); + } if ((llvm::find(Patterns, "COMMON") != Patterns.end())) Ret.push_back(CommonInputSection::X); @@ -428,9 +435,7 @@ void readAsNeeded(); void readEntry(); void readExtern(); - std::unique_ptr readFilePattern(); void readGroup(); - void readKeep(OutputSectionCommand *Cmd); void readInclude(); void readNothing() {} void readOutput(); @@ -443,6 +448,8 @@ SymbolAssignment *readAssignment(StringRef Name); void readOutputSectionDescription(StringRef OutSec); std::vector readOutputSectionPhdrs(); + std::unique_ptr readInputSectionDescription(); + void readInputSectionRules(InputSectionDescription *InCmd, bool Keep); unsigned readPhdrType(); void readProvide(bool Hidden); void readAlign(OutputSectionCommand *Cmd); @@ -672,32 +679,37 @@ .Default(-1); } -std::unique_ptr ScriptParser::readFilePattern() { - expect("*"); +void ScriptParser::readInputSectionRules(InputSectionDescription *InCmd, bool Keep) { + InCmd->FilePattern = next(); expect("("); - auto InCmd = llvm::make_unique(); - if (skip("EXCLUDE_FILE")) { expect("("); while (!Error && !skip(")")) InCmd->ExcludedFiles.push_back(next()); - InCmd->Patterns.push_back(next()); - expect(")"); - } else { - while (!Error && !skip(")")) - InCmd->Patterns.push_back(next()); } - return InCmd; + + while (!Error && !skip(")")) { + if (Keep) + Opt.KeptSections.push_back(peek()); + InCmd->SectionPatterns.push_back(next()); + } } -void ScriptParser::readKeep(OutputSectionCommand *Cmd) { - expect("("); - std::unique_ptr InCmd = readFilePattern(); - Opt.KeptSections.insert(Opt.KeptSections.end(), InCmd->Patterns.begin(), - InCmd->Patterns.end()); - Cmd->Commands.push_back(std::move(InCmd)); - expect(")"); +std::unique_ptr ScriptParser::readInputSectionDescription() { + std::unique_ptr InCmd = std::make_unique(); + + // Input section wildcard can be surrounded by KEEP. + // https://sourceware.org/binutils/docs/ld/Input-Section-Keep.html#Input-Section-Keep + if (skip("KEEP")) { + expect("("); + readInputSectionRules(InCmd.get(), true); + expect(")"); + } + else + readInputSectionRules(InCmd.get(), false); + + return InCmd; } void ScriptParser::readAlign(OutputSectionCommand *Cmd) { @@ -734,16 +746,15 @@ expect("{"); while (!Error && !skip("}")) { + if ((!peek().empty() && peek()[0] == '*') || peek() == "KEEP") { + std::unique_ptr InCmd = + readInputSectionDescription(); + Cmd->Commands.push_back(std::move(InCmd)); + continue; + } + StringRef Tok = next(); - if (Tok == "*") { - auto *InCmd = new InputSectionDescription(); - Cmd->Commands.emplace_back(InCmd); - expect("("); - while (!Error && !skip(")")) - InCmd->Patterns.push_back(next()); - } else if (Tok == "KEEP") { - readKeep(Cmd); - } else if (Tok == "PROVIDE") { + if (Tok == "PROVIDE") { readProvide(false); } else if (Tok == "PROVIDE_HIDDEN") { readProvide(true); Index: test/ELF/linkerscript/Inputs/linkerscript-filename-spec.s =================================================================== --- test/ELF/linkerscript/Inputs/linkerscript-filename-spec.s +++ test/ELF/linkerscript/Inputs/linkerscript-filename-spec.s @@ -0,0 +1,2 @@ +.section .foo,"a" + .quad 0x11 Index: test/ELF/linkerscript/linkerscript-filename-spec.s =================================================================== --- test/ELF/linkerscript/linkerscript-filename-spec.s +++ test/ELF/linkerscript/linkerscript-filename-spec.s @@ -0,0 +1,41 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %tfirst.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \ +# RUN: %p/Inputs/linkerscript-filename-spec.s -o %tsecond.o + +# RUN: echo "SECTIONS { .foo : { \ +# RUN: KEEP(*first.o(.foo)) \ +# RUN: KEEP(*second.o(.foo)) } }" > %t1.script +# RUN: ld.lld -o %t1 --script %t1.script %tfirst.o %tsecond.o +# RUN: llvm-objdump -s %t1 | FileCheck --check-prefix=FIRSTSECOND %s +# FIRSTSECOND: Contents of section .foo: +# FIRSTSECOND-NEXT: 0120 01000000 00000000 11000000 00000000 + +# RUN: echo "SECTIONS { .foo : { \ +# RUN: KEEP(*second.o(.foo)) \ +# RUN: KEEP(*first.o(.foo)) } }" > %t2.script +# RUN: ld.lld -o %t2 --script %t2.script %tfirst.o %tsecond.o +# RUN: llvm-objdump -s %t2 | FileCheck --check-prefix=SECONDFIRST %s +# SECONDFIRST: Contents of section .foo: +# SECONDFIRST-NEXT: 0120 11000000 00000000 01000000 00000000 + +## Now the same tests but without KEEP. Checking that file name inside +## KEEP is parsed fine. +# RUN: echo "SECTIONS { .foo : { \ +# RUN: *first.o(.foo) \ +# RUN: *second.o(.foo) } }" > %t3.script +# RUN: ld.lld -o %t3 --script %t3.script %tfirst.o %tsecond.o +# RUN: llvm-objdump -s %t3 | FileCheck --check-prefix=FIRSTSECOND %s + +# RUN: echo "SECTIONS { .foo : { \ +# RUN: *second.o(.foo) \ +# RUN: *first.o(.foo) } }" > %t4.script +# RUN: ld.lld -o %t4 --script %t4.script %tfirst.o %tsecond.o +# RUN: llvm-objdump -s %t4 | FileCheck --check-prefix=SECONDFIRST %s + +.global _start +_start: + nop + +.section .foo,"a" + .quad 1