maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename getSizeOfHeaders -> getHeaderSize. 

We have getSectionSize for SIZEOF command. So, I think
getHeaderSize is a better name for SIZEOF_HEADERS.

llvm-svn: 278470
This commit is contained in:
Rui Ueyama 2016-08-12 04:00:22 +00:00
parent 42531260b3
commit 4f7500bfc2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lld/ELF/LinkerScript.cpp
View File

@ -362,7 +362,7 @@ template <class ELFT> void LinkerScript<ELFT>::assignAddresses() {
} }
// Assign addresses as instructed by linker script SECTIONS sub-commands. // Assign addresses as instructed by linker script SECTIONS sub-commands.
Dot = getSizeOfHeaders(); Dot = getHeaderSize();
uintX_t MinVA = std::numeric_limits<uintX_t>::max(); uintX_t MinVA = std::numeric_limits<uintX_t>::max();
uintX_t ThreadBssOffset = 0; uintX_t ThreadBssOffset = 0;
@ -536,7 +536,7 @@ typename ELFT::uint LinkerScript<ELFT>::getOutputSectionSize(StringRef Name) {
} }
template <class ELFT> template <class ELFT>
typename ELFT::uint LinkerScript<ELFT>::getSizeOfHeaders() { typename ELFT::uint LinkerScript<ELFT>::getHeaderSize() {
return Out<ELFT>::ElfHeader->getSize() + Out<ELFT>::ProgramHeaders->getSize(); return Out<ELFT>::ElfHeader->getSize() + Out<ELFT>::ProgramHeaders->getSize();
} }
@ -1036,16 +1036,16 @@ static uint64_t getSectionSize(StringRef Name) {
} }
} }
static uint64_t getSizeOfHeaders() { static uint64_t getHeaderSize() {
switch (Config->EKind) { switch (Config->EKind) {
case ELF32LEKind: case ELF32LEKind:
return Script<ELF32LE>::X->getSizeOfHeaders(); return Script<ELF32LE>::X->getHeaderSize();
case ELF32BEKind: case ELF32BEKind:
return Script<ELF32BE>::X->getSizeOfHeaders(); return Script<ELF32BE>::X->getHeaderSize();
case ELF64LEKind: case ELF64LEKind:
return Script<ELF64LE>::X->getSizeOfHeaders(); return Script<ELF64LE>::X->getHeaderSize();
case ELF64BEKind: case ELF64BEKind:
return Script<ELF64BE>::X->getSizeOfHeaders(); return Script<ELF64BE>::X->getHeaderSize();
default: default:
llvm_unreachable("unsupported target"); llvm_unreachable("unsupported target");
} }
@ -1200,7 +1200,7 @@ Expr ScriptParser::readPrimary() {
return [=](uint64_t Dot) { return getSectionSize(Name); }; return [=](uint64_t Dot) { return getSectionSize(Name); };
} }
if (Tok == "SIZEOF_HEADERS") if (Tok == "SIZEOF_HEADERS")
return [=](uint64_t Dot) { return getSizeOfHeaders(); }; return [=](uint64_t Dot) { return getHeaderSize(); };
// Parse a symbol name or a number literal. // Parse a symbol name or a number literal.
uint64_t V = 0; uint64_t V = 0;

2
lld/ELF/LinkerScript.h
View File

@ -151,7 +151,7 @@ public:
int compareSections(StringRef A, StringRef B); int compareSections(StringRef A, StringRef B);
bool hasPhdrsCommands(); bool hasPhdrsCommands();
uintX_t getOutputSectionSize(StringRef Name); uintX_t getOutputSectionSize(StringRef Name);
uintX_t getSizeOfHeaders(); uintX_t getHeaderSize();
std::vector<OutputSectionBase<ELFT> *> *OutputSections; std::vector<OutputSectionBase<ELFT> *> *OutputSections;