[PATCH] D67054: [yaml2obj] Make e_phoff 0 if there are no program headers

[Alex Brachet via Phabricator via llvm-commits]

abrachet updated this revision to Diff 218401.
abrachet added a comment.

Made e_phentsize 0 when there are no program headers too.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67054/new/

https://reviews.llvm.org/D67054

Files:
  llvm/lib/ObjectYAML/ELFEmitter.cpp
  llvm/test/tools/yaml2obj/elf-no-phdrs.yaml


Index: llvm/test/tools/yaml2obj/elf-no-phdrs.yaml
===================================================================
--- /dev/null
+++ llvm/test/tools/yaml2obj/elf-no-phdrs.yaml
@@ -0,0 +1,14 @@
+## Check that e_phoff is set to 0 when there are no program headers.
+
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck %s
+
+# CHECK: ProgramHeaderOffset: 0x0
+# CHECK: ProgramHeaderEntrySize: 0
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_REL
+  Machine: EM_X86_64
Index: llvm/lib/ObjectYAML/ELFEmitter.cpp
===================================================================
--- llvm/lib/ObjectYAML/ELFEmitter.cpp
+++ llvm/lib/ObjectYAML/ELFEmitter.cpp
@@ -225,10 +225,10 @@
   Header.e_machine = Doc.Header.Machine;
   Header.e_version = EV_CURRENT;
   Header.e_entry = Doc.Header.Entry;
-  Header.e_phoff = sizeof(Header);
+  Header.e_phoff = Doc.ProgramHeaders.size() ? sizeof(Header) : 0;
   Header.e_flags = Doc.Header.Flags;
   Header.e_ehsize = sizeof(Elf_Ehdr);
-  Header.e_phentsize = sizeof(Elf_Phdr);
+  Header.e_phentsize = Doc.ProgramHeaders.size() ? sizeof(Elf_Phdr) : 0;
   Header.e_phnum = Doc.ProgramHeaders.size();
 
   Header.e_shentsize =


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67054.218401.patch
Type: text/x-patch
Size: 1228 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190903/c7ad949b/attachment.bin>