diff options
| author | Shankar Easwaran <shankare@codeaurora.org> | 2015-03-14 19:41:24 +0000 |
|---|---|---|
| committer | Shankar Easwaran <shankare@codeaurora.org> | 2015-03-14 19:41:24 +0000 |
| commit | 5d34ad79b4eec963a73b5c80bf5e323db196788c (patch) | |
| tree | cdde775b627a471c6454a2b508063a153c5a3c19 | |
| parent | 22319eb920bd9c113b8acf001abad44e84c1cfc4 (diff) | |
| download | bcm5719-llvm-5d34ad79b4eec963a73b5c80bf5e323db196788c.tar.gz bcm5719-llvm-5d34ad79b4eec963a73b5c80bf5e323db196788c.zip | |
Revert "[ELF] Change few static functions."
This reverts commit r232253.
Fix comments from dblaikie. Since these functions dont access member state, its ok to be static.
llvm-svn: 232271
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/DefaultLayout.h | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/OutputELFWriter.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/ELF/DefaultLayout.h b/lld/lib/ReaderWriter/ELF/DefaultLayout.h index 3ff7dde1598..49ada5937ff 100644 --- a/lld/lib/ReaderWriter/ELF/DefaultLayout.h +++ b/lld/lib/ReaderWriter/ELF/DefaultLayout.h @@ -193,7 +193,7 @@ public: /// \brief Returns true/false depending on whether the section has a Output // segment or not - bool hasOutputSegment(Section<ELFT> *section); + static bool hasOutputSegment(Section<ELFT> *section); // Adds an atom to the section ErrorOr<const lld::AtomLayout *> addAtom(const Atom *atom) override; diff --git a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h index 97121d15853..b44da49402f 100644 --- a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h +++ b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h @@ -207,7 +207,7 @@ protected: /// @} private: - StringRef maybeGetSOName(Node *node); + static StringRef maybeGetSOName(Node *node); }; //===----------------------------------------------------------------------===// @@ -359,7 +359,7 @@ void OutputELFWriter<ELFT>::assignSectionsWithNoSegments() { _layout.assignFileOffsetsForMiscSections(); for (auto sec : _layout.sections()) if (auto section = dyn_cast<Section<ELFT>>(sec)) - if (!_layout.hasOutputSegment(section)) + if (!DefaultLayout<ELFT>::hasOutputSegment(section)) _shdrtab->updateSection(section); } |

