Skip to content

Commit 0b69c59

Browse files
committed
[yaml2obj] Make e_phoff and e_phentsize 0 if there are no program headers
Summary: It says [[ http://www.sco.com/developers/gabi/latest/ch4.eheader.html | here ]] that if there are no program headers than e_phoff should be 0, but currently it is always set after the header. GNU's `readelf` (but not `llvm-readelf`) complains about this: `readelf: Warning: possibly corrupt ELF header - it has a non-zero program header offset, but no program headers`. Reviewers: jhenderson, grimar, MaskRay, rupprecht Reviewed By: jhenderson, grimar, MaskRay Subscribers: hiraditya, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D67054 llvm-svn: 371162
1 parent b1cf175 commit 0b69c59

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

llvm/lib/ObjectYAML/ELFEmitter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ void ELFState<ELFT>::writeELFHeader(ContiguousBlobAccumulator &CBA, raw_ostream
224224
Header.e_machine = Doc.Header.Machine;
225225
Header.e_version = EV_CURRENT;
226226
Header.e_entry = Doc.Header.Entry;
227-
Header.e_phoff = sizeof(Header);
227+
Header.e_phoff = Doc.ProgramHeaders.size() ? sizeof(Header) : 0;
228228
Header.e_flags = Doc.Header.Flags;
229229
Header.e_ehsize = sizeof(Elf_Ehdr);
230-
Header.e_phentsize = sizeof(Elf_Phdr);
230+
Header.e_phentsize = Doc.ProgramHeaders.size() ? sizeof(Elf_Phdr) : 0;
231231
Header.e_phnum = Doc.ProgramHeaders.size();
232232

233233
Header.e_shentsize =
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Check that e_phoff and e_phentsize are set to 0 when there are no
2+
## program headers.
3+
4+
# RUN: yaml2obj %s -o %t
5+
# RUN: llvm-readobj --file-headers %t | FileCheck %s
6+
7+
# CHECK: ProgramHeaderOffset: 0x0{{$}}
8+
# CHECK: ProgramHeaderEntrySize: 0{{$}}
9+
10+
--- !ELF
11+
FileHeader:
12+
Class: ELFCLASS64
13+
Data: ELFDATA2LSB
14+
Type: ET_REL
15+
Machine: EM_X86_64

0 commit comments

Comments
 (0)