diff options
-rw-r--r-- | include/llvm/Object/ELFYAML.h | 8 | ||||
-rw-r--r-- | lib/Object/ELFYAML.cpp | 14 | ||||
-rw-r--r-- | test/Object/Inputs/ELF/BE32.yaml | 2 | ||||
-rw-r--r-- | test/Object/Inputs/ELF/BE64.yaml | 2 | ||||
-rw-r--r-- | test/Object/Inputs/ELF/Header.yaml | 2 | ||||
-rw-r--r-- | test/Object/Inputs/ELF/LE32.yaml | 2 | ||||
-rw-r--r-- | test/Object/Inputs/ELF/LE64.yaml | 2 | ||||
-rw-r--r-- | tools/yaml2obj/yaml2elf.cpp | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/include/llvm/Object/ELFYAML.h b/include/llvm/Object/ELFYAML.h index d0067caeee..029a8ab2e5 100644 --- a/include/llvm/Object/ELFYAML.h +++ b/include/llvm/Object/ELFYAML.h @@ -39,7 +39,7 @@ LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFDATA) // For now, hardcode 64 bits everywhere that 32 or 64 would be needed // since 64-bit can hold 32-bit values too. -struct Header { +struct FileHeader { ELF_ELFCLASS Class; ELF_ELFDATA Data; ELF_ET Type; @@ -47,7 +47,7 @@ struct Header { llvm::yaml::Hex64 Entry; }; struct Object { - Header Header; + FileHeader Header; }; } // end namespace ELFYAML @@ -77,8 +77,8 @@ struct ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA> { }; template <> -struct MappingTraits<ELFYAML::Header> { - static void mapping(IO &IO, ELFYAML::Header &Header); +struct MappingTraits<ELFYAML::FileHeader> { + static void mapping(IO &IO, ELFYAML::FileHeader &FileHdr); }; template <> diff --git a/lib/Object/ELFYAML.cpp b/lib/Object/ELFYAML.cpp index c4f3fc187a..fcd4091fb7 100644 --- a/lib/Object/ELFYAML.cpp +++ b/lib/Object/ELFYAML.cpp @@ -212,16 +212,16 @@ void ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA>::enumeration( #undef ECase } -void MappingTraits<ELFYAML::Header>::mapping(IO &IO, ELFYAML::Header &Header) { - IO.mapRequired("Class", Header.Class); - IO.mapRequired("Data", Header.Data); - IO.mapRequired("Type", Header.Type); - IO.mapRequired("Machine", Header.Machine); - IO.mapOptional("Entry", Header.Entry, Hex64(0)); +void MappingTraits<ELFYAML::FileHeader>::mapping(IO &IO, ELFYAML::FileHeader &FileHdr) { + IO.mapRequired("Class", FileHdr.Class); + IO.mapRequired("Data", FileHdr.Data); + IO.mapRequired("Type", FileHdr.Type); + IO.mapRequired("Machine", FileHdr.Machine); + IO.mapOptional("Entry", FileHdr.Entry, Hex64(0)); } void MappingTraits<ELFYAML::Object>::mapping(IO &IO, ELFYAML::Object &Object) { - IO.mapRequired("Header", Object.Header); + IO.mapRequired("FileHeader", Object.Header); } } // end namespace yaml diff --git a/test/Object/Inputs/ELF/BE32.yaml b/test/Object/Inputs/ELF/BE32.yaml index 3709ff70cd..2a18d6fca7 100644 --- a/test/Object/Inputs/ELF/BE32.yaml +++ b/test/Object/Inputs/ELF/BE32.yaml @@ -1,5 +1,5 @@ !ELF -Header: !Header +FileHeader: !FileHeader Class: ELFCLASS32 Data: ELFDATA2MSB Type: ET_EXEC diff --git a/test/Object/Inputs/ELF/BE64.yaml b/test/Object/Inputs/ELF/BE64.yaml index d1c4401c0c..091793f395 100644 --- a/test/Object/Inputs/ELF/BE64.yaml +++ b/test/Object/Inputs/ELF/BE64.yaml @@ -1,5 +1,5 @@ !ELF -Header: !Header +FileHeader: !FileHeader Class: ELFCLASS64 Data: ELFDATA2MSB Type: ET_EXEC diff --git a/test/Object/Inputs/ELF/Header.yaml b/test/Object/Inputs/ELF/Header.yaml index 085b12077d..39f98147be 100644 --- a/test/Object/Inputs/ELF/Header.yaml +++ b/test/Object/Inputs/ELF/Header.yaml @@ -1,5 +1,5 @@ !ELF -Header: !Header +FileHeader: !FileHeader Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_EXEC diff --git a/test/Object/Inputs/ELF/LE32.yaml b/test/Object/Inputs/ELF/LE32.yaml index a4f30fbb80..021fb0d93c 100644 --- a/test/Object/Inputs/ELF/LE32.yaml +++ b/test/Object/Inputs/ELF/LE32.yaml @@ -1,5 +1,5 @@ !ELF -Header: !Header +FileHeader: !FileHeader Class: ELFCLASS32 Data: ELFDATA2LSB Type: ET_EXEC diff --git a/test/Object/Inputs/ELF/LE64.yaml b/test/Object/Inputs/ELF/LE64.yaml index cd0ca2545b..2fefc0b0c9 100644 --- a/test/Object/Inputs/ELF/LE64.yaml +++ b/test/Object/Inputs/ELF/LE64.yaml @@ -1,5 +1,5 @@ !ELF -Header: !Header +FileHeader: !FileHeader Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_EXEC diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp index d59594236f..45ccb629e7 100644 --- a/tools/yaml2obj/yaml2elf.cpp +++ b/tools/yaml2obj/yaml2elf.cpp @@ -24,7 +24,7 @@ using namespace llvm; template <class ELFT> static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { - const ELFYAML::Header &Hdr = Doc.Header; + const ELFYAML::FileHeader &Hdr = Doc.Header; using namespace llvm::ELF; using namespace llvm::object; typename ELFObjectFile<ELFT>::Elf_Ehdr Header; |