Index: ELF/LinkerScript.h =================================================================== --- ELF/LinkerScript.h +++ ELF/LinkerScript.h @@ -152,7 +152,8 @@ std::vector *> *OutputSections; private: - std::vector> + std::vector< + std::pair> getSectionMap(); std::vector *> @@ -161,8 +162,6 @@ // "ScriptConfig" is a bit too long, so define a short name for it. ScriptConfiguration &Opt = *ScriptConfig; - void filter(); - int getSectionIndex(StringRef Name); std::vector getPhdrIndices(StringRef SectionName); size_t getPhdrIndex(StringRef PhdrName); Index: ELF/LinkerScript.cpp =================================================================== --- ELF/LinkerScript.cpp +++ ELF/LinkerScript.cpp @@ -78,17 +78,19 @@ return false; } -// Create a vector of (, ). +// Create a vector of (, ). template -std::vector> +std::vector< + std::pair> LinkerScript::getSectionMap() { - std::vector> Ret; + std::vector> Ret; for (const std::unique_ptr &Base1 : Opt.Commands) if (auto *Cmd1 = dyn_cast(Base1.get())) for (const std::unique_ptr &Base2 : Cmd1->Commands) if (auto *Cmd2 = dyn_cast(Base2.get())) - Ret.emplace_back(Cmd1->Name, Cmd2); + Ret.emplace_back(Cmd1, Cmd2); return Ret; } @@ -158,10 +160,20 @@ }; template -void LinkerScript::createSections( - OutputSectionFactory &Factory) { +static bool matchConstraints(ArrayRef *> Sections, + ConstraintKind Kind) { + return !llvm::any_of(Sections, [=](InputSectionBase *Sec) { + bool Writable = Sec->getSectionHdr()->sh_flags & SHF_WRITE; + bool RO = (Kind == ConstraintKind::ReadOnly); + bool RW = (Kind == ConstraintKind::ReadWrite); + return (RO && Writable) || (RW && !Writable); + }); +} + +template +void LinkerScript::createSections(OutputSectionFactory &Factory) { for (auto &P : getSectionMap()) { - StringRef OutputName = P.first; + StringRef OutputName = P.first->Name; const InputSectionDescription *Cmd = P.second; std::vector *> Sections = getInputSections(Cmd); @@ -177,8 +189,9 @@ std::stable_sort(Sections.begin(), Sections.end(), SectionsSorter(Cmd->Sort)); - for (InputSectionBase *S : Sections) - addSection(Factory, *OutputSections, S, OutputName); + if (matchConstraints(Sections, P.first->Constraint)) + for (InputSectionBase *S : Sections) + addSection(Factory, *OutputSections, S, OutputName); } // Add all other input sections, which are not listed in script. @@ -187,10 +200,6 @@ for (InputSectionBase *S : F->getSections()) if (!isDiscarded(S) && !S->OutSec) addSection(Factory, *OutputSections, S, getOutputSectionName(S)); - - // Remove from the output all the sections which did not meet - // the optional constraints. - filter(); } template @@ -198,29 +207,6 @@ Range.erase(std::remove_if(Range.begin(), Range.end(), Pred), Range.end()); } -// Process ONLY_IF_RO and ONLY_IF_RW. -template void LinkerScript::filter() { - // In this loop, we remove output sections if they don't satisfy - // requested properties. - for (const std::unique_ptr &Base : Opt.Commands) { - auto *Cmd = dyn_cast(Base.get()); - if (!Cmd || Cmd->Name == "/DISCARD/") - continue; - - if (Cmd->Constraint == ConstraintKind::NoConstraint) - continue; - - removeElementsIf(*OutputSections, [&](OutputSectionBase *S) { - bool Writable = (S->getFlags() & SHF_WRITE); - bool RO = (Cmd->Constraint == ConstraintKind::ReadOnly); - bool RW = (Cmd->Constraint == ConstraintKind::ReadWrite); - - return S->getName() == Cmd->Name && - ((RO && Writable) || (RW && !Writable)); - }); - } -} - template void LinkerScript::assignAddresses() { ArrayRef *> Sections = *OutputSections; // Orphan sections are sections present in the input files which Index: test/ELF/linkerscript/linkerscript-multi-sections-constraint.s =================================================================== --- test/ELF/linkerscript/linkerscript-multi-sections-constraint.s +++ test/ELF/linkerscript/linkerscript-multi-sections-constraint.s @@ -0,0 +1,26 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t +# RUN: echo "SECTIONS { \ +# RUN: . = 0x1000; .aaa : ONLY_IF_RO { *(.aaa.*) } \ +# RUN: . = 0x2000; .aaa : ONLY_IF_RW { *(.aaa.*) } } " > %t.script +# RUN: ld.lld -o %t1 --script %t.script %t +# RUN: llvm-objdump -section-headers %t1 | FileCheck %s + +# CHECK: Sections: +# CHECK-NEXT: Idx Name Size Address Type +# CHECK-NEXT: 0 00000000 0000000000000000 +# CHECK-NEXT: 1 .aaa 00000010 0000000000002000 DATA +# CHECK-NEXT: 2 .text 00000001 0000000000002010 TEXT DATA +# CHECK-NEXT: 3 .symtab 00000030 0000000000000000 +# CHECK-NEXT: 4 .shstrtab 00000026 0000000000000000 +# CHECK-NEXT: 5 .strtab 00000008 0000000000000000 + +.global _start +_start: + nop + +.section .aaa.1, "aw" +.quad 1 + +.section .aaa.2, "aw" +.quad 1 Index: test/ELF/linkerscript/linkerscript-sections-constraint.s =================================================================== --- test/ELF/linkerscript/linkerscript-sections-constraint.s +++ test/ELF/linkerscript/linkerscript-sections-constraint.s @@ -2,8 +2,8 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t # RUN: echo "SECTIONS { \ # RUN: .writable : ONLY_IF_RW { *(.writable) } \ -# RUN: .readable : ONLY_IF_RO { *(.readable) }}" > %t.script -# RUN: ld.lld -o %t1 --script %t.script %t +# RUN: .readable : ONLY_IF_RO { *(.readable) }}" > %t1.script +# RUN: ld.lld -o %t1 --script %t1.script %t # RUN: llvm-objdump -section-headers %t1 | \ # RUN: FileCheck -check-prefix=BASE %s # BASE: Sections: @@ -13,22 +13,20 @@ # BASE-NEXT: 2 .readable 00000004 0000000000000204 DATA # RUN: echo "SECTIONS { \ -# RUN: .writable : ONLY_IF_RO { *(.writable) } \ -# RUN: .readable : ONLY_IF_RW { *(.readable) }}" > %t.script -# RUN: ld.lld -o %t1 --script %t.script %t -# RUN: llvm-objdump -section-headers %t1 | \ -# RUN: FileCheck -check-prefix=NOSECTIONS %s -# NOSECTIONS: Sections: -# NOSECTIONS-NOT: .writable -# NOSECTIONS-NOT: .readable - -# RUN: echo "SECTIONS { \ -# RUN: .foo : ONLY_IF_RO { *(.foo.*) }}" > %t.script -# RUN: ld.lld -o %t1 --script %t.script %t -# RUN: llvm-objdump -section-headers %t1 | \ -# RUN: FileCheck -check-prefix=NOSECTIONS2 %s -# NOSECTIONS2: Sections: -# NOSECTIONS2-NOT: .foo +# RUN: .foo : ONLY_IF_RO { *(.foo.*) } \ +# RUN: .writable : ONLY_IF_RW { *(.writable) } \ +# RUN: .readable : ONLY_IF_RO { *(.readable) }}" > %t3.script +# RUN: ld.lld -o %t3 --script %t3.script %t +# RUN: llvm-objdump -section-headers %t3 | \ +# RUN: FileCheck -check-prefix=NO1 %s +# NO1: Sections: +# NO1-NEXT: Idx Name Size Address Type +# NO1-NEXT: 0 00000000 0000000000000000 +# NO1-NEXT: 1 .writable 00000004 0000000000000200 DATA +# NO1-NEXT: 2 .readable 00000004 0000000000000204 DATA +# NO1-NEXT: 3 .text 00000001 0000000000000208 TEXT DATA +# NO1-NEXT: 4 .foo.2 00000004 0000000000000209 DATA +# NO1-NEXT: 5 .foo.1 00000004 000000000000020d TEXT DATA .global _start _start: