[lld] r345143 - Split a function. NFC.
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 24 07:24:02 PDT 2018
Author: ruiu
Date: Wed Oct 24 07:24:01 2018
New Revision: 345143
URL: http://llvm.org/viewvc/llvm-project?rev=345143&view=rev
Log:
Split a function. 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=345143&r1=345142&r2=345143&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Wed Oct 24 07:24:01 2018
@@ -56,6 +56,7 @@ private:
void maybeAddThunks();
void sortInputSections();
void finalizeSections();
+ void checkExecuteOnly();
void setReservedSymbolSections();
std::vector<PhdrEntry *> createPhdrs();
@@ -458,6 +459,7 @@ template <class ELFT> void Writer<ELFT>:
// to the string table, and add entries to .got and .plt.
// finalizeSections does that.
finalizeSections();
+ checkExecuteOnly();
if (errorCount())
return;
@@ -483,10 +485,9 @@ template <class ELFT> void Writer<ELFT>:
setPhdrs();
- if (Config->Relocatable) {
+ if (Config->Relocatable)
for (OutputSection *Sec : OutputSections)
Sec->Addr = 0;
- }
if (Config->CheckSections)
checkSections();
@@ -1654,15 +1655,6 @@ template <class ELFT> void Writer<ELFT>:
if (auto *Sec = dyn_cast<OutputSection>(Base))
OutputSections.push_back(Sec);
- // Ensure data sections are not mixed with executable sections when
- // -execute-only is used.
- if (Config->ExecuteOnly)
- for (OutputSection *OS : OutputSections)
- if (OS->Flags & SHF_EXECINSTR)
- for (InputSection *IS : getInputSections(OS))
- if (!(IS->Flags & SHF_EXECINSTR))
- error("-execute-only does not support intermingling data and code");
-
// Prefer command line supplied address over other constraints.
for (OutputSection *Sec : OutputSections) {
auto I = Config->SectionStartMap.find(Sec->Name);
@@ -1756,6 +1748,20 @@ template <class ELFT> void Writer<ELFT>:
Sec->finalize<ELFT>();
}
+// Ensure data sections are not mixed with executable sections when
+// -execute-only is used. -execute-only is a feature to make pages executable
+// but not readable, and the feature is currently supported only on AArch64.
+template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
+ if (!Config->ExecuteOnly)
+ return;
+
+ for (OutputSection *OS : OutputSections)
+ if (OS->Flags & SHF_EXECINSTR)
+ for (InputSection *IS : getInputSections(OS))
+ if (!(IS->Flags & SHF_EXECINSTR))
+ error("-execute-only does not support intermingling data and code");
+}
+
// The linker is expected to define SECNAME_start and SECNAME_end
// symbols for a few sections. This function defines them.
template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
More information about the llvm-commits
mailing list