[Object/llvm-readobj] - Cleanup testing of the dynamic objects.

[grimar]

Summary

This patch touches a few test cases:

1. It removes dtflags.elf-x86-64 binary and elf-dtflags.test.

elf-dtflags.test is excessive because we have the
elf-dynamic-tags.test which test all non-machine specific tags.

2. It removes testing of --dynamic-table from test\Object\readobj-shared-object.test

(we have the elf-dynamic-tags.test for that), and simplifies this test case.

3. It moves testing of the headers from readobj-shared-object.test

to elf-file-headers.test.

4. Adds test/tools/llvm-readobj/elf-file-types.test and test/tools/llvm-readobj/elf-loadname.test.

It opens road for removing the readobj-shared-object.test completely soon.

[jhenderson]

test/Object/readobj-shared-object.test

15–18

Do we have testing elsewhere for this part of the printing?

test/tools/llvm-readobj/elf-dynamic-tags.test

1

Seems like this should be a separate NFC commit? This file is otherwise unchanged.

test/tools/llvm-readobj/elf-file-headers.test

1

It feels like the machine type and ELF type are two orthoganol test cases that don't need combinatorially testing. Why not also test ET_EXEC and ET_CORE in this manner after all?

Perhaps a separate test file would be sensible, with tests for each different ELF type, focused just on testing that field?

[grimar]

• Addressed review comments.

test/Object/readobj-shared-object.test

15–18

Probably not. I Added elf-loadname.test.

test/tools/llvm-readobj/elf-dynamic-tags.test

1

I just tried to show this test case in the commit somehow since I am referring to it.
Reverted.

test/tools/llvm-readobj/elf-file-headers.test

1

I added a separate test.

[jhenderson]

test/tools/llvm-readobj/elf-file-types.test

88 ↗

