Skip to content

Commit 6367d7a

Browse files
author
George Rimar
committed
[yaml2obj/obj2yaml] - Support dumping/parsing ABI version.
These tools were assuming ABI version is 0, that is not always true. Patch teaches them to work with that field. Differential revision: https://reviews.llvm.org/D55884 llvm-svn: 349737
1 parent cd51ffa commit 6367d7a

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

llvm/include/llvm/ObjectYAML/ELFYAML.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ struct FileHeader {
6868
ELF_ELFCLASS Class;
6969
ELF_ELFDATA Data;
7070
ELF_ELFOSABI OSABI;
71+
llvm::yaml::Hex8 ABIVersion;
7172
ELF_ET Type;
7273
ELF_EM Machine;
7374
ELF_EF Flags;

llvm/lib/ObjectYAML/ELFYAML.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,7 @@ void MappingTraits<ELFYAML::FileHeader>::mapping(IO &IO,
753753
IO.mapRequired("Class", FileHdr.Class);
754754
IO.mapRequired("Data", FileHdr.Data);
755755
IO.mapOptional("OSABI", FileHdr.OSABI, ELFYAML::ELF_ELFOSABI(0));
756+
IO.mapOptional("ABIVersion", FileHdr.ABIVersion, Hex8(0));
756757
IO.mapRequired("Type", FileHdr.Type);
757758
IO.mapRequired("Machine", FileHdr.Machine);
758759
IO.mapOptional("Flags", FileHdr.Flags, ELFYAML::ELF_EF(0));
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# RUN: yaml2obj %s -o %t
2+
# RUN: llvm-readobj -file-headers %t | FileCheck %s --check-prefix=FROMYAML
3+
# RUN: obj2yaml %t | FileCheck %s --check-prefix=TOYAML
4+
5+
## Check we are able to parse/emit the ABI version with yaml2obj/obj2yaml.
6+
7+
# FROMYAML: ABIVersion: 5
8+
# TOYAML: ABIVersion: 0x05
9+
10+
--- !ELF
11+
FileHeader:
12+
Class: ELFCLASS64
13+
Data: ELFDATA2LSB
14+
Type: ET_REL
15+
Machine: EM_X86_64
16+
ABIVersion: 0x05

llvm/tools/obj2yaml/elf2yaml.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ template <class ELFT> ErrorOr<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
114114
Y->Header.Class = ELFYAML::ELF_ELFCLASS(Obj.getHeader()->getFileClass());
115115
Y->Header.Data = ELFYAML::ELF_ELFDATA(Obj.getHeader()->getDataEncoding());
116116
Y->Header.OSABI = Obj.getHeader()->e_ident[ELF::EI_OSABI];
117+
Y->Header.ABIVersion = Obj.getHeader()->e_ident[ELF::EI_ABIVERSION];
117118
Y->Header.Type = Obj.getHeader()->e_type;
118119
Y->Header.Machine = Obj.getHeader()->e_machine;
119120
Y->Header.Flags = Obj.getHeader()->e_flags;

llvm/tools/yaml2obj/yaml2elf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void ELFState<ELFT>::initELFHeader(Elf_Ehdr &Header) {
196196
Header.e_ident[EI_DATA] = IsLittleEndian ? ELFDATA2LSB : ELFDATA2MSB;
197197
Header.e_ident[EI_VERSION] = EV_CURRENT;
198198
Header.e_ident[EI_OSABI] = Doc.Header.OSABI;
199-
Header.e_ident[EI_ABIVERSION] = 0;
199+
Header.e_ident[EI_ABIVERSION] = Doc.Header.ABIVersion;
200200
Header.e_type = Doc.Header.Type;
201201
Header.e_machine = Doc.Header.Machine;
202202
Header.e_version = EV_CURRENT;

0 commit comments

Comments
 (0)