diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-06-27 19:53:53 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-06-27 19:53:53 +0000 |
| commit | 8ff0c113575167809365d2de5f6a204ff9c9c2bb (patch) | |
| tree | bcfa2a036127dcd47a729941ec0389ec8022af0c /llvm/test/tools/llvm-readobj | |
| parent | f0fa61ffcfc8550f1b4282e456b3763d71b60c76 (diff) | |
| download | bcm5719-llvm-8ff0c113575167809365d2de5f6a204ff9c9c2bb.tar.gz bcm5719-llvm-8ff0c113575167809365d2de5f6a204ff9c9c2bb.zip | |
[yaml2obj] Remove --format option in favor of YAML tags
Summary:
Our YAML library's handling of tags isn't perfect, but it is good enough to get rid of the need for the --format argument to yaml2obj. This patch does exactly that.
Instead of requiring --format, it infers the format based on the tags found in the object file. The supported tags are:
!ELF
!COFF
!mach-o
!fat-mach-o
I have a corresponding patch that is quite large that fixes up all the in-tree test cases.
Reviewers: rafael, Bigcheese, compnerd, silvas
Subscribers: compnerd, llvm-commits
Differential Revision: http://reviews.llvm.org/D21711
llvm-svn: 273915
Diffstat (limited to 'llvm/test/tools/llvm-readobj')
3 files changed, 10 insertions, 8 deletions
diff --git a/llvm/test/tools/llvm-readobj/Inputs/file-aux-record.yaml b/llvm/test/tools/llvm-readobj/Inputs/file-aux-record.yaml index 89d6761a26d..2f74a9a6ef4 100644 --- a/llvm/test/tools/llvm-readobj/Inputs/file-aux-record.yaml +++ b/llvm/test/tools/llvm-readobj/Inputs/file-aux-record.yaml @@ -1,3 +1,4 @@ +!COFF header: !Header Machine: IMAGE_FILE_MACHINE_I386 # (0x14c) Characteristics: [ IMAGE_FILE_DEBUG_STRIPPED ] diff --git a/llvm/test/tools/llvm-readobj/Inputs/file-multiple-aux-records.yaml b/llvm/test/tools/llvm-readobj/Inputs/file-multiple-aux-records.yaml index d5b1eec878b..42946b4fafb 100644 --- a/llvm/test/tools/llvm-readobj/Inputs/file-multiple-aux-records.yaml +++ b/llvm/test/tools/llvm-readobj/Inputs/file-multiple-aux-records.yaml @@ -1,3 +1,4 @@ +!COFF header: !Header Machine: IMAGE_FILE_MACHINE_I386 # (0x14c) Characteristics: [ IMAGE_FILE_DEBUG_STRIPPED ] diff --git a/llvm/test/tools/llvm-readobj/elf-sec-flags.test b/llvm/test/tools/llvm-readobj/elf-sec-flags.test index 95a417a054f..842ded3e9e5 100644 --- a/llvm/test/tools/llvm-readobj/elf-sec-flags.test +++ b/llvm/test/tools/llvm-readobj/elf-sec-flags.test @@ -1,6 +1,6 @@ # Check that llvm-readobj shows arch specific ELF section flags. -# RUN: yaml2obj -format=elf -docnum 1 %s > %t-amdgpu.o +# RUN: yaml2obj -docnum 1 %s > %t-amdgpu.o # RUN: llvm-readobj -s %t-amdgpu.o | FileCheck -check-prefix=AMD %s # AMD: Flags [ (0x300000) @@ -9,7 +9,7 @@ # AMD-NEXT: ] # amdgpu.o ---- +--- !ELF FileHeader: Class: ELFCLASS64 Data: ELFDATA2LSB @@ -23,7 +23,7 @@ Sections: Flags: [SHF_AMDGPU_HSA_GLOBAL, SHF_AMDGPU_HSA_READONLY] Size: 4 -# RUN: yaml2obj -format=elf -docnum 2 %s > %t-hex.o +# RUN: yaml2obj -docnum 2 %s > %t-hex.o # RUN: llvm-readobj -s %t-hex.o | FileCheck -check-prefix=HEX %s # HEX: Flags [ (0x10000000) @@ -31,7 +31,7 @@ Sections: # HEX-NEXT: ] # hex.o ---- +--- !ELF FileHeader: Class: ELFCLASS32 Data: ELFDATA2LSB @@ -44,7 +44,7 @@ Sections: Flags: [SHF_HEX_GPREL] Size: 4 -# RUN: yaml2obj -format=elf -docnum 3 %s > %t-mips.o +# RUN: yaml2obj -docnum 3 %s > %t-mips.o # RUN: llvm-readobj -s %t-mips.o | FileCheck -check-prefix=MIPS %s # MIPS: Flags [ (0x38000000) @@ -54,7 +54,7 @@ Sections: # MIPS-NEXT: ] # mips.o ---- +--- !ELF FileHeader: Class: ELFCLASS32 Data: ELFDATA2LSB @@ -67,7 +67,7 @@ Sections: Flags: [SHF_MIPS_GPREL, SHF_MIPS_MERGE, SHF_MIPS_NOSTRIP] Size: 4 -# RUN: yaml2obj -format=elf -docnum 4 %s > %t-x86_64.o +# RUN: yaml2obj -docnum 4 %s > %t-x86_64.o # RUN: llvm-readobj -s %t-x86_64.o | FileCheck -check-prefix=X86_64 %s # X86_64: Flags [ (0x10000000) @@ -75,7 +75,7 @@ Sections: # X86_64-NEXT: ] # x86_64.o ---- +--- !ELF FileHeader: Class: ELFCLASS64 Data: ELFDATA2LSB |
