From 892c6c86ea25dc97668ff1f1b7bf1108e85fa5ec Mon Sep 17 00:00:00 2001 From: George Rimar Date: Fri, 30 Jun 2017 10:31:03 +0000 Subject: [PATCH] [YAML] - Teach yaml2obj/obj2yaml to work with numeric relocation values. That may be useful if we want to produce or parse object containing broken relocation values using yaml2obj/obj2yaml. Previously that was impossible because only enum values were parsed correctly, this patch allows to put any numeric value as a relocation type. Differential revision: https://reviews.llvm.org/D34758 llvm-svn: 306814 --- llvm/lib/ObjectYAML/ELFYAML.cpp | 1 + .../Object/X86/yaml-elf-x86-rel-broken.yaml | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 llvm/test/Object/X86/yaml-elf-x86-rel-broken.yaml diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp index dbd5498e003d..8578997fe579 100644 --- a/llvm/lib/ObjectYAML/ELFYAML.cpp +++ b/llvm/lib/ObjectYAML/ELFYAML.cpp @@ -542,6 +542,7 @@ void ScalarEnumerationTraits::enumeration( llvm_unreachable("Unsupported architecture"); } #undef ELF_RELOC + IO.enumFallback(Value); } void ScalarEnumerationTraits::enumeration( diff --git a/llvm/test/Object/X86/yaml-elf-x86-rel-broken.yaml b/llvm/test/Object/X86/yaml-elf-x86-rel-broken.yaml new file mode 100644 index 000000000000..edd5dbce1236 --- /dev/null +++ b/llvm/test/Object/X86/yaml-elf-x86-rel-broken.yaml @@ -0,0 +1,29 @@ +# RUN: yaml2obj %s > %t +# RUN: obj2yaml %t | FileCheck %s + +# CHECK: Relocations: +# CHECK-NEXT: - Offset: +# CHECK-NEXT: Symbol: +# CHECK-NEXT: Type: 0x000000FF + +!ELF +FileHeader: + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_386 +Sections: + - Type: SHT_PROGBITS + Name: .text + Flags: [ SHF_ALLOC, SHF_EXECINSTR ] + AddressAlign: 0x04 + Content: 0000000000000000 + - Type: SHT_REL + Name: .rel.text + Link: .symtab + Info: .text + AddressAlign: 0x04 + Relocations: + - Offset: 0 + Symbol: main + Type: 0xFF