(On Diff #211262)

You should probably also test something in the ET_LOOS -> ET_HIOS range too.

[grimar]

test/tools/llvm-readobj/elf-file-types.test

88 ↗

(On Diff #211262)

Interesting that ELF.h doesn't define ET_LOOS/ET_HIOS:

// File types
enum {
  ET_NONE = 0,        // No file type
  ET_REL = 1,         // Relocatable file
  ET_EXEC = 2,        // Executable file
  ET_DYN = 3,         // Shared object file
  ET_CORE = 4,        // Core file
  ET_LOPROC = 0xff00, // Beginning of processor-specific codes
  ET_HIPROC = 0xffff  // Processor-specific
};

[grimar]

• Addressed review comment.

[jhenderson]

LGTM.

test/Object/readobj-shared-object.test

-RUN: llvm-readobj -S --symbols --dyn-syms --dynamic-table --needed-libs \
-RUN:              %p/Inputs/shared-object-test.elf-i386 \
-RUN:         | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj -S --symbols --dyn-syms --dynamic-table --needed-libs \
-RUN:              %p/Inputs/shared-object-test.elf-i386 \
-RUN:         | FileCheck %s -check-prefix ELF32
+# RUN: llvm-readobj --sections --symbols --dyn-syms --needed-libs \
+# RUN:   %p/Inputs/shared-object-test.elf-i386 | FileCheck %s
 
-RUN: llvm-readobj -S --symbols --dyn-syms --dynamic-table --needed-libs \
-RUN:            %p/Inputs/shared-object-test.elf-x86-64 \
-RUN:         | FileCheck %s -check-prefix ELF
-RUN: llvm-readobj -S --symbols --dyn-syms --dynamic-table --needed-libs \
-RUN:            %p/Inputs/shared-object-test.elf-x86-64 \
-RUN:         | FileCheck %s -check-prefix ELF64
+# RUN: llvm-readobj --sections --symbols --dyn-syms --needed-libs \
+# RUN:   %p/Inputs/shared-object-test.elf-x86-64 | FileCheck %s
 
-ELF64: Format:      ELF64-x86-64
-ELF64: Arch:        x86_64
-ELF64: AddressSize: 64bit
-ELF64: LoadName:    libfoo.so
+# CHECK:   Sections [
+# CHECK:   Section {
+# CHECK:     Name:  (0)
+# CHECK:     Type: SHT_NULL
+# CHECK:     Flags [ (0x0)
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .hash
+# CHECK:     Type: SHT_HASH
+# CHECK:     Flags [ (0x2)
+# CHECK:       SHF_ALLOC
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .dynsym
+# CHECK:     Type: SHT_DYNSYM
+# CHECK:     Flags [ (0x2)
+# CHECK:       SHF_ALLOC
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .dynstr
+# CHECK:     Type: SHT_STRTAB
+# CHECK:     Flags [ (0x2)
+# CHECK:       SHF_ALLOC
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .text
+# CHECK:     Type: SHT_PROGBITS
+# CHECK:     Flags [ (0x6)
+# CHECK:       SHF_ALLOC
+# CHECK:       SHF_EXECINSTR
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .eh_frame
+# CHECK:     Type: SHT_PROGBITS
+# CHECK:     Flags [ (0x2)
+# CHECK:       SHF_ALLOC
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .tdata
+# CHECK:     Type: SHT_PROGBITS
+# CHECK:     Flags [ (0x403)
+# CHECK:       SHF_ALLOC
+# CHECK:       SHF_TLS
+# CHECK:       SHF_WRITE
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .dynamic
+# CHECK:     Type: SHT_DYNAMIC
+# CHECK:     Flags [ (0x3)
+# CHECK:       SHF_ALLOC
+# CHECK:       SHF_WRITE
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .got.plt
+# CHECK:     Type: SHT_PROGBITS
+# CHECK:     Flags [ (0x3)
+# CHECK:       SHF_ALLOC
+# CHECK:       SHF_WRITE
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .data
+# CHECK:     Type: SHT_PROGBITS
+# CHECK:     Flags [ (0x3)
+# CHECK:       SHF_ALLOC
+# CHECK:       SHF_WRITE
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .bss
+# CHECK:     Type: SHT_NOBITS
+# CHECK:     Flags [ (0x3)
+# CHECK:       SHF_ALLOC
+# CHECK:       SHF_WRITE
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .shstrtab
+# CHECK:     Type: SHT_STRTAB
+# CHECK:     Flags [ (0x0)
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .symtab
+# CHECK:     Type: SHT_SYMTAB
+# CHECK:     Flags [ (0x0)
+# CHECK:     ]
+# CHECK:   }
+# CHECK:   Section {
+# CHECK:     Name: .strtab
+# CHECK:     Type: SHT_STRTAB
+# CHECK:     Flags [ (0x0)
+# CHECK:     ]
+# CHECK:   }
+# CHECK: ]
 
-ELF32: Format:      ELF32-i386
-ELF32: Arch:        i386
-ELF32: AddressSize: 32bit
-ELF32: LoadName:    libfoo.so
+# CHECK:   Symbols [
+# CHECK:   Symbol {
+# CHECK:     Name: .hash (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .hash
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .dynsym (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .dynsym
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .dynstr (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .dynstr
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .text (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .text
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .eh_frame (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .eh_frame
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .tdata (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .tdata
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .dynamic (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .dynamic
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .got.plt (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .got.plt
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .data (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .data
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: .bss (0)
+# CHECK:     Binding: Local
+# CHECK:     Type: Section
+# CHECK:     Section: .bss
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: shared.ll
+# CHECK:     Binding: Local
+# CHECK:     Type: File
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: local_func
+# CHECK:     Binding: Local
+# CHECK:     Type: Function
+# CHECK:     Section: .text
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: _GLOBAL_OFFSET_TABLE_
+# CHECK:     Binding: Local
+# CHECK:     Type: Object
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: _DYNAMIC
+# CHECK:     Binding: Local
+# CHECK:     Type: Object
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: common_sym
+# CHECK:     Binding: Global
+# CHECK:     Type: Object
+# CHECK:     Section: .bss
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: tls_sym
+# CHECK:     Binding: Global
+# CHECK:     Type: TLS
+# CHECK:     Section: .tdata
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: defined_sym
+# CHECK:     Binding: Global
+# CHECK:     Type: Object
+# CHECK:     Section: .data
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: __bss_start
+# CHECK:     Binding: Global
+# CHECK:     Type: None
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: _end
+# CHECK:     Binding: Global
+# CHECK:     Type: None
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: global_func
+# CHECK:     Binding: Global
+# CHECK:     Type: Function
+# CHECK:     Section: .text
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: _edata
+# CHECK:     Binding: Global
+# CHECK:     Type: None
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK: ]
 
-ELF: Sections [
-ELF:   Section {
-ELF:     Name:  (0)
-ELF:     Type: SHT_NULL
-ELF:     Flags [ (0x0)
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .hash
-ELF:     Type: SHT_HASH
-ELF:     Flags [ (0x2)
-ELF:       SHF_ALLOC
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .dynsym
-ELF:     Type: SHT_DYNSYM
-ELF:     Flags [ (0x2)
-ELF:       SHF_ALLOC
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .dynstr
-ELF:     Type: SHT_STRTAB
-ELF:     Flags [ (0x2)
-ELF:       SHF_ALLOC
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .text
-ELF:     Type: SHT_PROGBITS
-ELF:     Flags [ (0x6)
-ELF:       SHF_ALLOC
-ELF:       SHF_EXECINSTR
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .eh_frame
-ELF:     Type: SHT_PROGBITS
-ELF:     Flags [ (0x2)
-ELF:       SHF_ALLOC
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .tdata
-ELF:     Type: SHT_PROGBITS
-ELF:     Flags [ (0x403)
-ELF:       SHF_ALLOC
-ELF:       SHF_TLS
-ELF:       SHF_WRITE
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .dynamic
-ELF:     Type: SHT_DYNAMIC
-ELF:     Flags [ (0x3)
-ELF:       SHF_ALLOC
-ELF:       SHF_WRITE
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .got.plt
-ELF:     Type: SHT_PROGBITS
-ELF:     Flags [ (0x3)
-ELF:       SHF_ALLOC
-ELF:       SHF_WRITE
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .data
-ELF:     Type: SHT_PROGBITS
-ELF:     Flags [ (0x3)
-ELF:       SHF_ALLOC
-ELF:       SHF_WRITE
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .bss
-ELF:     Type: SHT_NOBITS
-ELF:     Flags [ (0x3)
-ELF:       SHF_ALLOC
-ELF:       SHF_WRITE
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .shstrtab
-ELF:     Type: SHT_STRTAB
-ELF:     Flags [ (0x0)
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .symtab
-ELF:     Type: SHT_SYMTAB
-ELF:     Flags [ (0x0)
-ELF:     ]
-ELF:   }
-ELF:   Section {
-ELF:     Name: .strtab
-ELF:     Type: SHT_STRTAB
-ELF:     Flags [ (0x0)
-ELF:     ]
-ELF:   }
-ELF: ]
+# CHECK: DynamicSymbols [
+# CHECK:   Symbol {
+# CHECK:     Name: common_sym
+# CHECK:     Binding: Global
+# CHECK:     Type: Object
+# CHECK:     Section: .bss
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: tls_sym
+# CHECK:     Binding: Global
+# CHECK:     Type: TLS
+# CHECK:     Section: .tdata
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: defined_sym
+# CHECK:     Binding: Global
+# CHECK:     Type: Object
+# CHECK:     Section: .data
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: __bss_start
+# CHECK:     Binding: Global
+# CHECK:     Type: None
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: _end
+# CHECK:     Binding: Global
+# CHECK:     Type: None
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: global_func
+# CHECK:     Binding: Global
+# CHECK:     Type: Function
+# CHECK:     Section: .text
+# CHECK:   }
+# CHECK:   Symbol {
+# CHECK:     Name: _edata
+# CHECK:     Binding: Global
+# CHECK:     Type: None
+# CHECK:     Section: Absolute (0xFFF1)
+# CHECK:   }
+# CHECK: ]
 
-ELF: Symbols [
-ELF:   Symbol {
-ELF:     Name: .hash (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .hash
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .dynsym (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .dynsym
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .dynstr (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .dynstr
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .text (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .text
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .eh_frame (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .eh_frame
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .tdata (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .tdata
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .dynamic (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .dynamic
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .got.plt (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .got.plt
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .data (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .data
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: .bss (0)
-ELF:     Binding: Local
-ELF:     Type: Section
-ELF:     Section: .bss
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: shared.ll
-ELF:     Binding: Local
-ELF:     Type: File
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: local_func
-ELF:     Binding: Local
-ELF:     Type: Function
-ELF:     Section: .text
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: _GLOBAL_OFFSET_TABLE_
-ELF:     Binding: Local
-ELF:     Type: Object
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: _DYNAMIC
-ELF:     Binding: Local
-ELF:     Type: Object
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: common_sym
-ELF:     Binding: Global
-ELF:     Type: Object
-ELF:     Section: .bss
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: tls_sym
-ELF:     Binding: Global
-ELF:     Type: TLS
-ELF:     Section: .tdata
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: defined_sym
-ELF:     Binding: Global
-ELF:     Type: Object
-ELF:     Section: .data
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: __bss_start
-ELF:     Binding: Global
-ELF:     Type: None
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: _end
-ELF:     Binding: Global
-ELF:     Type: None
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: global_func
-ELF:     Binding: Global
-ELF:     Type: Function
-ELF:     Section: .text
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: _edata
-ELF:     Binding: Global
-ELF:     Type: None
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF: ]
-
-ELF: DynamicSymbols [
-ELF:   Symbol {
-ELF:     Name: common_sym
-ELF:     Binding: Global
-ELF:     Type: Object
-ELF:     Section: .bss
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: tls_sym
-ELF:     Binding: Global
-ELF:     Type: TLS
-ELF:     Section: .tdata
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: defined_sym
-ELF:     Binding: Global
-ELF:     Type: Object
-ELF:     Section: .data
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: __bss_start
-ELF:     Binding: Global
-ELF:     Type: None
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: _end
-ELF:     Binding: Global
-ELF:     Type: None
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: global_func
-ELF:     Binding: Global
-ELF:     Type: Function
-ELF:     Section: .text
-ELF:   }
-ELF:   Symbol {
-ELF:     Name: _edata
-ELF:     Binding: Global
-ELF:     Type: None
-ELF:     Section: Absolute (0xFFF1)
-ELF:   }
-ELF: ]
-
-ELF32: DynamicSection [ (9 entries)
-ELF32:   Tag        Type                 Name/Value
-ELF32:   0x00000001 NEEDED               Shared library: [libc.so.6]
-ELF32:   0x00000001 NEEDED               Shared library: [libm.so.6]
-ELF32:   0x0000000E SONAME               Library soname: [libfoo.so]
-ELF32:   0x00000004 HASH                 {{[0-9a-f]+}}
-ELF32:   0x00000005 STRTAB               {{[0-9a-f]+}}
-ELF32:   0x00000006 SYMTAB               {{[0-9a-f]+}}
-ELF32:   0x0000000A STRSZ                {{[0-9]+}} (bytes)
-ELF32:   0x0000000B SYMENT               {{[0-9]+}} (bytes)
-ELF32:   0x00000000 NULL                 0x0
-ELF32: ]
-
-ELF64: DynamicSection [ (9 entries)
-ELF64:   Tag        Type                 Name/Value
-ELF64:   0x0000000000000001 NEEDED               Shared library: [libc.so.6]
-ELF64:   0x0000000000000001 NEEDED               Shared library: [libm.so.6]
-ELF64:   0x000000000000000E SONAME               Library soname: [libfoo.so]
-ELF64:   0x0000000000000004 HASH                 {{[0-9a-f]+}}
-ELF64:   0x0000000000000005 STRTAB               {{[0-9a-f]+}}
-ELF64:   0x0000000000000006 SYMTAB               {{[0-9a-f]+}}
-ELF64:   0x000000000000000A STRSZ                {{[0-9]+}} (bytes)
-ELF64:   0x000000000000000B SYMENT               {{[0-9]+}} (bytes)
-ELF64:   0x0000000000000000 NULL                 0x0
-ELF64: ]
-
-
-ELF:      NeededLibraries [
-ELF-NEXT:  libc.so.6
-ELF-NEXT:  libm.so.6
-ELF-NEXT: ]
+# CHECK:      NeededLibraries [
+# CHECK-NEXT:  libc.so.6
+# CHECK-NEXT:  libm.so.6
+# CHECK-NEXT: ]

test/tools/llvm-readobj/elf-dtflags.test

-// Test that llvm-readobj dumps DF_XXX and DF_1_XXX flags correctly.
-// The input was generated using the following:
-// $ clang -Wl,-z,origin -Wl,-z,now example.c
-// $ cat example.c
-// int main(void) { return (0); }
-
-RUN: llvm-readobj --dynamic-table %p/Inputs/dtflags.elf-x86-64 | FileCheck %s
-
-CHECK: 0x000000000000001E FLAGS                ORIGIN BIND_NOW
-CHECK: 0x000000006FFFFFFB FLAGS_1              NOW ORIGIN

test/tools/llvm-readobj/elf-dynamic-tags.test

-# Show that all non-machine specific tags can be read and printed correctly.
+## Show that all non-machine specific tags can be read and printed correctly.
+
 # RUN: yaml2obj %s > %t
 # RUN: llvm-readobj --dynamic-table %t | FileCheck %s --check-prefix=LLVM
 # RUN: llvm-readelf --dynamic-table %t | FileCheck %s --check-prefix=GNU
 
 # LLVM:      DynamicSection [ (61 entries)
 # LLVM-NEXT:   Tag                Type                 Name/Value
 # LLVM-NEXT:   0x0000000000000001 NEEDED               Shared library: [D]
 # LLVM-NEXT:   0x0000000000000002 PLTRELSZ             16 (bytes)

test/tools/llvm-readobj/elf-file-headers.test

-# RUN: yaml2obj %s --docnum=1 -o %t.i386
-# RUN: llvm-readobj -h %t.i386 | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.i386 --check-prefix I386
+# RUN: yaml2obj %s --docnum=1 -o %t.i386.o
+# RUN: llvm-readobj -h %t.i386.o \
+# RUN:   | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.i386.o --check-prefixes=I386,I386-REL
 
 #      I386:File: [[FILE]]
 # I386-NEXT:Format: ELF32-i386
 # I386-NEXT:Arch: i386
 # I386-NEXT:AddressSize: 32bit
 # I386-NEXT:LoadName: <Not found>
 # I386-NEXT:ElfHeader {
 # I386-NEXT:  Ident {
 # I386-NEXT:    Magic: (7F 45 4C 46)
 # I386-NEXT:    Class: 32-bit (0x1)
 # I386-NEXT:    DataEncoding: LittleEndian (0x1)
 # I386-NEXT:    FileVersion: 1
 # I386-NEXT:    OS/ABI: GNU/Linux (0x3)
 # I386-NEXT:    ABIVersion: 0
 # I386-NEXT:    Unused: (00 00 00 00 00 00 00)
 # I386-NEXT:  }
-# I386-NEXT:  Type: Relocatable (0x1)
+#  I386-REL:  Type: Relocatable (0x1)
+#  I386-DSO:  Type: SharedObject (0x3)
 # I386-NEXT:  Machine: EM_386 (0x3)
 # I386-NEXT:  Version: 1
 # I386-NEXT:  Entry: 0x0
 # I386-NEXT:  ProgramHeaderOffset: 0x34
 # I386-NEXT:  SectionHeaderOffset: 0x34
 # I386-NEXT:  Flags [ (0x0)
 # I386-NEXT:  ]
 # I386-NEXT:  HeaderSize: 52
 # I386-NEXT:  ProgramHeaderEntrySize: 32
 # I386-NEXT:  ProgramHeaderCount: 0
 # I386-NEXT:  SectionHeaderEntrySize: 40
 # I386-NEXT:  SectionHeaderCount: 4
 # I386-NEXT:  StringTableSectionIndex: 3
 # I386-NEXT:}
 # I386-NOT:{{.}}
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS32
   Data:    ELFDATA2LSB
   OSABI:   ELFOSABI_GNU
   Type:    ET_REL
   Machine: EM_386
 
-# RUN: yaml2obj %s --docnum=2 -o %t.x86-64
-# RUN: llvm-readobj -h %t.x86-64 \
-# RUN:  | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.x86-64 --check-prefix X86-64
+# RUN: yaml2obj %s --docnum=2 -o %t.i386.so
+# RUN: llvm-readobj -h %t.i386.so \
+# RUN:   | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.i386.so --check-prefixes=I386,I386-DSO
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2LSB
+  OSABI:   ELFOSABI_GNU
+  Type:    ET_DYN
+  Machine: EM_386
+
+# RUN: yaml2obj %s --docnum=3 -o %t.x86-64.o
+# RUN: llvm-readobj -h %t.x86-64.o \
+# RUN:  | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.x86-64.o --check-prefixes=X86-64,X86-64-REL
 
 #      X86-64:File: [[FILE]]
 # X86-64-NEXT:Format: ELF64-x86-64
 # X86-64-NEXT:Arch: x86_64
 # X86-64-NEXT:AddressSize: 64bit
 # X86-64-NEXT:LoadName: <Not found>
 # X86-64-NEXT:ElfHeader {
 # X86-64-NEXT:  Ident {
 # X86-64-NEXT:    Magic: (7F 45 4C 46)
 # X86-64-NEXT:    Class: 64-bit (0x2)
 # X86-64-NEXT:    DataEncoding: LittleEndian (0x1)
 # X86-64-NEXT:    FileVersion: 1
 # X86-64-NEXT:    OS/ABI: GNU/Linux (0x3)
 # X86-64-NEXT:    ABIVersion: 0
 # X86-64-NEXT:    Unused: (00 00 00 00 00 00 00)
 # X86-64-NEXT:  }
-# X86-64-NEXT:  Type: Relocatable (0x1)
+#  X86-64-REL:  Type: Relocatable (0x1)
+#  X86-64-DSO:  Type: SharedObject (0x3)
 # X86-64-NEXT:  Machine: EM_X86_64 (0x3E)
 # X86-64-NEXT:  Version: 1
 # X86-64-NEXT:  Entry: 0x0
 # X86-64-NEXT:  ProgramHeaderOffset: 0x40
 # X86-64-NEXT:  SectionHeaderOffset: 0x40
 # X86-64-NEXT:  Flags [ (0x0)
 # X86-64-NEXT:  ]
 # X86-64-NEXT:  HeaderSize: 64
 # X86-64-NEXT:  ProgramHeaderEntrySize: 56
 # X86-64-NEXT:  ProgramHeaderCount: 0
 # X86-64-NEXT:  SectionHeaderEntrySize: 64
 # X86-64-NEXT:  SectionHeaderCount: 4
 # X86-64-NEXT:  StringTableSectionIndex: 3
 # X86-64-NEXT:}
 # X86-64-NOT:{{.}}
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   OSABI:   ELFOSABI_GNU
   Type:    ET_REL
   Machine: EM_X86_64
 
-# RUN: yaml2obj %s --docnum=3 -o %t.lanai
+# RUN: yaml2obj %s --docnum=4 -o %t.x86-64.so
+# RUN: llvm-readobj -h %t.x86-64.so \
+# RUN:  | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.x86-64.so --check-prefixes=X86-64,X86-64-DSO
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  OSABI:   ELFOSABI_GNU
+  Type:    ET_DYN
+  Machine: EM_X86_64
+
+# RUN: yaml2obj %s --docnum=5 -o %t.lanai
 # RUN: llvm-readobj -h %t.lanai \
 # RUN:  | FileCheck %s --strict-whitespace --match-full-lines -DFILE=%t.lanai --check-prefix LANAI
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS32
   Data:    ELFDATA2MSB
   Type:    ET_REL