Skip to content
Snippets Groups Projects
Commit 729ac793 authored by Rui Ueyama's avatar Rui Ueyama
Browse files

Rename a function so that that starts with a lowercase letter.

llvm-svn: 287202
parent 3f0cdc7a
No related branches found
No related tags found
No related merge requests found
...@@ -722,15 +722,15 @@ template <class ELFT> void DynamicSection<ELFT>::addEntries() { ...@@ -722,15 +722,15 @@ template <class ELFT> void DynamicSection<ELFT>::addEntries() {
// Add strings to .dynstr early so that .dynstr's size will be // Add strings to .dynstr early so that .dynstr's size will be
// fixed early. // fixed early.
for (StringRef S : Config->AuxiliaryList) for (StringRef S : Config->AuxiliaryList)
Add({DT_AUXILIARY, In<ELFT>::DynStrTab->addString(S)}); add({DT_AUXILIARY, In<ELFT>::DynStrTab->addString(S)});
if (!Config->RPath.empty()) if (!Config->RPath.empty())
Add({Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH, add({Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH,
In<ELFT>::DynStrTab->addString(Config->RPath)}); In<ELFT>::DynStrTab->addString(Config->RPath)});
for (SharedFile<ELFT> *F : Symtab<ELFT>::X->getSharedFiles()) for (SharedFile<ELFT> *F : Symtab<ELFT>::X->getSharedFiles())
if (F->isNeeded()) if (F->isNeeded())
Add({DT_NEEDED, In<ELFT>::DynStrTab->addString(F->getSoName())}); add({DT_NEEDED, In<ELFT>::DynStrTab->addString(F->getSoName())});
if (!Config->SoName.empty()) if (!Config->SoName.empty())
Add({DT_SONAME, In<ELFT>::DynStrTab->addString(Config->SoName)}); add({DT_SONAME, In<ELFT>::DynStrTab->addString(Config->SoName)});
// Set DT_FLAGS and DT_FLAGS_1. // Set DT_FLAGS and DT_FLAGS_1.
uint32_t DtFlags = 0; uint32_t DtFlags = 0;
...@@ -749,12 +749,12 @@ template <class ELFT> void DynamicSection<ELFT>::addEntries() { ...@@ -749,12 +749,12 @@ template <class ELFT> void DynamicSection<ELFT>::addEntries() {
} }
if (DtFlags) if (DtFlags)
Add({DT_FLAGS, DtFlags}); add({DT_FLAGS, DtFlags});
if (DtFlags1) if (DtFlags1)
Add({DT_FLAGS_1, DtFlags1}); add({DT_FLAGS_1, DtFlags1});
if (!Config->Entry.empty()) if (!Config->Entry.empty())
Add({DT_DEBUG, (uint64_t)0}); add({DT_DEBUG, (uint64_t)0});
} }
// Add remaining entries to complete .dynamic contents. // Add remaining entries to complete .dynamic contents.
...@@ -766,9 +766,9 @@ template <class ELFT> void DynamicSection<ELFT>::finalize() { ...@@ -766,9 +766,9 @@ template <class ELFT> void DynamicSection<ELFT>::finalize() {
if (In<ELFT>::RelaDyn->hasRelocs()) { if (In<ELFT>::RelaDyn->hasRelocs()) {
bool IsRela = Config->Rela; bool IsRela = Config->Rela;
Add({IsRela ? DT_RELA : DT_REL, In<ELFT>::RelaDyn}); add({IsRela ? DT_RELA : DT_REL, In<ELFT>::RelaDyn});
Add({IsRela ? DT_RELASZ : DT_RELSZ, In<ELFT>::RelaDyn->getSize()}); add({IsRela ? DT_RELASZ : DT_RELSZ, In<ELFT>::RelaDyn->getSize()});
Add({IsRela ? DT_RELAENT : DT_RELENT, add({IsRela ? DT_RELAENT : DT_RELENT,
uintX_t(IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel))}); uintX_t(IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel))});
// MIPS dynamic loader does not support RELCOUNT tag. // MIPS dynamic loader does not support RELCOUNT tag.
...@@ -777,69 +777,69 @@ template <class ELFT> void DynamicSection<ELFT>::finalize() { ...@@ -777,69 +777,69 @@ template <class ELFT> void DynamicSection<ELFT>::finalize() {
if (Config->EMachine != EM_MIPS) { if (Config->EMachine != EM_MIPS) {
size_t NumRelativeRels = In<ELFT>::RelaDyn->getRelativeRelocCount(); size_t NumRelativeRels = In<ELFT>::RelaDyn->getRelativeRelocCount();
if (Config->ZCombreloc && NumRelativeRels) if (Config->ZCombreloc && NumRelativeRels)
Add({IsRela ? DT_RELACOUNT : DT_RELCOUNT, NumRelativeRels}); add({IsRela ? DT_RELACOUNT : DT_RELCOUNT, NumRelativeRels});
} }
} }
if (In<ELFT>::RelaPlt->hasRelocs()) { if (In<ELFT>::RelaPlt->hasRelocs()) {
Add({DT_JMPREL, In<ELFT>::RelaPlt}); add({DT_JMPREL, In<ELFT>::RelaPlt});
Add({DT_PLTRELSZ, In<ELFT>::RelaPlt->getSize()}); add({DT_PLTRELSZ, In<ELFT>::RelaPlt->getSize()});
Add({Config->EMachine == EM_MIPS ? DT_MIPS_PLTGOT : DT_PLTGOT, add({Config->EMachine == EM_MIPS ? DT_MIPS_PLTGOT : DT_PLTGOT,
In<ELFT>::GotPlt}); In<ELFT>::GotPlt});
Add({DT_PLTREL, uint64_t(Config->Rela ? DT_RELA : DT_REL)}); add({DT_PLTREL, uint64_t(Config->Rela ? DT_RELA : DT_REL)});
} }
Add({DT_SYMTAB, Out<ELFT>::DynSymTab}); add({DT_SYMTAB, Out<ELFT>::DynSymTab});
Add({DT_SYMENT, sizeof(Elf_Sym)}); add({DT_SYMENT, sizeof(Elf_Sym)});
Add({DT_STRTAB, In<ELFT>::DynStrTab}); add({DT_STRTAB, In<ELFT>::DynStrTab});
Add({DT_STRSZ, In<ELFT>::DynStrTab->getSize()}); add({DT_STRSZ, In<ELFT>::DynStrTab->getSize()});
if (Out<ELFT>::GnuHashTab) if (Out<ELFT>::GnuHashTab)
Add({DT_GNU_HASH, Out<ELFT>::GnuHashTab}); add({DT_GNU_HASH, Out<ELFT>::GnuHashTab});
if (Out<ELFT>::HashTab) if (Out<ELFT>::HashTab)
Add({DT_HASH, Out<ELFT>::HashTab}); add({DT_HASH, Out<ELFT>::HashTab});
if (Out<ELFT>::PreinitArray) { if (Out<ELFT>::PreinitArray) {
Add({DT_PREINIT_ARRAY, Out<ELFT>::PreinitArray}); add({DT_PREINIT_ARRAY, Out<ELFT>::PreinitArray});
Add({DT_PREINIT_ARRAYSZ, Out<ELFT>::PreinitArray, Entry::SecSize}); add({DT_PREINIT_ARRAYSZ, Out<ELFT>::PreinitArray, Entry::SecSize});
} }
if (Out<ELFT>::InitArray) { if (Out<ELFT>::InitArray) {
Add({DT_INIT_ARRAY, Out<ELFT>::InitArray}); add({DT_INIT_ARRAY, Out<ELFT>::InitArray});
Add({DT_INIT_ARRAYSZ, Out<ELFT>::InitArray, Entry::SecSize}); add({DT_INIT_ARRAYSZ, Out<ELFT>::InitArray, Entry::SecSize});
} }
if (Out<ELFT>::FiniArray) { if (Out<ELFT>::FiniArray) {
Add({DT_FINI_ARRAY, Out<ELFT>::FiniArray}); add({DT_FINI_ARRAY, Out<ELFT>::FiniArray});
Add({DT_FINI_ARRAYSZ, Out<ELFT>::FiniArray, Entry::SecSize}); add({DT_FINI_ARRAYSZ, Out<ELFT>::FiniArray, Entry::SecSize});
} }
if (SymbolBody *B = Symtab<ELFT>::X->find(Config->Init)) if (SymbolBody *B = Symtab<ELFT>::X->find(Config->Init))
Add({DT_INIT, B}); add({DT_INIT, B});
if (SymbolBody *B = Symtab<ELFT>::X->find(Config->Fini)) if (SymbolBody *B = Symtab<ELFT>::X->find(Config->Fini))
Add({DT_FINI, B}); add({DT_FINI, B});
bool HasVerNeed = Out<ELFT>::VerNeed->getNeedNum() != 0; bool HasVerNeed = Out<ELFT>::VerNeed->getNeedNum() != 0;
if (HasVerNeed || Out<ELFT>::VerDef) if (HasVerNeed || Out<ELFT>::VerDef)
Add({DT_VERSYM, Out<ELFT>::VerSym}); add({DT_VERSYM, Out<ELFT>::VerSym});
if (Out<ELFT>::VerDef) { if (Out<ELFT>::VerDef) {
Add({DT_VERDEF, Out<ELFT>::VerDef}); add({DT_VERDEF, Out<ELFT>::VerDef});
Add({DT_VERDEFNUM, getVerDefNum()}); add({DT_VERDEFNUM, getVerDefNum()});
} }
if (HasVerNeed) { if (HasVerNeed) {
Add({DT_VERNEED, Out<ELFT>::VerNeed}); add({DT_VERNEED, Out<ELFT>::VerNeed});
Add({DT_VERNEEDNUM, Out<ELFT>::VerNeed->getNeedNum()}); add({DT_VERNEEDNUM, Out<ELFT>::VerNeed->getNeedNum()});
} }
if (Config->EMachine == EM_MIPS) { if (Config->EMachine == EM_MIPS) {
Add({DT_MIPS_RLD_VERSION, 1}); add({DT_MIPS_RLD_VERSION, 1});
Add({DT_MIPS_FLAGS, RHF_NOTPOT}); add({DT_MIPS_FLAGS, RHF_NOTPOT});
Add({DT_MIPS_BASE_ADDRESS, Config->ImageBase}); add({DT_MIPS_BASE_ADDRESS, Config->ImageBase});
Add({DT_MIPS_SYMTABNO, Out<ELFT>::DynSymTab->getNumSymbols()}); add({DT_MIPS_SYMTABNO, Out<ELFT>::DynSymTab->getNumSymbols()});
Add({DT_MIPS_LOCAL_GOTNO, In<ELFT>::MipsGot->getMipsLocalEntriesNum()}); add({DT_MIPS_LOCAL_GOTNO, In<ELFT>::MipsGot->getMipsLocalEntriesNum()});
if (const SymbolBody *B = In<ELFT>::MipsGot->getMipsFirstGlobalEntry()) if (const SymbolBody *B = In<ELFT>::MipsGot->getMipsFirstGlobalEntry())
Add({DT_MIPS_GOTSYM, B->DynsymIndex}); add({DT_MIPS_GOTSYM, B->DynsymIndex});
else else
Add({DT_MIPS_GOTSYM, Out<ELFT>::DynSymTab->getNumSymbols()}); add({DT_MIPS_GOTSYM, Out<ELFT>::DynSymTab->getNumSymbols()});
Add({DT_PLTGOT, In<ELFT>::MipsGot}); add({DT_PLTGOT, In<ELFT>::MipsGot});
if (Out<ELFT>::MipsRldMap) if (Out<ELFT>::MipsRldMap)
Add({DT_MIPS_RLD_MAP, Out<ELFT>::MipsRldMap}); add({DT_MIPS_RLD_MAP, Out<ELFT>::MipsRldMap});
} }
this->OutSec->Entsize = this->Entsize; this->OutSec->Entsize = this->Entsize;
......
...@@ -334,7 +334,7 @@ public: ...@@ -334,7 +334,7 @@ public:
private: private:
void addEntries(); void addEntries();
void Add(Entry E) { Entries.push_back(E); } void add(Entry E) { Entries.push_back(E); }
uintX_t Size = 0; uintX_t Size = 0;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment