[lld] r256442 - Split Writer::createSections even more. NFC.
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Fri Dec 25 23:50:42 PST 2015
Author: ruiu
Date: Sat Dec 26 01:50:41 2015
New Revision: 256442
URL: http://llvm.org/viewvc/llvm-project?rev=256442&view=rev
Log:
Split Writer::createSections even more. NFC.
Modified:
lld/trunk/ELF/Writer.cpp
Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=256442&r1=256441&r2=256442&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Sat Dec 26 01:50:41 2015
@@ -44,6 +44,7 @@ private:
void copyLocalSymbols();
void addReservedSymbols();
void createSections();
+ void addPredefinedSections();
template <bool isRela>
void scanRelocs(InputSectionBase<ELFT> &C,
@@ -758,6 +759,11 @@ template <class ELFT> void Writer<ELFT>:
Out<ELFT>::Bss = static_cast<OutputSection<ELFT> *>(
Factory.lookup(".bss", SHT_NOBITS, SHF_ALLOC | SHF_WRITE));
+ // If we have a .opd section (used under PPC64 for function descriptors),
+ // store a pointer to it here so that we can use it later when processing
+ // relocations.
+ Out<ELFT>::Opd = Factory.lookup(".opd", SHT_PROGBITS, SHF_WRITE | SHF_ALLOC);
+
Out<ELFT>::Dynamic->PreInitArraySec = Factory.lookup(
".preinit_array", SHT_PREINIT_ARRAY, SHF_WRITE | SHF_ALLOC);
Out<ELFT>::Dynamic->InitArraySec =
@@ -827,6 +833,36 @@ template <class ELFT> void Writer<ELFT>:
addCommonSymbols(CommonSymbols);
addSharedCopySymbols(SharedCopySymbols);
+ // So far we have added sections from input object files.
+ // This function adds linker-created Out<ELFT>::* sections.
+ addPredefinedSections();
+
+ std::stable_sort(OutputSections.begin(), OutputSections.end(),
+ compareSections<ELFT>);
+
+ for (unsigned I = 0, N = OutputSections.size(); I < N; ++I) {
+ OutputSections[I]->SectionIndex = I + 1;
+ HasRelro |= (Config->ZRelro && isRelroSection(OutputSections[I]));
+ }
+
+ for (OutputSectionBase<ELFT> *Sec : OutputSections)
+ Out<ELFT>::ShStrTab->add(Sec->getName());
+
+ // Finalizers fix each section's size.
+ // .dynamic section's finalizer may add strings to .dynstr,
+ // so finalize that early.
+ // Likewise, .dynsym is finalized early since that may fill up .gnu.hash.
+ Out<ELFT>::Dynamic->finalize();
+ if (isOutputDynamic())
+ Out<ELFT>::DynSymTab->finalize();
+
+ // Fill other section headers.
+ for (OutputSectionBase<ELFT> *Sec : OutputSections)
+ Sec->finalize();
+}
+
+// This function add Out<ELFT>::* sections to OutputSections.
+template <class ELFT> void Writer<ELFT>::addPredefinedSections() {
// This order is not the same as the final output order
// because we sort the sections using their attributes below.
if (Out<ELFT>::SymTab)
@@ -881,34 +917,6 @@ template <class ELFT> void Writer<ELFT>:
OutputSections.push_back(Out<ELFT>::GotPlt);
if (!Out<ELFT>::Plt->empty())
OutputSections.push_back(Out<ELFT>::Plt);
-
- std::stable_sort(OutputSections.begin(), OutputSections.end(),
- compareSections<ELFT>);
-
- for (unsigned I = 0, N = OutputSections.size(); I < N; ++I) {
- OutputSections[I]->SectionIndex = I + 1;
- HasRelro |= (Config->ZRelro && isRelroSection(OutputSections[I]));
- }
-
- for (OutputSectionBase<ELFT> *Sec : OutputSections)
- Out<ELFT>::ShStrTab->add(Sec->getName());
-
- // Finalizers fix each section's size.
- // .dynamic section's finalizer may add strings to .dynstr,
- // so finalize that early.
- // Likewise, .dynsym is finalized early since that may fill up .gnu.hash.
- Out<ELFT>::Dynamic->finalize();
- if (isOutputDynamic())
- Out<ELFT>::DynSymTab->finalize();
-
- // Fill other section headers.
- for (OutputSectionBase<ELFT> *Sec : OutputSections)
- Sec->finalize();
-
- // If we have a .opd section (used under PPC64 for function descriptors),
- // store a pointer to it here so that we can use it later when processing
- // relocations.
- Out<ELFT>::Opd = Factory.lookup(".opd", SHT_PROGBITS, SHF_WRITE | SHF_ALLOC);
}
static bool isAlpha(char C) {
More information about the llvm-commits
mailing list