diff options
-rw-r--r-- | lld/lib/ReaderWriter/ELF/TargetLayout.cpp | 16 | ||||
-rw-r--r-- | lld/lib/ReaderWriter/ELF/TargetLayout.h | 8 |
2 files changed, 1 insertions, 23 deletions
diff --git a/lld/lib/ReaderWriter/ELF/TargetLayout.cpp b/lld/lib/ReaderWriter/ELF/TargetLayout.cpp index 546b96bd59f..09c49f62d64 100644 --- a/lld/lib/ReaderWriter/ELF/TargetLayout.cpp +++ b/lld/lib/ReaderWriter/ELF/TargetLayout.cpp @@ -328,25 +328,11 @@ template <class ELFT> void TargetLayout<ELFT>::createOutputSections() { } template <class ELFT> -std::vector<const script::PHDR *> -TargetLayout<ELFT>::getCustomSegments(const OutputSection<ELFT> *sec) const { - return _linkerScriptSema.getPHDRsForOutputSection(sec->name()); -} - -template <class ELFT> -std::vector<const script::PHDR *> -TargetLayout<ELFT>::getCustomSegments(const Section<ELFT> *section) const { - auto sec = section->getOutputSection(); - assert(sec && "Output section should be already set for input section"); - return getCustomSegments(sec); -} - -template <class ELFT> std::vector<typename TargetLayout<ELFT>::SegmentKey> TargetLayout<ELFT>::getSegmentsForSection(const OutputSection<ELFT> *os, const Section<ELFT> *sec) const { std::vector<SegmentKey> segKeys; - auto phdrs = getCustomSegments(os); + auto phdrs = _linkerScriptSema.getPHDRsForOutputSection(os->name()); if (!phdrs.empty()) { if (phdrs.size() == 1 && phdrs[0]->isNone()) { segKeys.emplace_back("NONE", llvm::ELF::PT_NULL, 0, false); diff --git a/lld/lib/ReaderWriter/ELF/TargetLayout.h b/lld/lib/ReaderWriter/ELF/TargetLayout.h index e77212146fd..52512f8e279 100644 --- a/lld/lib/ReaderWriter/ELF/TargetLayout.h +++ b/lld/lib/ReaderWriter/ELF/TargetLayout.h @@ -202,14 +202,6 @@ public: // Output sections with the same name into a OutputSection void createOutputSections(); - // Query for custom segments of the given section - std::vector<const script::PHDR *> - getCustomSegments(const Section<ELFT> *section) const; - - // Query for custom segments of the given output section - std::vector<const script::PHDR *> - getCustomSegments(const OutputSection<ELFT> *sec) const; - // Query for segments based on output and input sections std::vector<SegmentKey> getSegmentsForSection(const OutputSection<ELFT> *os, const Section<ELFT> *sec) const; |