diff options
-rw-r--r-- | llvm/test/tools/yaml2obj/dynamic-section.yaml | 17 | ||||
-rw-r--r-- | llvm/tools/yaml2obj/yaml2elf.cpp | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/llvm/test/tools/yaml2obj/dynamic-section.yaml b/llvm/test/tools/yaml2obj/dynamic-section.yaml new file mode 100644 index 00000000000..39da5c1f6f0 --- /dev/null +++ b/llvm/test/tools/yaml2obj/dynamic-section.yaml @@ -0,0 +1,17 @@ +# Ensures that dynamic section has sh_entsize correctly set +# RUN: yaml2obj %s -o %t +# RUN: llvm-readobj -sections %t | FileCheck %s --check-prefix=SECTION + +!ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN + Machine: EM_X86_64 +Sections: + - Name: .dynamic + Type: SHT_DYNAMIC + Flags: [ SHF_ALLOC, SHF_WRITE ] + +# SECTION: Name: .dynamic +# SECTION: EntrySize: 16 diff --git a/llvm/tools/yaml2obj/yaml2elf.cpp b/llvm/tools/yaml2obj/yaml2elf.cpp index 4dc5215a1a5..7ca5ac206c9 100644 --- a/llvm/tools/yaml2obj/yaml2elf.cpp +++ b/llvm/tools/yaml2obj/yaml2elf.cpp @@ -115,6 +115,7 @@ class ELFState { typedef typename ELFT::Rel Elf_Rel; typedef typename ELFT::Rela Elf_Rela; typedef typename ELFT::Relr Elf_Relr; + typedef typename ELFT::Dyn Elf_Dyn; enum class SymtabType { Static, Dynamic }; @@ -462,6 +463,8 @@ ELFState<ELFT>::writeSectionContent(Elf_Shdr &SHeader, OS.write(0); if (Section.Type == llvm::ELF::SHT_RELR) SHeader.sh_entsize = sizeof(Elf_Relr); + else if (Section.Type == llvm::ELF::SHT_DYNAMIC) + SHeader.sh_entsize = sizeof(Elf_Dyn); else SHeader.sh_entsize = 0; SHeader.sh_size = Section.Size; |