Index: llvm/lib/ObjectYAML/ELFEmitter.cpp
===================================================================
--- llvm/lib/ObjectYAML/ELFEmitter.cpp
+++ llvm/lib/ObjectYAML/ELFEmitter.cpp
@@ -631,6 +631,22 @@
return DotShStrtab.getOffset(Name);
}
+static uint64_t writeContent(ContiguousBlobAccumulator &CBA,
+ const Optional<yaml::BinaryRef> &Content,
+ const Optional<llvm::yaml::Hex64> &Size) {
+ size_t ContentSize = 0;
+ if (Content) {
+ CBA.writeAsBinary(*Content);
+ ContentSize = Content->binary_size();
+ }
+
+ if (!Size)
+ return ContentSize;
+
+ CBA.writeZeros(*Size - ContentSize);
+ return *Size;
+}
+
template <class ELFT>
void ELFState<ELFT>::initSectionHeaders(std::vector<Elf_Shdr> &SHeaders,
ContiguousBlobAccumulator &CBA) {
@@ -690,7 +706,16 @@
}
if (Sec->EntSize)
SHeader.sh_entsize = *Sec->EntSize;
- } else if (auto S = dyn_cast<ELFYAML::RawContentSection>(Sec)) {
+
+ LocationCounter += SHeader.sh_size;
+ overrideFields<ELFT>(Sec, SHeader);
+ continue;
+ }
+
+ if (!isa<ELFYAML::NoBitsSection>(Sec) && (Sec->Content || Sec->Size))
+ SHeader.sh_size = writeContent(CBA, Sec->Content, Sec->Size);
+
+ if (auto S = dyn_cast<ELFYAML::RawContentSection>(Sec)) {
writeSectionContent(SHeader, *S, CBA);
} else if (auto S = dyn_cast<ELFYAML::SymtabShndxSection>(Sec)) {
writeSectionContent(SHeader, *S, CBA);
@@ -769,22 +794,6 @@
return Symbols.size();
}
-static uint64_t writeContent(ContiguousBlobAccumulator &CBA,
- const Optional<yaml::BinaryRef> &Content,
- const Optional<llvm::yaml::Hex64> &Size) {
- size_t ContentSize = 0;
- if (Content) {
- CBA.writeAsBinary(*Content);
- ContentSize = Content->binary_size();
- }
-
- if (!Size)
- return ContentSize;
-
- CBA.writeZeros(*Size - ContentSize);
- return *Size;
-}
-
template <class ELFT>
std::vector<typename ELFT::Sym>
ELFState<ELFT>::toELFSymbols(ArrayRef<ELFYAML::Symbol> Symbols,
@@ -1124,9 +1133,6 @@
void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
const ELFYAML::NoBitsSection &S,
ContiguousBlobAccumulator &CBA) {
- // SHT_NOBITS sections do not have any content to write.
- SHeader.sh_entsize = 0;
-
if (!S.Size)
return;
@@ -1143,8 +1149,6 @@
void ELFState<ELFT>::writeSectionContent(
Elf_Shdr &SHeader, const ELFYAML::RawContentSection &Section,
ContiguousBlobAccumulator &CBA) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
-
if (Section.EntSize)
SHeader.sh_entsize = *Section.EntSize;
@@ -1181,11 +1185,6 @@
if (!Section.RelocatableSec.empty())
SHeader.sh_info = toSectionIndex(Section.RelocatableSec, Section.Name);
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Relocations)
return;
@@ -1220,11 +1219,6 @@
SHeader.sh_entsize =
Section.EntSize ? uint64_t(*Section.EntSize) : sizeof(Elf_Relr);
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Entries)
return;
@@ -1275,11 +1269,6 @@
SHeader.sh_info =
toSymbolIndex(*Section.Signature, Section.Name, /*IsDynamic=*/false);
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Members)
return;
@@ -1300,11 +1289,6 @@
ContiguousBlobAccumulator &CBA) {
SHeader.sh_entsize = Section.EntSize ? (uint64_t)*Section.EntSize : 2;
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (Section.Entries) {
for (uint16_t Version : *Section.Entries)
CBA.write<uint16_t>(Version, ELFT::TargetEndianness);
@@ -1316,10 +1300,8 @@
void ELFState<ELFT>::writeSectionContent(
Elf_Shdr &SHeader, const ELFYAML::StackSizesSection &Section,
ContiguousBlobAccumulator &CBA) {
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
+ if (!Section.Entries)
return;
- }
for (const ELFYAML::StackSizeEntry &E : *Section.Entries) {
CBA.write<uintX_t>(E.Address, ELFT::TargetEndianness);
@@ -1331,11 +1313,6 @@
void ELFState<ELFT>::writeSectionContent(
Elf_Shdr &SHeader, const ELFYAML::LinkerOptionsSection &Section,
ContiguousBlobAccumulator &CBA) {
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Options)
return;
@@ -1352,11 +1329,6 @@
void ELFState<ELFT>::writeSectionContent(
Elf_Shdr &SHeader, const ELFYAML::DependentLibrariesSection &Section,
ContiguousBlobAccumulator &CBA) {
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Libs)
return;
@@ -1405,11 +1377,6 @@
SN2I.lookup(".symtab", Link))
SHeader.sh_link = Link;
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Entries)
return;
@@ -1438,10 +1405,8 @@
else
SHeader.sh_entsize = sizeof(typename ELFT::Word);
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
+ if (!Section.Bucket)
return;
- }
CBA.write<uint32_t>(
Section.NBucket.getValueOr(llvm::yaml::Hex64(Section.Bucket->size())),
@@ -1467,11 +1432,6 @@
SHeader.sh_info = Section.Info;
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Entries)
return;
@@ -1517,11 +1477,6 @@
SHeader.sh_info = Section.Info;
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.VerneedV)
return;
@@ -1565,11 +1520,6 @@
void ELFState<ELFT>::writeSectionContent(
Elf_Shdr &SHeader, const ELFYAML::ARMIndexTableSection &Section,
ContiguousBlobAccumulator &CBA) {
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Entries)
return;
@@ -1618,11 +1568,6 @@
else
SHeader.sh_entsize = sizeof(Elf_Dyn);
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
- return;
- }
-
if (!Section.Entries)
return;
@@ -1642,10 +1587,8 @@
SN2I.lookup(".symtab", Link))
SHeader.sh_link = Link;
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
+ if (!Section.Symbols)
return;
- }
for (StringRef Sym : *Section.Symbols)
SHeader.sh_size +=
@@ -1656,12 +1599,10 @@
void ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader,
const ELFYAML::NoteSection &Section,
ContiguousBlobAccumulator &CBA) {
- uint64_t Offset = CBA.tell();
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
+ if (!Section.Notes)
return;
- }
+ uint64_t Offset = CBA.tell();
for (const ELFYAML::NoteEntry &NE : *Section.Notes) {
// Write name size.
if (NE.Name.empty())
@@ -1704,10 +1645,8 @@
SN2I.lookup(".dynsym", Link))
SHeader.sh_link = Link;
- if (Section.Content || Section.Size) {
- SHeader.sh_size = writeContent(CBA, Section.Content, Section.Size);
+ if (!Section.HashBuckets)
return;
- }
// We write the header first, starting with the hash buckets count. Normally
// it is the number of entries in HashBuckets, but the "NBuckets" property can