diff options
| -rw-r--r-- | llvm/lib/ObjectYAML/ELFYAML.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/tools/obj2yaml/section-type.yaml | 28 | ||||
| -rw-r--r-- | llvm/test/tools/yaml2obj/section-type.yaml | 27 |
3 files changed, 56 insertions, 3 deletions
diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp index 8460ad04cd0..7c52a6c31e4 100644 --- a/llvm/lib/ObjectYAML/ELFYAML.cpp +++ b/llvm/lib/ObjectYAML/ELFYAML.cpp @@ -446,7 +446,6 @@ void ScalarEnumerationTraits<ELFYAML::ELF_SHT>::enumeration( ECase(SHT_GROUP); ECase(SHT_SYMTAB_SHNDX); ECase(SHT_RELR); - ECase(SHT_LOOS); ECase(SHT_ANDROID_REL); ECase(SHT_ANDROID_RELA); ECase(SHT_ANDROID_RELR); @@ -459,8 +458,6 @@ void ScalarEnumerationTraits<ELFYAML::ELF_SHT>::enumeration( ECase(SHT_GNU_verdef); ECase(SHT_GNU_verneed); ECase(SHT_GNU_versym); - ECase(SHT_HIOS); - ECase(SHT_LOPROC); switch (Object->Header.Machine) { case ELF::EM_ARM: ECase(SHT_ARM_EXIDX); @@ -485,6 +482,7 @@ void ScalarEnumerationTraits<ELFYAML::ELF_SHT>::enumeration( break; } #undef ECase + IO.enumFallback<Hex32>(Value); } void ScalarBitSetTraits<ELFYAML::ELF_PF>::bitset(IO &IO, diff --git a/llvm/test/tools/obj2yaml/section-type.yaml b/llvm/test/tools/obj2yaml/section-type.yaml new file mode 100644 index 00000000000..ca054ebcd62 --- /dev/null +++ b/llvm/test/tools/obj2yaml/section-type.yaml @@ -0,0 +1,28 @@ +# RUN: yaml2obj %s -o %t +# RUN: obj2yaml %t | FileCheck %s + +# CHECK: Sections: +# CHECK-NEXT: - Name: known_type +# CHECK-NEXT: Type: SHT_PROGBITS +# CHECK: - Name: unknown_type +# CHECK-NEXT: Type: 0x0000ABCD +# CHECK: - Name: machine_specific +# CHECK-NEXT: Type: SHT_X86_64_UNWIND +# CHECK: - Name: unknown_machine_specific +# CHECK-NEXT: Type: 0x70000000 + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Sections: + - Name: known_type + Type: SHT_PROGBITS + - Name: unknown_type + Type: 0xabcd + - Name: machine_specific + Type: SHT_X86_64_UNWIND + - Name: unknown_machine_specific + Type: 0x70000000 diff --git a/llvm/test/tools/yaml2obj/section-type.yaml b/llvm/test/tools/yaml2obj/section-type.yaml new file mode 100644 index 00000000000..ad2edd942cc --- /dev/null +++ b/llvm/test/tools/yaml2obj/section-type.yaml @@ -0,0 +1,27 @@ +# RUN: yaml2obj %s -o %t +# RUN: llvm-readobj --sections %t | FileCheck %s + +# CHECK: Name: enum +# CHECK: Type: SHT_PROGBITS +# CHECK: Name: machine-specific +# CHECK: Type: SHT_X86_64_UNWIND +# CHECK: Name: hex +# CHECK: Type: Unknown (0xABCD) +# CHECK: Name: decimal +# CHECK: Type: Unknown (0x4D2) + +--- !ELF +FileHeader: + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_X86_64 +Sections: + - Name: enum + Type: SHT_PROGBITS + - Name: machine-specific + Type: SHT_X86_64_UNWIND + - Name: hex + Type: 0xabcd + - Name: decimal + Type: 1234 |
