intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 12:26:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

ELF2: Factor out getEntryAddr from writeHeader. NFC.

Browse Source 
llvm-svn: 251158
This commit is contained in:
Rui Ueyama
2015-10-23 22:44:37 +00:00
parent dde0029a25
commit bcb2d0f94b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lld/ELF/Writer.cpp
View File

@@ -67,6 +67,7 @@ private:
return !Symtab.getSharedFiles().empty() || Config->Shared;
}
uintX_t getVAStart() const { return Config->Shared ? 0 : Target->getVAStart(); }
uintX_t getEntryAddr() const;
int getPhdrsNum() const;
std::unique_ptr<llvm::FileOutputBuffer> Buffer;
@@ -723,12 +724,7 @@ template <class ELFT> void Writer<ELFT>::writeHeader() {
EHdr->e_type = Config->Shared ? ET_DYN : ET_EXEC;
EHdr->e_machine = FirstObj.getEMachine();
EHdr->e_version = EV_CURRENT;
if (Config->EntrySym) {
if (auto *E = dyn_cast<ELFSymbolBody<ELFT>>(Config->EntrySym->repl()))
EHdr->e_entry = getSymVA<ELFT>(*E);
} else if (Config->EntryAddr != uint64_t(-1)) {
EHdr->e_entry = Config->EntryAddr;
}
EHdr->e_entry = getEntryAddr();
EHdr->e_phoff = sizeof(Elf_Ehdr);
EHdr->e_shoff = SectionHeaderOff;
EHdr->e_ehsize = sizeof(Elf_Ehdr);
@@ -771,6 +767,18 @@ template <class ELFT> void Writer<ELFT>::writeSections() {
Sec->writeTo(Buf + Sec->getFileOff());
}
template <class ELFT>
typename ELFFile<ELFT>::uintX_t Writer<ELFT>::getEntryAddr() const {
if (Config->EntrySym) {
if (auto *E = dyn_cast<ELFSymbolBody<ELFT>>(Config->EntrySym->repl()))
return getSymVA<ELFT>(*E);
return 0;
}
if (Config->EntryAddr != uint64_t(-1))
return Config->EntryAddr;
return 0;
}
template <class ELFT>
void Writer<ELFT>::setPhdr(Elf_Phdr *PH, uint32_t Type, uint32_t Flags,
uintX_t FileOff, uintX_t VA, uintX_t Size,