diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index ef5733d16049..64918d79c55e 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -362,7 +362,7 @@ template void LinkerScript::assignAddresses() { } // Assign addresses as instructed by linker script SECTIONS sub-commands. - Dot = getSizeOfHeaders(); + Dot = getHeaderSize(); uintX_t MinVA = std::numeric_limits::max(); uintX_t ThreadBssOffset = 0; @@ -536,7 +536,7 @@ typename ELFT::uint LinkerScript::getOutputSectionSize(StringRef Name) { } template -typename ELFT::uint LinkerScript::getSizeOfHeaders() { +typename ELFT::uint LinkerScript::getHeaderSize() { return Out::ElfHeader->getSize() + Out::ProgramHeaders->getSize(); } @@ -1036,16 +1036,16 @@ static uint64_t getSectionSize(StringRef Name) { } } -static uint64_t getSizeOfHeaders() { +static uint64_t getHeaderSize() { switch (Config->EKind) { case ELF32LEKind: - return Script::X->getSizeOfHeaders(); + return Script::X->getHeaderSize(); case ELF32BEKind: - return Script::X->getSizeOfHeaders(); + return Script::X->getHeaderSize(); case ELF64LEKind: - return Script::X->getSizeOfHeaders(); + return Script::X->getHeaderSize(); case ELF64BEKind: - return Script::X->getSizeOfHeaders(); + return Script::X->getHeaderSize(); default: llvm_unreachable("unsupported target"); } @@ -1200,7 +1200,7 @@ Expr ScriptParser::readPrimary() { return [=](uint64_t Dot) { return getSectionSize(Name); }; } if (Tok == "SIZEOF_HEADERS") - return [=](uint64_t Dot) { return getSizeOfHeaders(); }; + return [=](uint64_t Dot) { return getHeaderSize(); }; // Parse a symbol name or a number literal. uint64_t V = 0; diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h index 8029c7422b34..ecf9f5c29859 100644 --- a/lld/ELF/LinkerScript.h +++ b/lld/ELF/LinkerScript.h @@ -151,7 +151,7 @@ public: int compareSections(StringRef A, StringRef B); bool hasPhdrsCommands(); uintX_t getOutputSectionSize(StringRef Name); - uintX_t getSizeOfHeaders(); + uintX_t getHeaderSize(); std::vector *> *OutputSections;