replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF] - Remove unnecessary template. NFC. 

llvm-svn: 297622
This commit is contained in:
George Rimar 2017-03-13 14:40:58 +00:00
parent 94db2e288b
commit 78aa270041
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/LinkerScript.cpp
View File

@ -932,10 +932,6 @@ uint64_t LinkerScript<ELFT>::getOutputSectionSize(StringRef Name) {
return 0;
}
template <class ELFT> uint64_t LinkerScript<ELFT>::getHeaderSize() {
return elf::getHeaderSize<ELFT>();
}
template <class ELFT>
uint64_t LinkerScript<ELFT>::getSymbolValue(const Twine &Loc, StringRef S) {
if (S == ".")
@ -1835,7 +1831,7 @@ Expr ScriptParser::readPrimary() {
[=] { return ScriptBase->getOutputSection(Location, Name)->Alignment; };
}
if (Tok == "SIZEOF_HEADERS")
return [=] { return ScriptBase->getHeaderSize(); };
return [=] { return elf::getHeaderSize(); };
// Tok is a literal number.
uint64_t V;

2
lld/ELF/LinkerScript.h
View File

@ -211,7 +211,6 @@ protected:
OutputSection *Aether;
public:
virtual uint64_t getHeaderSize() = 0;
virtual uint64_t getSymbolValue(const Twine &Loc, StringRef S) = 0;
uint64_t getDot() { return getSymbolValue("", "."); }
virtual bool isDefined(StringRef S) = 0;
@ -266,7 +265,6 @@ public:
void placeOrphanSections();
void assignAddresses(std::vector<PhdrEntry> &Phdrs);
bool hasPhdrsCommands();
uint64_t getHeaderSize() override;
uint64_t getSymbolValue(const Twine &Loc, StringRef S) override;
bool isDefined(StringRef S) override;
bool isAbsolute(StringRef S) override;

6
lld/ELF/OutputSections.cpp
View File

@ -389,6 +389,12 @@ bool DenseMapInfo<SectionKey>::isEqual(const SectionKey &LHS,
LHS.Flags == RHS.Flags && LHS.Alignment == RHS.Alignment;
}
uint64_t elf::getHeaderSize() {
if (Config->OFormatBinary)
return 0;
return Out::ElfHeader->Size + Out::ProgramHeaders->Size;
}
namespace lld {
namespace elf {

6
lld/ELF/OutputSections.h
View File

@ -144,11 +144,7 @@ private:
std::vector<OutputSection *> &OutputSections;
};
template <class ELFT> uint64_t getHeaderSize() {
if (Config->OFormatBinary)
return 0;
return Out::ElfHeader->Size + Out::ProgramHeaders->Size;
}
uint64_t getHeaderSize();
} // namespace elf
} // namespace lld

4
lld/ELF/Writer.cpp
View File

@ -1443,7 +1443,7 @@ bool elf::allocateHeaders(std::vector<PhdrEntry> &Phdrs,
if (FirstPTLoad == Phdrs.end())
return false;
uint64_t HeaderSize = getHeaderSize<ELFT>();
uint64_t HeaderSize = getHeaderSize();
if (HeaderSize > Min) {
auto PhdrI =
std::find_if(Phdrs.begin(), Phdrs.end(),
@ -1496,7 +1496,7 @@ template <class ELFT> void Writer<ELFT>::fixHeaders() {
template <class ELFT> void Writer<ELFT>::assignAddresses() {
uintX_t VA = Config->ImageBase;
if (AllocateHeader)
VA += getHeaderSize<ELFT>();
VA += getHeaderSize();
uintX_t ThreadBssOffset = 0;
for (OutputSection *Sec : OutputSections) {
uint32_t Alignment = Sec->Alignment;