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/Object/Inputs | |
| 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/Object/Inputs')
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/i386.yaml | 1 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/long-file-symbol.yaml | 2 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/long-section-name.yaml | 2 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/section-aux-symbol.yaml | 2 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/weak-external.yaml | 2 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/weak-externals.yaml | 2 | ||||
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/x86-64.yaml | 1 |
7 files changed, 7 insertions, 5 deletions
diff --git a/llvm/test/Object/Inputs/COFF/i386.yaml b/llvm/test/Object/Inputs/COFF/i386.yaml index 7873df0a7e2..ad1a4f100fa 100644 --- a/llvm/test/Object/Inputs/COFF/i386.yaml +++ b/llvm/test/Object/Inputs/COFF/i386.yaml @@ -1,3 +1,4 @@ +!COFF header: !Header Machine: IMAGE_FILE_MACHINE_I386 # (0x14c) Characteristics: [ IMAGE_FILE_DEBUG_STRIPPED ] diff --git a/llvm/test/Object/Inputs/COFF/long-file-symbol.yaml b/llvm/test/Object/Inputs/COFF/long-file-symbol.yaml index 37caad79620..4a37a433e43 100644 --- a/llvm/test/Object/Inputs/COFF/long-file-symbol.yaml +++ b/llvm/test/Object/Inputs/COFF/long-file-symbol.yaml @@ -1,4 +1,4 @@ ---- +--- !COFF header: Machine: IMAGE_FILE_MACHINE_AMD64 Characteristics: [ IMAGE_FILE_RELOCS_STRIPPED, IMAGE_FILE_LINE_NUMS_STRIPPED ] diff --git a/llvm/test/Object/Inputs/COFF/long-section-name.yaml b/llvm/test/Object/Inputs/COFF/long-section-name.yaml index a86f9019cd5..12041858317 100644 --- a/llvm/test/Object/Inputs/COFF/long-section-name.yaml +++ b/llvm/test/Object/Inputs/COFF/long-section-name.yaml @@ -1,4 +1,4 @@ ---- +--- !COFF header: Machine: IMAGE_FILE_MACHINE_I386 Characteristics: [ IMAGE_FILE_RELOCS_STRIPPED, IMAGE_FILE_LINE_NUMS_STRIPPED, IMAGE_FILE_LOCAL_SYMS_STRIPPED, IMAGE_FILE_32BIT_MACHINE ] diff --git a/llvm/test/Object/Inputs/COFF/section-aux-symbol.yaml b/llvm/test/Object/Inputs/COFF/section-aux-symbol.yaml index 623af558959..67fba68afd4 100644 --- a/llvm/test/Object/Inputs/COFF/section-aux-symbol.yaml +++ b/llvm/test/Object/Inputs/COFF/section-aux-symbol.yaml @@ -1,4 +1,4 @@ ---- +--- !COFF header: Machine: IMAGE_FILE_MACHINE_I386 Characteristics: [ IMAGE_FILE_RELOCS_STRIPPED, IMAGE_FILE_EXECUTABLE_IMAGE, IMAGE_FILE_LINE_NUMS_STRIPPED, IMAGE_FILE_32BIT_MACHINE, IMAGE_FILE_DEBUG_STRIPPED ] diff --git a/llvm/test/Object/Inputs/COFF/weak-external.yaml b/llvm/test/Object/Inputs/COFF/weak-external.yaml index 064b44a4a38..3963bcdc557 100644 --- a/llvm/test/Object/Inputs/COFF/weak-external.yaml +++ b/llvm/test/Object/Inputs/COFF/weak-external.yaml @@ -1,4 +1,4 @@ ---- +--- !COFF header: Machine: IMAGE_FILE_MACHINE_I386 Characteristics: [ IMAGE_FILE_LINE_NUMS_STRIPPED, IMAGE_FILE_32BIT_MACHINE ] diff --git a/llvm/test/Object/Inputs/COFF/weak-externals.yaml b/llvm/test/Object/Inputs/COFF/weak-externals.yaml index 44364186b52..d0ec3137c71 100644 --- a/llvm/test/Object/Inputs/COFF/weak-externals.yaml +++ b/llvm/test/Object/Inputs/COFF/weak-externals.yaml @@ -1,4 +1,4 @@ ---- +--- !COFF header: Machine: IMAGE_FILE_MACHINE_ARMNT Characteristics: [ ] diff --git a/llvm/test/Object/Inputs/COFF/x86-64.yaml b/llvm/test/Object/Inputs/COFF/x86-64.yaml index b8a863a429c..2fd5a4d19ff 100644 --- a/llvm/test/Object/Inputs/COFF/x86-64.yaml +++ b/llvm/test/Object/Inputs/COFF/x86-64.yaml @@ -1,3 +1,4 @@ +!COFF header: !Header Machine: IMAGE_FILE_MACHINE_AMD64 # (0x8664) |
