Revert r361630 "[llvm-readelf] - Allow dumping of the .dynamic section even if there is no PT_DYNAMIC header."
It broke BB:
http://lab.llvm.org:8011/builders/ppc64le-lld-multistage-test/builds/3748
llvm-svn: 361631
diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp
index b86a6c1..159e300 100644
--- a/llvm/tools/llvm-readobj/ELFDumper.cpp
+++ b/llvm/tools/llvm-readobj/ELFDumper.cpp
@@ -1331,7 +1331,6 @@
template <typename ELFT>
void ELFDumper<ELFT>::loadDynamicTable(const ELFFile<ELFT> *Obj) {
- // Try to locate the PT_DYNAMIC header.
const Elf_Phdr *DynamicPhdr = nullptr;
for (const Elf_Phdr &Phdr : unwrapOrError(Obj->program_headers())) {
if (Phdr.p_type != ELF::PT_DYNAMIC)
@@ -1340,6 +1339,11 @@
break;
}
+ // We do not want to dump dynamic section if we have no PT_DYNAMIC header.
+ // This matches GNU's behavior.
+ if (!DynamicPhdr)
+ return;
+
// Try to locate the .dynamic section in the sections header table.
const Elf_Shdr *DynamicSec = nullptr;
for (const Elf_Shdr &Sec : unwrapOrError(Obj->sections())) {
@@ -1354,16 +1358,9 @@
// Ignore sh_entsize and use the expected value for entry size explicitly.
// This allows us to dump the dynamic sections with a broken sh_entsize
// field.
- if (DynamicSec) {
+ if (DynamicSec)
DynamicTable = checkDRI({ObjF->getELFFile()->base() + DynamicSec->sh_offset,
DynamicSec->sh_size, sizeof(Elf_Dyn)});
- parseDynamicTable();
- }
-
- // If we have a PT_DYNAMIC header, we will either check the found dynamic
- // section or take the dynamic table data directly from the header.
- if (!DynamicPhdr)
- return;
if (DynamicPhdr->p_offset + DynamicPhdr->p_filesz >
ObjF->getMemoryBufferRef().getBufferSize())
@@ -1377,6 +1374,7 @@
}
StringRef Name = unwrapOrError(Obj->getSectionName(DynamicSec));
+
if (DynamicSec->sh_addr + DynamicSec->sh_size >
DynamicPhdr->p_vaddr + DynamicPhdr->p_memsz ||
DynamicSec->sh_addr < DynamicPhdr->p_vaddr)
@@ -1388,6 +1386,8 @@
reportWarning("The SHT_DYNAMIC section '" + Name +
"' is not at the start of "
"PT_DYNAMIC segment");
+
+ parseDynamicTable();
}
template <typename ELFT>