[llvm-readobj] Implement GNU-style output for dynamic table

[atanasyan]

Summary

GNU readelf tool prints slightly different dynamic table "header" and surrounds dynamic tag names by brackets. This patch implements the same formatting for GNU-style output of the llvm-readobj.

LLVM

DynamicSection [ (13 entries)
  Tag        Type                 Name/Value
  0x00000006 SYMTAB               0x168
  ...
]

GNU

Dynamic section at offset 0x1d0 contains 13 entries:
  Tag        Type                 Name/Value
  0x00000006 (SYMTAB)             0x168
  ...

[MaskRay]

I think the header row is apparently misaligned. Not sure we want to misalign ourselves...

% ~/projects/binutils-gdb/Debug/binutils/readelf -d =cat
                                          
Dynamic section at offset 0x7df8 contains 26 entries:
  Tag        Type                         Name/Value
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
 0x000000000000000c (INIT)               0x15a0

Regarding the extra parentheses, I am not sure if we really want to make llvm-readelf/llvm-readobj different just to become more readelf-like, but I'd like to hear what others say. I'll not oppose if we decide to become a better readelf replacement.

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

123

(MIPS_RLD_TEXT_RESOLVE_ADDR)0x8

This missing space separator definitely looks weird. What does GNU readelf do?

[jhenderson]

Not looked at the implementation in detail yet, but to address @MaskRay's comment, we should definitely add the extra parentheses in llvm-readelf output. We could always add it in llvm-readobj too, but I'm less bothered by that. As close to byte-to-byte identical output as possible was requested for GNU style output by multiple individuals at the recent LLVM Binutils BoF and round table.

I wonder if it's worth adding --strict-whitespace to one or more of the tests, to show that the formatting is correct? What do you think?

llvm/tools/llvm-readobj/ELFDumper.cpp

2482

Could this just be a while loop?

[atanasyan]

In D62256#1512194, @MaskRay wrote:

I think the header row is apparently misaligned. Not sure we want to misalign ourselves...

I do not emulate this misalignment. Header row aligned properly in both 32/64-bit cases.

Regarding the extra parentheses, I am not sure if we really want to make llvm-readelf/llvm-readobj different just to become more readelf-like

As to me, the parentheses do not make sense. If everybody agree that we do not need to emulate GNU readelf formatting in all details, I will be happy to drop these parentheses.

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

123

GNU readelf adds space between fields. I will fix that.

[atanasyan]

• Add tests with the strict-whitespace flag to check headers alignment.
• Replace for by while.
• Add space between too long dynamic table tag name and it's value.

[rupprecht]

FYI there's another patch that changes .dynamic output, including the readelf output -- D62179. You may need to update that test if it gets committed first.

I do agree with the others that parens is better for compatibility. But I think it's fine to deviate with the other whitespace differences; breaking compatibility makes it easier to read the table. LGTM, but please wait for James/Ray to approve.

btw, I noticed other missing differences unrelated to this patch -- filed https://bugs.llvm.org/show_bug.cgi?id=41987.

llvm/tools/llvm-readobj/ELFDumper.cpp

3348–3350

I know this (and the LLVMStyle below) is just copied from the old code... but I don't think there needs to be any << between strings, they can be implicitly concatenated (or joined into a single string, I don't know why it needs to be so narrow)

[jhenderson]

llvm/tools/llvm-readobj/ELFDumper.cpp

3334

Are there any cases where we don't want the dumper to provide a rectified table? I don't think so. In that case, could the rectify code move into the dynamic_table() method?

[atanasyan]

• Move code cuts dynamic table after the first DT_NULL entry into the dynamic_table() method.
• Print dynamic table header as a single string without multiple << operators.

[jhenderson]

LGTM.

[atanasyan]

Thanks for review.

lld/test/ELF/ppc64-dynamic-relocations.s

 
 // There should be 2 reserved doublewords before the first entry. The dynamic
 // linker will fill those in with the address of the resolver entry point and
 // the dynamic object identifier.
 // DIS: Idx Name       Size      VMA              Type
 // DIS:     .plt       00000018  0000000010030000 BSS
 
 // DT_PLTGOT should point to the start of the .plt section.
-// DT: 0x0000000000000003 PLTGOT               0x10030000
+// DT: 0x0000000000000003 (PLTGOT)             0x10030000
 
     .text
     .abiversion 2
     .globl  _start
     .p2align        4
     .type   _start,@function
 _start:
 .Lfunc_begin0:

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

 // Check dynamic section tags in case of shared library file.
 RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.mips \
 RUN:     | FileCheck %s -check-prefix ELF-MIPS
+RUN: llvm-readelf --dynamic-table %p/Inputs/dynamic-table-so.mips \
+RUN:     | FileCheck %s --strict-whitespace -check-prefix ELF-MIPS-GNU
 
 ELF-MIPS: Format: ELF32-mips
 ELF-MIPS: Arch: mipsel
 ELF-MIPS: AddressSize: 32bit
 ELF-MIPS: LoadName:
 ELF-MIPS: DynamicSection [ (23 entries)
 ELF-MIPS:   Tag        Type                 Name/Value
 ELF-MIPS:   0x00000001 NEEDED               Shared library: [libc.so.6]

 ELF-MIPS:   0x70000012 MIPS_UNREFEXTNO      26
 ELF-MIPS:   0x70000013 MIPS_GOTSYM          0xD
 ELF-MIPS:   0x6FFFFFFE VERNEED              0x4E8
 ELF-MIPS:   0x6FFFFFFF VERNEEDNUM           1
 ELF-MIPS:   0x6FFFFFF0 VERSYM               0x4C0
 ELF-MIPS:   0x00000000 NULL                 0x0
 ELF-MIPS: ]
 
+ELF-MIPS-GNU:      Dynamic section at offset 0x{{.*}} contains 23 entries:
+ELF-MIPS-GNU-NEXT:   Tag        Type                 Name/Value
+ELF-MIPS-GNU-NEXT:   0x00000001 (NEEDED)             Shared library: [libc.so.6]
+ELF-MIPS-GNU-NEXT:   0x0000000c (INIT)               0x528
+ELF-MIPS-GNU-NEXT:   0x0000000d (FINI)               0x860
+ELF-MIPS-GNU-NEXT:   0x00000004 (HASH)               0x210
+ELF-MIPS-GNU-NEXT:   0x00000005 (STRTAB)             0x3d8
+ELF-MIPS-GNU-NEXT:   0x00000006 (SYMTAB)             0x2a8
+ELF-MIPS-GNU-NEXT:   0x0000000a (STRSZ)              231 (bytes)
+ELF-MIPS-GNU-NEXT:   0x0000000b (SYMENT)             16 (bytes)
+ELF-MIPS-GNU-NEXT:   0x00000003 (PLTGOT)             0x108e0
+ELF-MIPS-GNU-NEXT:   0x00000011 (REL)                0x518
+ELF-MIPS-GNU-NEXT:   0x00000012 (RELSZ)              16 (bytes)
+ELF-MIPS-GNU-NEXT:   0x00000013 (RELENT)             8 (bytes)
+ELF-MIPS-GNU-NEXT:   0x70000001 (MIPS_RLD_VERSION)   1
+ELF-MIPS-GNU-NEXT:   0x70000005 (MIPS_FLAGS)         NOTPOT
+ELF-MIPS-GNU-NEXT:   0x70000006 (MIPS_BASE_ADDRESS)  0x0
+ELF-MIPS-GNU-NEXT:   0x7000000a (MIPS_LOCAL_GOTNO)   10
+ELF-MIPS-GNU-NEXT:   0x70000011 (MIPS_SYMTABNO)      19
+ELF-MIPS-GNU-NEXT:   0x70000012 (MIPS_UNREFEXTNO)    26
+ELF-MIPS-GNU-NEXT:   0x70000013 (MIPS_GOTSYM)        0xd
+ELF-MIPS-GNU-NEXT:   0x6ffffffe (VERNEED)            0x4e8
+ELF-MIPS-GNU-NEXT:   0x6fffffff (VERNEEDNUM)         1
+ELF-MIPS-GNU-NEXT:   0x6ffffff0 (VERSYM)             0x4c0
+ELF-MIPS-GNU-NEXT:   0x00000000 (NULL)               0x0
+
 // Check dynamic section tags in case of non-pic executable file.
 RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-exe.mips \
 RUN:     | FileCheck %s -check-prefix ELF-MIPS-EXE
 
 ELF-MIPS-EXE: Format: ELF32-mips
 ELF-MIPS-EXE: Arch: mipsel
 ELF-MIPS-EXE: AddressSize: 32bit
 ELF-MIPS-EXE: LoadName:

 ELF-X86-SO:   0x000000006FFFFFFE VERNEED              0x{{[0-9A-F]+}}
 ELF-X86-SO:   0x000000006FFFFFFF VERNEEDNUM           2
 ELF-X86-SO:   0x000000006FFFFFF0 VERSYM               0x{{[0-9A-F]+}}
 ELF-X86-SO:   0x000000006FFFFFF9 RELACOUNT            3
 ELF-X86-SO:   0x0000000000000000 NULL                 0x0
 
 RUN: llvm-readobj --dynamic-table %p/Inputs/dynamic-table-so.aarch64 \
 RUN:     | FileCheck %s -check-prefix ELF-AARCH64-SO
+RUN: llvm-readelf --dynamic-table %p/Inputs/dynamic-table-so.aarch64 \
+RUN:     | FileCheck %s --strict-whitespace -check-prefix ELF-AARCH64-SO-GNU
 
 ELF-AARCH64-SO: Format: ELF64-aarch64-little
 ELF-AARCH64-SO: Arch: aarch64
 ELF-AARCH64-SO: AddressSize: 64bit
 ELF-AARCH64-SO: LoadName: 
 ELF-AARCH64-SO: DynamicSection [ (26 entries)
 ELF-AARCH64-SO:   Tag                Type                 Name/Value
 ELF-AARCH64-SO:   0x0000000000000001 NEEDED               Shared library: [libc.so.6]

 ELF-AARCH64-SO:   0x0000000000000008 RELASZ               192 (bytes)
 ELF-AARCH64-SO:   0x0000000000000009 RELAENT              24 (bytes)
 ELF-AARCH64-SO:   0x000000006FFFFFFE VERNEED              0x520
 ELF-AARCH64-SO:   0x000000006FFFFFFF VERNEEDNUM           1
 ELF-AARCH64-SO:   0x000000006FFFFFF0 VERSYM               0x4F2
 ELF-AARCH64-SO:   0x000000006FFFFFF9 RELACOUNT            3
 ELF-AARCH64-SO:   0x0000000000000000 NULL                 0x0
 ELF-AARCH64-SO: ]
+
+ELF-AARCH64-SO-GNU:      Dynamic section at offset 0x{{.*}} contains 26 entries:
+ELF-AARCH64-SO-GNU-NEXT:   Tag                Type                 Name/Value
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000001 (NEEDED)             Shared library: [libc.so.6]
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000000c (INIT)               0x660
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000000d (FINI)               0x83c
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000019 (INIT_ARRAY)         0x10db8
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000001b (INIT_ARRAYSZ)       8 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000001a (FINI_ARRAY)         0x10dc0
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000001c (FINI_ARRAYSZ)       8 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006ffffef5 (GNU_HASH)           0x1f0
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000005 (STRTAB)             0x420
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000006 (SYMTAB)             0x240
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000000a (STRSZ)              210 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x000000000000000b (SYMENT)             24 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000003 (PLTGOT)             0x10fe8
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000002 (PLTRELSZ)           96 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000014 (PLTREL)             RELA
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000017 (JMPREL)             0x600
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006ffffef6 (TLSDESC_PLT)        0x6d0
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006ffffef7 (TLSDESC_GOT)        0x10fe0
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000007 (RELA)               0x540
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000008 (RELASZ)             192 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000009 (RELAENT)            24 (bytes)
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006ffffffe (VERNEED)            0x520
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006fffffff (VERNEEDNUM)         1
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006ffffff0 (VERSYM)             0x4f2
+ELF-AARCH64-SO-GNU-NEXT:   0x000000006ffffff9 (RELACOUNT)          3
+ELF-AARCH64-SO-GNU-NEXT:   0x0000000000000000 (NULL)               0x0

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

Sections:
       - Section: .dynamic
   - Type: PT_DYNAMIC
     VAddr: 0x1000
     Sections:
       - Section: .dynamic
 
 # Test handling of a .dynamic section with an invalid entsize (i.e. not 2 * sizeof(Elf_Dyn)).
 # RUN: yaml2obj %s --docnum=2 -o %t.bad-entsize
-# RUN: llvm-readobj --dynamic-table %t.bad-entsize | FileCheck %s --check-prefix BAD-ENTSIZE
-# RUN: llvm-readelf --dynamic-table %t.bad-entsize | FileCheck %s --check-prefix BAD-ENTSIZE
+# RUN: llvm-readobj --dynamic-table %t.bad-entsize | FileCheck %s --check-prefix BAD-ENTSIZE-LLVM
+# RUN: llvm-readelf --dynamic-table %t.bad-entsize | FileCheck %s --check-prefix BAD-ENTSIZE-GNU
 
-# BAD-ENTSIZE:      DynamicSection [ (2 entries)
-# BAD-ENTSIZE-NEXT:   Tag                Type                 Name/Value
-# BAD-ENTSIZE-NEXT:   0x0000000000000015 DEBUG                0x0
-# BAD-ENTSIZE-NEXT:   0x0000000000000000 NULL                 0x0
-# BAD-ENTSIZE-NEXT: ]
+# BAD-ENTSIZE-LLVM:      DynamicSection [ (2 entries)
+# BAD-ENTSIZE-LLVM-NEXT:   Tag                Type                 Name/Value
+# BAD-ENTSIZE-LLVM-NEXT:   0x0000000000000015 DEBUG                0x0
+# BAD-ENTSIZE-LLVM-NEXT:   0x0000000000000000 NULL                 0x0
+# BAD-ENTSIZE-LLVM-NEXT: ]
+
+# BAD-ENTSIZE-GNU:      Dynamic section at offset 0x{{.*}} contains 2 entries:
+# BAD-ENTSIZE-GNU-NEXT:   Tag                Type                 Name/Value
+# BAD-ENTSIZE-GNU-NEXT:   0x0000000000000015 (DEBUG)              0x0
+# BAD-ENTSIZE-GNU-NEXT:   0x0000000000000000 (NULL)               0x0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/elf-dynamic-not-in-pt-dynamic.test

 ## Show that llvm-readobj/llvm-readelf tools can dump the .dynamic
 ## section when it is not in a PT_DYNAMIC segment.
 
 # RUN: yaml2obj %s -o %t.o
-# RUN: llvm-readobj --dynamic-table %t.o 2>&1 | FileCheck %s
-# RUN: llvm-readelf --dynamic-table %t.o 2>&1 | FileCheck %s
+# RUN: llvm-readobj --dynamic-table %t.o 2>&1 \
+# RUN:   | FileCheck --check-prefixes=WARNING,LLVM %s
+# RUN: llvm-readelf --dynamic-table %t.o 2>&1 \
+# RUN:   | FileCheck --check-prefixes=WARNING,GNU %s
 
-# CHECK:      warning: The SHT_DYNAMIC section '.dynamic' is not contained within the PT_DYNAMIC segment
-# CHECK:      DynamicSection [ (2 entries)
-# CHECK-NEXT:   Tag                Type     Name/Value
-# CHECK-NEXT:   0x0000000000000018 BIND_NOW 0x1
-# CHECK-NEXT:   0x0000000000000000 NULL     0x0
-# CHECK-NEXT: ]
+# WARNING:   warning: The SHT_DYNAMIC section '.dynamic' is not contained within the PT_DYNAMIC segment
+
+# LLVM:      DynamicSection [ (2 entries)
+# LLVM-NEXT:   Tag                Type     Name/Value
+# LLVM-NEXT:   0x0000000000000018 BIND_NOW 0x1
+# LLVM-NEXT:   0x0000000000000000 NULL     0x0
+# LLVM-NEXT: ]
+
+# GNU:      Dynamic section at offset 0x{{.*}} contains 2 entries:
+# GNU-NEXT:   Tag                Type       Name/Value
+# GNU-NEXT:   0x0000000000000018 (BIND_NOW) 0x1
+# GNU-NEXT:   0x0000000000000000 (NULL)     0x0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/elf-dynamic-table-dtnull.s

 # Check we are able to dump the dynamic section without a DT_NULL entry correctly.
 
 # RUN: yaml2obj -docnum=1 %s -o %t.o
-# RUN: llvm-readobj --dynamic-table %t.o | FileCheck %s --check-prefix=NONULL
-# RUN: llvm-readelf --dynamic-table %t.o | FileCheck %s --check-prefix=NONULL
+# RUN: llvm-readobj --dynamic-table %t.o | FileCheck %s --check-prefix=NONULL-LLVM
+# RUN: llvm-readelf --dynamic-table %t.o | FileCheck %s --check-prefix=NONULL-GNU
 
-# NONULL:      DynamicSection [ (1 entries)
-# NONULL-NEXT:   Tag                Type   Name/Value
-# NONULL-NEXT:   0x0000000000000015 DEBUG  0x0
-# NONULL-NEXT: ]
+# NONULL-LLVM:      DynamicSection [ (1 entries)
+# NONULL-LLVM-NEXT:   Tag                Type   Name/Value
+# NONULL-LLVM-NEXT:   0x0000000000000015 DEBUG  0x0
+# NONULL-LLVM-NEXT: ]
+
+# NONULL-GNU:      Dynamic section at offset {{.*}} contains 1 entries:
+# NONULL-GNU-NEXT:   Tag                Type     Name/Value
+# NONULL-GNU-NEXT:   0x0000000000000015 (DEBUG)  0x0
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_X86_64
 Sections:
- Type: PT_DYNAMIC
     Sections:
       - Section: .dynamic
 
 # Sometimes .dynamic section content length can be greater than the
 # length of its entries. In this case, we should not try to dump anything
 # past the DT_NULL entry, which works as a terminator.
 
 # RUN: yaml2obj -docnum=2 %s -o %t.o
-# RUN: llvm-readobj --dynamic-table %t.o | FileCheck %s --check-prefix=LONG
-# RUN: llvm-readelf --dynamic-table %t.o | FileCheck %s --check-prefix=LONG
+# RUN: llvm-readobj --dynamic-table %t.o | FileCheck %s --check-prefix=LONG-LLVM
+# RUN: llvm-readelf --dynamic-table %t.o | FileCheck %s --check-prefix=LONG-GNU
 
-# LONG:      DynamicSection [ (2 entries)
-# LONG-NEXT:   Tag                Type                 Name/Value
-# LONG-NEXT:   0x0000000000000015 DEBUG                0x0
-# LONG-NEXT:   0x0000000000000000 NULL                 0x0
-# LONG-NEXT: ]
+# LONG-LLVM:      DynamicSection [ (2 entries)
+# LONG-LLVM-NEXT:   Tag                Type                 Name/Value
+# LONG-LLVM-NEXT:   0x0000000000000015 DEBUG                0x0
+# LONG-LLVM-NEXT:   0x0000000000000000 NULL                 0x0
+# LONG-LLVM-NEXT: ]
+
+# LONG-GNU:      Dynamic section at offset {{.*}} contains 2 entries:
+# LONG-GNU-NEXT:   Tag                Type                 Name/Value
+# LONG-GNU-NEXT:   0x0000000000000015 (DEBUG)              0x0
+# LONG-GNU-NEXT:   0x0000000000000000 (NULL)               0x0
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_X86_64
 Sections:

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

 # Test that hexagon machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=1 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.hex
 # RUN: llvm-readobj --dynamic-table %t.hex | FileCheck %s --check-prefix=LLVM-HEXAGON
 # RUN: llvm-readelf --dynamic-table %t.hex | FileCheck %s --check-prefix=GNU-HEXAGON
 
 # LLVM-HEXAGON:      DynamicSection [ (6 entries)
 # LLVM-HEXAGON-NEXT:   Tag                Type                 Name/Value
 # LLVM-HEXAGON-NEXT:   0x0000000000000004 HASH                 0x1000
 # LLVM-HEXAGON-NEXT:   0x0000000070000000 HEXAGON_SYMSZ        0x10
 # LLVM-HEXAGON-NEXT:   0x0000000070000001 HEXAGON_VER          4096
 # LLVM-HEXAGON-NEXT:   0x0000000070000002 HEXAGON_PLT          0x1000
 # LLVM-HEXAGON-NEXT:   0x000000001234ABCD unknown              0x1
 # LLVM-HEXAGON-NEXT:   0x0000000000000000 NULL                 0x0
 # LLVM-HEXAGON-NEXT: ]
 
-# GNU-HEXAGON:      DynamicSection [ (6 entries)
+# GNU-HEXAGON:      Dynamic section at offset {{.*}} contains 6 entries:
 # GNU-HEXAGON-NEXT:   Tag                Type                 Name/Value
-# GNU-HEXAGON-NEXT:   0x0000000000000004 HASH                 0x1000
-# GNU-HEXAGON-NEXT:   0x0000000070000000 HEXAGON_SYMSZ        0x10
-# GNU-HEXAGON-NEXT:   0x0000000070000001 HEXAGON_VER          4096
-# GNU-HEXAGON-NEXT:   0x0000000070000002 HEXAGON_PLT          0x1000
-# GNU-HEXAGON-NEXT:   0x000000001234abcd unknown              0x1
-# GNU-HEXAGON-NEXT:   0x0000000000000000 NULL                 0x0
-# GNU-HEXAGON-NEXT: ]
+# GNU-HEXAGON-NEXT:   0x0000000000000004 (HASH)               0x1000
+# GNU-HEXAGON-NEXT:   0x0000000070000000 (HEXAGON_SYMSZ)      0x10
+# GNU-HEXAGON-NEXT:   0x0000000070000001 (HEXAGON_VER)        4096
+# GNU-HEXAGON-NEXT:   0x0000000070000002 (HEXAGON_PLT)        0x1000
+# GNU-HEXAGON-NEXT:   0x000000001234abcd (unknown)            0x1
+# GNU-HEXAGON-NEXT:   0x0000000000000000 (NULL)               0x0
 
 
 # Test that MIPS machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=2 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.mips
 # RUN: llvm-readobj --dynamic-table %t.mips | FileCheck %s --check-prefix=LLVM-MIPS
 # RUN: llvm-readelf --dynamic-table %t.mips | FileCheck %s --check-prefix=GNU-MIPS
 
 # LLVM-MIPS:      DynamicSection [ (48 entries)

 # LLVM-MIPS-NEXT:   0x0000000070000031 MIPS_AUX_DYNAMIC     0x1000
 # LLVM-MIPS-NEXT:   0x0000000070000032 MIPS_PLTGOT          0x1000
 # LLVM-MIPS-NEXT:   0x0000000070000034 MIPS_RWPLT           0x1000
 # LLVM-MIPS-NEXT:   0x0000000070000035 MIPS_RLD_MAP_REL     0x1000
 # LLVM-MIPS-NEXT:   0x000000001234ABCD unknown              0x1
 # LLVM-MIPS-NEXT:   0x0000000000000000 NULL                 0x0
 # LLVM-MIPS-NEXT: ]
 
-# GNU-MIPS:      DynamicSection [ (48 entries)
-# GNU-MIPS-NEXT:     Tag                Type                 Name/Value
-# GNU-MIPS-NEXT:   0x0000000000000004 HASH                 0x1000
-# GNU-MIPS-NEXT:   0x0000000070000001 MIPS_RLD_VERSION     305419896
-# GNU-MIPS-NEXT:   0x0000000070000002 MIPS_TIME_STAMP      0x11223344
-# GNU-MIPS-NEXT:   0x0000000070000003 MIPS_ICHECKSUM       0x11112222
-# GNU-MIPS-NEXT:   0x0000000070000004 MIPS_IVERSION        0x1
-# GNU-MIPS-NEXT:   0x0000000070000005 MIPS_FLAGS           QUICKSTART SGI_ONLY PIXIE CORD
-# GNU-MIPS-NEXT:   0x0000000070000006 MIPS_BASE_ADDRESS    0x87654321
-# GNU-MIPS-NEXT:   0x0000000070000007 MIPS_MSYM            0x1000
-# GNU-MIPS-NEXT:   0x0000000070000008 MIPS_CONFLICT        0x1000
-# GNU-MIPS-NEXT:   0x0000000070000009 MIPS_LIBLIST         0x1000
-# GNU-MIPS-NEXT:   0x000000007000000a MIPS_LOCAL_GOTNO     1
-# GNU-MIPS-NEXT:   0x000000007000000b MIPS_CONFLICTNO      0x1
-# GNU-MIPS-NEXT:   0x0000000070000010 MIPS_LIBLISTNO       0x1
-# GNU-MIPS-NEXT:   0x0000000070000011 MIPS_SYMTABNO        1
-# GNU-MIPS-NEXT:   0x0000000070000012 MIPS_UNREFEXTNO      0
-# GNU-MIPS-NEXT:   0x0000000070000013 MIPS_GOTSYM          0x0
-# GNU-MIPS-NEXT:   0x0000000070000014 MIPS_HIPAGENO        0x88776655
-# GNU-MIPS-NEXT:   0x0000000070000016 MIPS_RLD_MAP         0x1000
-# GNU-MIPS-NEXT:   0x0000000070000017 MIPS_DELTA_CLASS     0x1000
-# GNU-MIPS-NEXT:   0x0000000070000018 MIPS_DELTA_CLASS_NO  0x1
-# GNU-MIPS-NEXT:   0x0000000070000019 MIPS_DELTA_INSTANCE  0x1000
-# GNU-MIPS-NEXT:   0x000000007000001a MIPS_DELTA_INSTANCE_NO0x1
-# GNU-MIPS-NEXT:   0x000000007000001b MIPS_DELTA_RELOC     0x1000
-# GNU-MIPS-NEXT:   0x000000007000001c MIPS_DELTA_RELOC_NO  0x1
-# GNU-MIPS-NEXT:   0x000000007000001d MIPS_DELTA_SYM       0x1000
-# GNU-MIPS-NEXT:   0x000000007000001e MIPS_DELTA_SYM_NO    0x1
-# GNU-MIPS-NEXT:   0x0000000070000020 MIPS_DELTA_CLASSSYM  0x1000
-# GNU-MIPS-NEXT:   0x0000000070000021 MIPS_DELTA_CLASSSYM_NO0x1
-# GNU-MIPS-NEXT:   0x0000000070000022 MIPS_CXX_FLAGS       0x88887777
-# GNU-MIPS-NEXT:   0x0000000070000023 MIPS_PIXIE_INIT      0x1000
-# GNU-MIPS-NEXT:   0x0000000070000025 MIPS_LOCALPAGE_GOTIDX0x1
-# GNU-MIPS-NEXT:   0x0000000070000026 MIPS_LOCAL_GOTIDX    0x1
-# GNU-MIPS-NEXT:   0x0000000070000027 MIPS_HIDDEN_GOTIDX   0x1
-# GNU-MIPS-NEXT:   0x0000000070000028 MIPS_PROTECTED_GOTIDX0x1
-# GNU-MIPS-NEXT:   0x0000000070000029 MIPS_OPTIONS         0x1000
-# GNU-MIPS-NEXT:   0x000000007000002a MIPS_INTERFACE       0x1000
-# GNU-MIPS-NEXT:   0x000000007000002b MIPS_DYNSTR_ALIGN    0x88888888
-# GNU-MIPS-NEXT:   0x000000007000002c MIPS_INTERFACE_SIZE  0x10
-# GNU-MIPS-NEXT:   0x000000007000002d MIPS_RLD_TEXT_RESOLVE_ADDR0x8
-# GNU-MIPS-NEXT:   0x000000007000002e MIPS_PERF_SUFFIX     0x0
-# GNU-MIPS-NEXT:   0x000000007000002f MIPS_COMPACT_SIZE    0x10
-# GNU-MIPS-NEXT:   0x0000000070000030 MIPS_GP_VALUE        0x1
-# GNU-MIPS-NEXT:   0x0000000070000031 MIPS_AUX_DYNAMIC     0x1000
-# GNU-MIPS-NEXT:   0x0000000070000032 MIPS_PLTGOT          0x1000
-# GNU-MIPS-NEXT:   0x0000000070000034 MIPS_RWPLT           0x1000
-# GNU-MIPS-NEXT:   0x0000000070000035 MIPS_RLD_MAP_REL     0x1000
-# GNU-MIPS-NEXT:   0x000000001234abcd unknown              0x1
-# GNU-MIPS-NEXT:   0x0000000000000000 NULL                 0x0
-# GNU-MIPS-NEXT: ]
+# GNU-MIPS:      Dynamic section at offset {{.*}} contains 48 entries:
+# GNU-MIPS-NEXT:   Tag                Type                 Name/Value
+# GNU-MIPS-NEXT:   0x0000000000000004 (HASH)               0x1000
+# GNU-MIPS-NEXT:   0x0000000070000001 (MIPS_RLD_VERSION)   305419896
+# GNU-MIPS-NEXT:   0x0000000070000002 (MIPS_TIME_STAMP)    0x11223344
+# GNU-MIPS-NEXT:   0x0000000070000003 (MIPS_ICHECKSUM)     0x11112222
+# GNU-MIPS-NEXT:   0x0000000070000004 (MIPS_IVERSION)      0x1
+# GNU-MIPS-NEXT:   0x0000000070000005 (MIPS_FLAGS)         QUICKSTART SGI_ONLY PIXIE CORD
+# GNU-MIPS-NEXT:   0x0000000070000006 (MIPS_BASE_ADDRESS)  0x87654321
+# GNU-MIPS-NEXT:   0x0000000070000007 (MIPS_MSYM)          0x1000
+# GNU-MIPS-NEXT:   0x0000000070000008 (MIPS_CONFLICT)      0x1000
+# GNU-MIPS-NEXT:   0x0000000070000009 (MIPS_LIBLIST)       0x1000
+# GNU-MIPS-NEXT:   0x000000007000000a (MIPS_LOCAL_GOTNO)   1
+# GNU-MIPS-NEXT:   0x000000007000000b (MIPS_CONFLICTNO)    0x1
+# GNU-MIPS-NEXT:   0x0000000070000010 (MIPS_LIBLISTNO)     0x1
+# GNU-MIPS-NEXT:   0x0000000070000011 (MIPS_SYMTABNO)      1
+# GNU-MIPS-NEXT:   0x0000000070000012 (MIPS_UNREFEXTNO)    0
+# GNU-MIPS-NEXT:   0x0000000070000013 (MIPS_GOTSYM)        0x0
+# GNU-MIPS-NEXT:   0x0000000070000014 (MIPS_HIPAGENO)      0x88776655
+# GNU-MIPS-NEXT:   0x0000000070000016 (MIPS_RLD_MAP)       0x1000
+# GNU-MIPS-NEXT:   0x0000000070000017 (MIPS_DELTA_CLASS)   0x1000
+# GNU-MIPS-NEXT:   0x0000000070000018 (MIPS_DELTA_CLASS_NO) 0x1
+# GNU-MIPS-NEXT:   0x0000000070000019 (MIPS_DELTA_INSTANCE) 0x1000
+# GNU-MIPS-NEXT:   0x000000007000001a (MIPS_DELTA_INSTANCE_NO) 0x1
+# GNU-MIPS-NEXT:   0x000000007000001b (MIPS_DELTA_RELOC)   0x1000
+# GNU-MIPS-NEXT:   0x000000007000001c (MIPS_DELTA_RELOC_NO) 0x1
+# GNU-MIPS-NEXT:   0x000000007000001d (MIPS_DELTA_SYM)     0x1000
+# GNU-MIPS-NEXT:   0x000000007000001e (MIPS_DELTA_SYM_NO)  0x1
+# GNU-MIPS-NEXT:   0x0000000070000020 (MIPS_DELTA_CLASSSYM) 0x1000
+# GNU-MIPS-NEXT:   0x0000000070000021 (MIPS_DELTA_CLASSSYM_NO) 0x1
+# GNU-MIPS-NEXT:   0x0000000070000022 (MIPS_CXX_FLAGS)     0x88887777
+# GNU-MIPS-NEXT:   0x0000000070000023 (MIPS_PIXIE_INIT)    0x1000
+# GNU-MIPS-NEXT:   0x0000000070000025 (MIPS_LOCALPAGE_GOTIDX) 0x1
+# GNU-MIPS-NEXT:   0x0000000070000026 (MIPS_LOCAL_GOTIDX)  0x1
+# GNU-MIPS-NEXT:   0x0000000070000027 (MIPS_HIDDEN_GOTIDX) 0x1
+# GNU-MIPS-NEXT:   0x0000000070000028 (MIPS_PROTECTED_GOTIDX) 0x1
+# GNU-MIPS-NEXT:   0x0000000070000029 (MIPS_OPTIONS)       0x1000
+# GNU-MIPS-NEXT:   0x000000007000002a (MIPS_INTERFACE)     0x1000
+# GNU-MIPS-NEXT:   0x000000007000002b (MIPS_DYNSTR_ALIGN)  0x88888888
+# GNU-MIPS-NEXT:   0x000000007000002c (MIPS_INTERFACE_SIZE) 0x10
+# GNU-MIPS-NEXT:   0x000000007000002d (MIPS_RLD_TEXT_RESOLVE_ADDR) 0x8
+# GNU-MIPS-NEXT:   0x000000007000002e (MIPS_PERF_SUFFIX)   0x0
+# GNU-MIPS-NEXT:   0x000000007000002f (MIPS_COMPACT_SIZE)  0x10
+# GNU-MIPS-NEXT:   0x0000000070000030 (MIPS_GP_VALUE)      0x1
+# GNU-MIPS-NEXT:   0x0000000070000031 (MIPS_AUX_DYNAMIC)   0x1000
+# GNU-MIPS-NEXT:   0x0000000070000032 (MIPS_PLTGOT)        0x1000
+# GNU-MIPS-NEXT:   0x0000000070000034 (MIPS_RWPLT)         0x1000
+# GNU-MIPS-NEXT:   0x0000000070000035 (MIPS_RLD_MAP_REL)   0x1000
+# GNU-MIPS-NEXT:   0x000000001234abcd (unknown)            0x1
+# GNU-MIPS-NEXT:   0x0000000000000000 (NULL)               0x0
 
 
 # Test that PPC64 machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=3 %S/Inputs/elf-dynamic-tags-machine-specific.yaml -o %t.ppc
 # RUN: llvm-readobj --dynamic-table %t.ppc | FileCheck %s --check-prefix=LLVM-PPC
 # RUN: llvm-readelf --dynamic-table %t.ppc | FileCheck %s --check-prefix=GNU-PPC
 
 # LLVM-PPC:      DynamicSection [ (4 entries)
 # LLVM-PPC-NEXT:   Tag                Type                 Name/Value
 # LLVM-PPC-NEXT:   0x0000000000000004 HASH                 0x1000
 # LLVM-PPC-NEXT:   0x0000000070000000 PPC64_GLINK          0x1000
 # LLVM-PPC-NEXT:   0x000000001234ABCD unknown              0x1
 # LLVM-PPC-NEXT:   0x0000000000000000 NULL                 0x0
 # LLVM-PPC-NEXT: ]
 
-# GNU-PPC:      DynamicSection [ (4 entries)
+# GNU-PPC:      Dynamic section at offset {{.*}} contains 4 entries:
 # GNU-PPC-NEXT:   Tag                Type                 Name/Value
-# GNU-PPC-NEXT:   0x0000000000000004 HASH                 0x1000
-# GNU-PPC-NEXT:   0x0000000070000000 PPC64_GLINK          0x1000
-# GNU-PPC-NEXT:   0x000000001234abcd unknown              0x1
-# GNU-PPC-NEXT:   0x0000000000000000 NULL                 0x0
-# GNU-PPC-NEXT: ]
+# GNU-PPC-NEXT:   0x0000000000000004 (HASH)               0x1000
+# GNU-PPC-NEXT:   0x0000000070000000 (PPC64_GLINK)        0x1000
+# GNU-PPC-NEXT:   0x000000001234abcd (unknown)            0x1
+# GNU-PPC-NEXT:   0x0000000000000000 (NULL)               0x0

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

 # LLVM-NEXT:   0x000000007FFFFFFE USED                 Not needed object: [U]
 # LLVM-NEXT:   0x000000007FFFFFFF FILTER               Filter library: [U]
 # LLVM-NEXT:   0x0000000012345678 unknown              0x8765432187654321
 # LLVM-NEXT:   0x000000006ABCDEF0 unknown              0x9988776655443322
 # LLVM-NEXT:   0x0000000076543210 unknown              0x5555666677778888
 # LLVM-NEXT:   0x0000000000000000 NULL                 0x0
 # LLVM-NEXT: ]
 
-# GNU:      DynamicSection [ (61 entries)
+# GNU:      Dynamic section at offset {{.*}} contains 61 entries:
 # GNU-NEXT:   Tag                Type                 Name/Value
-# GNU-NEXT:   0x0000000000000001 NEEDED               Shared library: [D]
-# GNU-NEXT:   0x0000000000000002 PLTRELSZ             16 (bytes)
-# GNU-NEXT:   0x0000000000000003 PLTGOT               0x1000
-# GNU-NEXT:   0x0000000000000004 HASH                 0x1000
-# GNU-NEXT:   0x0000000000000005 STRTAB               0x1000
-# GNU-NEXT:   0x0000000000000006 SYMTAB               0x1000
-# GNU-NEXT:   0x0000000000000007 RELA                 0x1000
-# GNU-NEXT:   0x0000000000000008 RELASZ               16 (bytes)
-# GNU-NEXT:   0x0000000000000009 RELAENT              1929 (bytes)
-# GNU-NEXT:   0x000000000000000a STRSZ                16 (bytes)
-# GNU-NEXT:   0x000000000000000b SYMENT               2439 (bytes)
-# GNU-NEXT:   0x000000000000000c INIT                 0x1000
-# GNU-NEXT:   0x000000000000000d FINI                 0x1000
-# GNU-NEXT:   0x000000000000000e SONAME               Library soname: [U]
-# GNU-NEXT:   0x000000000000000f RPATH                f
-# GNU-NEXT:   0x0000000000000010 SYMBOLIC             0x1234567890abcdef
-# GNU-NEXT:   0x0000000000000011 REL                  0x1000
-# GNU-NEXT:   0x0000000000000012 RELSZ                16 (bytes)
-# GNU-NEXT:   0x0000000000000013 RELENT               291 (bytes)
-# GNU-NEXT:   0x0000000000000014 PLTREL               RELA
-# GNU-NEXT:   0x0000000000000015 DEBUG                0xfedcba0987654321
-# GNU-NEXT:   0x0000000000000016 TEXTREL              0x1122334455667788
-# GNU-NEXT:   0x0000000000000017 JMPREL               0x1000
-# GNU-NEXT:   0x0000000000000018 BIND_NOW             0x8877665544332211
-# GNU-NEXT:   0x0000000000000019 INIT_ARRAY           0x1000
-# GNU-NEXT:   0x000000000000001a FINI_ARRAY           0x1000
-# GNU-NEXT:   0x000000000000001b INIT_ARRAYSZ         16 (bytes)
-# GNU-NEXT:   0x000000000000001c FINI_ARRAYSZ         16 (bytes)
-# GNU-NEXT:   0x000000000000001d RUNPATH              w
-# GNU-NEXT:   0x000000000000001e FLAGS                ORIGIN SYMBOLIC TEXTREL BIND_NOW STATIC_TLS {{$}}
-# GNU-NEXT:   0x0000000000000020 PREINIT_ARRAY        0x1000
-# GNU-NEXT:   0x0000000000000021 PREINIT_ARRAYSZ      16 (bytes)
-# GNU-NEXT:   0x0000000000000022 SYMTAB_SHNDX         0x1000
-# GNU-NEXT:   0x0000000000000023 RELRSZ               0x10
-# GNU-NEXT:   0x0000000000000024 RELR                 0x1000
-# GNU-NEXT:   0x0000000000000025 RELRENT              0x4321
-# GNU-NEXT:   0x000000006000000f ANDROID_REL          0x1000
-# GNU-NEXT:   0x0000000060000010 ANDROID_RELSZ        16 (bytes)
-# GNU-NEXT:   0x0000000060000011 ANDROID_RELA         0x1000
-# GNU-NEXT:   0x0000000060000012 ANDROID_RELASZ       16 (bytes)
-# GNU-NEXT:   0x000000006fffe000 ANDROID_RELR         0x1000
-# GNU-NEXT:   0x000000006fffe001 ANDROID_RELRSZ       0x10
-# GNU-NEXT:   0x000000006fffe003 ANDROID_RELRENT      0x1234
-# GNU-NEXT:   0x000000006ffffef5 GNU_HASH             0x1000
-# GNU-NEXT:   0x000000006ffffef6 TLSDESC_PLT          0x1000
-# GNU-NEXT:   0x000000006ffffef7 TLSDESC_GOT          0x1000
-# GNU-NEXT:   0x000000006ffffff9 RELACOUNT            0
-# GNU-NEXT:   0x000000006ffffffa RELCOUNT             0
-# GNU-NEXT:   0x000000006ffffffb FLAGS_1              NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON {{$}}
-# GNU-NEXT:   0x000000006ffffff0 VERSYM               0x1000
-# GNU-NEXT:   0x000000006ffffffc VERDEF               0x1000
-# GNU-NEXT:   0x000000006ffffffd VERDEFNUM            0
-# GNU-NEXT:   0x000000006ffffffe VERNEED              0x1000
-# GNU-NEXT:   0x000000006fffffff VERNEEDNUM           0
-# GNU-NEXT:   0x000000007ffffffd AUXILIARY            Auxiliary library: [D]
-# GNU-NEXT:   0x000000007ffffffe USED                 Not needed object: [U]
-# GNU-NEXT:   0x000000007fffffff FILTER               Filter library: [U]
-# GNU-NEXT:   0x0000000012345678 unknown              0x8765432187654321
-# GNU-NEXT:   0x000000006abcdef0 unknown              0x9988776655443322
-# GNU-NEXT:   0x0000000076543210 unknown              0x5555666677778888
-# GNU-NEXT:   0x0000000000000000 NULL                 0x0
-# GNU-NEXT: ]
+# GNU-NEXT:   0x0000000000000001 (NEEDED)             Shared library: [D]
+# GNU-NEXT:   0x0000000000000002 (PLTRELSZ)           16 (bytes)
+# GNU-NEXT:   0x0000000000000003 (PLTGOT)             0x1000
+# GNU-NEXT:   0x0000000000000004 (HASH)               0x1000
+# GNU-NEXT:   0x0000000000000005 (STRTAB)             0x1000
+# GNU-NEXT:   0x0000000000000006 (SYMTAB)             0x1000
+# GNU-NEXT:   0x0000000000000007 (RELA)               0x1000
+# GNU-NEXT:   0x0000000000000008 (RELASZ)             16 (bytes)
+# GNU-NEXT:   0x0000000000000009 (RELAENT)            1929 (bytes)
+# GNU-NEXT:   0x000000000000000a (STRSZ)              16 (bytes)
+# GNU-NEXT:   0x000000000000000b (SYMENT)             2439 (bytes)
+# GNU-NEXT:   0x000000000000000c (INIT)               0x1000
+# GNU-NEXT:   0x000000000000000d (FINI)               0x1000
+# GNU-NEXT:   0x000000000000000e (SONAME)             Library soname: [U]
+# GNU-NEXT:   0x000000000000000f (RPATH)              f
+# GNU-NEXT:   0x0000000000000010 (SYMBOLIC)           0x1234567890abcdef
+# GNU-NEXT:   0x0000000000000011 (REL)                0x1000
+# GNU-NEXT:   0x0000000000000012 (RELSZ)              16 (bytes)
+# GNU-NEXT:   0x0000000000000013 (RELENT)             291 (bytes)
+# GNU-NEXT:   0x0000000000000014 (PLTREL)             RELA
+# GNU-NEXT:   0x0000000000000015 (DEBUG)              0xfedcba0987654321
+# GNU-NEXT:   0x0000000000000016 (TEXTREL)            0x1122334455667788
+# GNU-NEXT:   0x0000000000000017 (JMPREL)             0x1000
+# GNU-NEXT:   0x0000000000000018 (BIND_NOW)           0x8877665544332211
+# GNU-NEXT:   0x0000000000000019 (INIT_ARRAY)         0x1000
+# GNU-NEXT:   0x000000000000001a (FINI_ARRAY)         0x1000
+# GNU-NEXT:   0x000000000000001b (INIT_ARRAYSZ)       16 (bytes)
+# GNU-NEXT:   0x000000000000001c (FINI_ARRAYSZ)       16 (bytes)
+# GNU-NEXT:   0x000000000000001d (RUNPATH)            w
+# GNU-NEXT:   0x000000000000001e (FLAGS)              ORIGIN SYMBOLIC TEXTREL BIND_NOW STATIC_TLS {{$}}
+# GNU-NEXT:   0x0000000000000020 (PREINIT_ARRAY)      0x1000
+# GNU-NEXT:   0x0000000000000021 (PREINIT_ARRAYSZ)    16 (bytes)
+# GNU-NEXT:   0x0000000000000022 (SYMTAB_SHNDX)       0x1000
+# GNU-NEXT:   0x0000000000000023 (RELRSZ)             0x10
+# GNU-NEXT:   0x0000000000000024 (RELR)               0x1000
+# GNU-NEXT:   0x0000000000000025 (RELRENT)            0x4321
+# GNU-NEXT:   0x000000006000000f (ANDROID_REL)        0x1000
+# GNU-NEXT:   0x0000000060000010 (ANDROID_RELSZ)      16 (bytes)
+# GNU-NEXT:   0x0000000060000011 (ANDROID_RELA)       0x1000
+# GNU-NEXT:   0x0000000060000012 (ANDROID_RELASZ)     16 (bytes)
+# GNU-NEXT:   0x000000006fffe000 (ANDROID_RELR)       0x1000
+# GNU-NEXT:   0x000000006fffe001 (ANDROID_RELRSZ)     0x10
+# GNU-NEXT:   0x000000006fffe003 (ANDROID_RELRENT)    0x1234
+# GNU-NEXT:   0x000000006ffffef5 (GNU_HASH)           0x1000
+# GNU-NEXT:   0x000000006ffffef6 (TLSDESC_PLT)        0x1000
+# GNU-NEXT:   0x000000006ffffef7 (TLSDESC_GOT)        0x1000
+# GNU-NEXT:   0x000000006ffffff9 (RELACOUNT)          0
+# GNU-NEXT:   0x000000006ffffffa (RELCOUNT)           0
+# GNU-NEXT:   0x000000006ffffffb (FLAGS_1)            NOW GLOBAL GROUP NODELETE LOADFLTR INITFIRST NOOPEN ORIGIN DIRECT TRANS INTERPOSE NODEFLIB NODUMP CONFALT ENDFILTEE DISPRELDNE DISPRELPND NODIRECT IGNMULDEF NOKSYMS NOHDR EDITED NORELOC SYMINTPOSE GLOBAUDIT SINGLETON {{$}}
+# GNU-NEXT:   0x000000006ffffff0 (VERSYM)             0x1000
+# GNU-NEXT:   0x000000006ffffffc (VERDEF)             0x1000
+# GNU-NEXT:   0x000000006ffffffd (VERDEFNUM)          0
+# GNU-NEXT:   0x000000006ffffffe (VERNEED)            0x1000
+# GNU-NEXT:   0x000000006fffffff (VERNEEDNUM)         0
+# GNU-NEXT:   0x000000007ffffffd (AUXILIARY)          Auxiliary library: [D]
+# GNU-NEXT:   0x000000007ffffffe (USED)               Not needed object: [U]
+# GNU-NEXT:   0x000000007fffffff (FILTER)             Filter library: [U]
+# GNU-NEXT:   0x0000000012345678 (unknown)            0x8765432187654321
+# GNU-NEXT:   0x000000006abcdef0 (unknown)            0x9988776655443322
+# GNU-NEXT:   0x0000000076543210 (unknown)            0x5555666677778888
+# GNU-NEXT:   0x0000000000000000 (NULL)               0x0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

llvm/test/tools/llvm-readobj/elf-non-dynamic-in-pt-dynamic.test

 ## Show that llvm-readobj/llvm-readelf tools can dump the .dynamic section which
 ## is not alone in PT_DYNAMIC segment.
 
 ## In the first case .text is placed before .dynamic.
 ## We check that we warn about this case.
 
 # RUN: yaml2obj --docnum=1 %s -o %t.o
-# RUN: llvm-readobj --dynamic-table %t.o 2>&1 | FileCheck %s --check-prefixes=WARNING,CHECK
-# RUN: llvm-readelf --dynamic-table %t.o 2>&1 | FileCheck %s --check-prefixes=WARNING,CHECK
+# RUN: llvm-readobj --dynamic-table %t.o 2>&1 \
+# RUN:   | FileCheck %s --check-prefixes=WARNING,LLVM
+# RUN: llvm-readelf --dynamic-table %t.o 2>&1 \
+# RUN:   | FileCheck %s --check-prefixes=WARNING,GNU
 
 # WARNING:    warning: The SHT_DYNAMIC section '.dynamic' is not at the start of PT_DYNAMIC segment
-# CHECK:      DynamicSection [ (2 entries)
-# CHECK-NEXT:   Tag                Type     Name/Value
-# CHECK-NEXT:   0x0000000000000018 BIND_NOW 0x1
-# CHECK-NEXT:   0x0000000000000000 NULL     0x0
-# CHECK-NEXT: ]
+
+# LLVM:      DynamicSection [ (2 entries)
+# LLVM-NEXT:   Tag                Type     Name/Value
+# LLVM-NEXT:   0x0000000000000018 BIND_NOW 0x1
+# LLVM-NEXT:   0x0000000000000000 NULL     0x0
+# LLVM-NEXT: ]
+
+# GNU:      Dynamic section at offset 0x{{.*}} contains 2 entries:
+# GNU-NEXT:   Tag                Type       Name/Value
+# GNU-NEXT:   0x0000000000000018 (BIND_NOW) 0x1
+# GNU-NEXT:   0x0000000000000000 (NULL)     0x0
 
 --- !ELF
 FileHeader:
   Class:   ELFCLASS64
   Data:    ELFDATA2LSB
   Type:    ET_EXEC
   Machine: EM_X86_64
 Sections:

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

 LLVM-VERDEF-NEXT:     Flags: 0x0
 LLVM-VERDEF-NEXT:     Index: 3
 LLVM-VERDEF-NEXT:     Hash: 175630258
 LLVM-VERDEF-NEXT:     Name: VERSION2
 LLVM-VERDEF-NEXT:     Predecessor: VERSION1
 LLVM-VERDEF-NEXT:   }
 LLVM-VERDEF-NEXT: }
 
-GNU-VERDEF: 0x000000006ffffff0 VERSYM               0x24c
-GNU-VERDEF: 0x000000006ffffffc VERDEF               0x25c
-GNU-VERDEF: 0x000000006ffffffd VERDEFNUM            3
+GNU-VERDEF: 0x000000006ffffff0 (VERSYM)             0x24c
+GNU-VERDEF: 0x000000006ffffffc (VERDEF)             0x25c
+GNU-VERDEF: 0x000000006ffffffd (VERDEFNUM)          3
 
 GNU-VERDEF:      Version symbols section '.gnu.version' contains 8 entries:
 GNU-VERDEF-NEXT:  Addr: 000000000000024c  Offset: 0x00024c  Link: 1 (.dynsym)
 GNU-VERDEF-NEXT:   000:   0 (*local*)       1 (*global*)      1 (*global*)      3 (VERSION2)
 GNU-VERDEF-NEXT:   004:   1 (*global*)      2 (VERSION1)      2 (VERSION1)      3 (VERSION2)
 
 GNU-VERDEF: Dumper for .gnu.version_d is not implemented
 

llvm/tools/llvm-readobj/ELFDumper.cpp

private:
   DynRegionInfo createDRIFrom(const Elf_Shdr *S) {
     return checkDRI(
         {ObjF->getELFFile()->base() + S->sh_offset, S->sh_size, S->sh_entsize});
   }
 
   void loadDynamicTable(const ELFFile<ELFT> *Obj);
   void parseDynamicTable();
 
-  void printValue(uint64_t Type, uint64_t Value);
-
   StringRef getDynamicString(uint64_t Offset) const;
   StringRef getSymbolVersion(StringRef StrTab, const Elf_Sym *symb,
                              bool &IsDefault) const;
   void LoadVersionMap() const;
   void LoadVersionNeeds(const Elf_Shdr *ec) const;
   void LoadVersionDefs(const Elf_Shdr *sec) const;
 
   const object::ELFObjectFile<ELFT> *ObjF;
void getSectionNameIndex(const Elf_Sym *Symbol, const Elf_Sym *FirstSym,
                            StringRef &SectionName,
                            unsigned &SectionIndex) const;
   std::string getStaticSymbolName(uint32_t Index) const;
   StringRef getSymbolVersionByIndex(StringRef StrTab,
                                     uint32_t VersionSymbolIndex,
                                     bool &IsDefault) const;
 
   void printSymbolsHelper(bool IsDynamic) const;
+  void printDynamicEntry(raw_ostream &OS, uint64_t Type, uint64_t Value) const;
+
   const Elf_Shdr *getDotSymtabSec() const { return DotSymtabSec; }
   const Elf_Shdr *getDotCGProfileSec() const { return DotCGProfileSec; }
   const Elf_Shdr *getDotAddrsigSec() const { return DotAddrsigSec; }
   ArrayRef<Elf_Word> getShndxTable() const { return ShndxTable; }
   StringRef getDynamicStringTable() const { return DynamicStringTable; }
   const DynRegionInfo &getDynRelRegion() const { return DynRelRegion; }
   const DynRegionInfo &getDynRelaRegion() const { return DynRelaRegion; }
   const DynRegionInfo &getDynRelrRegion() const { return DynRelrRegion; }
   const DynRegionInfo &getDynPLTRelRegion() const { return DynPLTRelRegion; }
+  const DynRegionInfo &getDynamicTableRegion() const { return DynamicTable; }
   const Elf_Hash *getHashTable() const { return HashTable; }
   const Elf_GnuHash *getGnuHashTable() const { return GnuHashTable; }
 };
 
 template <class ELFT>
 void ELFDumper<ELFT>::printSymbolsHelper(bool IsDynamic) const {
   StringRef StrTable, SymtabName;
   size_t Entries = 0;
public:
 
   virtual void printFileHeaders(const ELFFile<ELFT> *Obj) = 0;
   virtual void printGroupSections(const ELFFile<ELFT> *Obj) = 0;
   virtual void printRelocations(const ELFFile<ELFT> *Obj) = 0;
   virtual void printSectionHeaders(const ELFFile<ELFT> *Obj) = 0;
   virtual void printSymbols(const ELFFile<ELFT> *Obj, bool PrintSymbols,
                             bool PrintDynamicSymbols) = 0;
   virtual void printHashSymbols(const ELFFile<ELFT> *Obj) {}
+  virtual void printDynamic(const ELFFile<ELFT> *Obj) {}
   virtual void printDynamicRelocations(const ELFFile<ELFT> *Obj) = 0;
   virtual void printSymtabMessage(const ELFFile<ELFT> *Obj, StringRef Name,
                                   size_t Offset) {}
   virtual void printSymbol(const ELFFile<ELFT> *Obj, const Elf_Sym *Symbol,
                            const Elf_Sym *FirstSym, StringRef StrTable,
                            bool IsDynamic) = 0;
   virtual void printProgramHeaders(const ELFFile<ELFT> *Obj,
                                    bool PrintProgramHeaders,
public:
 
   void printFileHeaders(const ELFO *Obj) override;
   void printGroupSections(const ELFFile<ELFT> *Obj) override;
   void printRelocations(const ELFO *Obj) override;
   void printSectionHeaders(const ELFO *Obj) override;
   void printSymbols(const ELFO *Obj, bool PrintSymbols,
                     bool PrintDynamicSymbols) override;
   void printHashSymbols(const ELFO *Obj) override;
+  void printDynamic(const ELFFile<ELFT> *Obj) override;
   void printDynamicRelocations(const ELFO *Obj) override;
   void printSymtabMessage(const ELFO *Obj, StringRef Name,
                           size_t Offset) override;
   void printProgramHeaders(const ELFO *Obj, bool PrintProgramHeaders,
                            cl::boolOrDefault PrintSectionMapping) override;
   void printVersionSymbolSection(const ELFFile<ELFT> *Obj,
                                  const Elf_Shdr *Sec) override;
   void printVersionDefinitionSection(const ELFFile<ELFT> *Obj,
public:
 
   void printFileHeaders(const ELFO *Obj) override;
   void printGroupSections(const ELFFile<ELFT> *Obj) override;
   void printRelocations(const ELFO *Obj) override;
   void printRelocations(const Elf_Shdr *Sec, const ELFO *Obj);
   void printSectionHeaders(const ELFO *Obj) override;
   void printSymbols(const ELFO *Obj, bool PrintSymbols,
                     bool PrintDynamicSymbols) override;
+  void printDynamic(const ELFFile<ELFT> *Obj) override;
   void printDynamicRelocations(const ELFO *Obj) override;
   void printProgramHeaders(const ELFO *Obj, bool PrintProgramHeaders,
                            cl::boolOrDefault PrintSectionMapping) override;
   void printVersionSymbolSection(const ELFFile<ELFT> *Obj,
                                  const Elf_Shdr *Sec) override;
   void printVersionDefinitionSection(const ELFFile<ELFT> *Obj,
                                      const Elf_Shdr *Sec) override;
   void printVersionDependencySection(const ELFFile<ELFT> *Obj,
StringRef ELFDumper<ELFT>::getDynamicString(uint64_t Value) const {
   return StringRef(DynamicStringTable.data() + Value);
 }
 
 static void printLibrary(raw_ostream &OS, const Twine &Tag, const Twine &Name) {
   OS << Tag << ": [" << Name << "]";
 }
 
 template <class ELFT>
-void ELFDumper<ELFT>::printValue(uint64_t Type, uint64_t Value) {
-  raw_ostream &OS = W.getOStream();
+void ELFDumper<ELFT>::printDynamicEntry(raw_ostream &OS, uint64_t Type,
+                                        uint64_t Value) const {
   const char *ConvChar =
       (opts::Output == opts::GNU) ? "0x%" PRIx64 : "0x%" PRIX64;
   switch (Type) {
   case DT_PLTREL:
     if (Value == DT_REL) {
       OS << "REL";
       break;
     } else if (Value == DT_RELA) {
template <> void ELFDumper<ELF32LE>::printUnwindInfo() {
   }
   DwarfCFIEH::PrinterContext<ELF32LE> Ctx(W, ObjF);
   Ctx.printUnwindInformation();
 }
 
 } // end anonymous namespace
 
 template <class ELFT> void ELFDumper<ELFT>::printDynamicTable() {
-  // A valid .dynamic section contains an array of entries terminated with
-  // a DT_NULL entry. However, sometimes the section content may continue
-  // past the DT_NULL entry, so to dump the section correctly, we first find
-  // the end of the entries by iterating over them.
-  size_t Size = 0;
-  Elf_Dyn_Range DynTableEntries = dynamic_table();
-  for (; Size < DynTableEntries.size();)
-    if (DynTableEntries[Size++].getTag() == DT_NULL)
-      break;
-
-  if (!Size)
-    return;
-
-  raw_ostream &OS = W.getOStream();
-  W.startLine() << "DynamicSection [ (" << Size << " entries)\n";
-
-  bool Is64 = ELFT::Is64Bits;
-  W.startLine() << "  Tag" << (Is64 ? "                " : "        ") << "Type"
-                << "                 "
-                << "Name/Value\n";
-  for (size_t I = 0; I < Size; ++I) {
-    const Elf_Dyn &Entry = DynTableEntries[I];
-    uintX_t Tag = Entry.getTag();
-    W.startLine() << "  "
-                  << format_hex(Tag, Is64 ? 18 : 10, opts::Output != opts::GNU)
-                  << " "
-                  << format(
-                         "%-21s",
-                         getTypeString(
-                             ObjF->getELFFile()->getHeader()->e_machine, Tag));
-    printValue(Tag, Entry.getVal());
-    OS << "\n";
-  }
-
-  W.startLine() << "]\n";
+  ELFDumperStyle->printDynamic(ObjF->getELFFile());
 }
 
 template <class ELFT> void ELFDumper<ELFT>::printNeededLibraries() {
   ListScope D(W, "NeededLibraries");
 
   using LibsTy = std::vector<StringRef>;
   LibsTy Libs;
 
static std::string getSectionHeaderTableIndexString(const ELFFile<ELFT> *Obj) {
 
   ArrayRef<typename ELFT::Shdr> Arr = unwrapOrError(Obj->sections());
   if (Arr.empty())
     return "65535 (corrupt: out of range)";
   return to_string(ElfHeader->e_shstrndx) + " (" + to_string(Arr[0].sh_link) +
          ")";
 }
 
+template <class ELFT>
+static typename ELFT::DynRange
+rectifyDynamicTable(typename ELFT::DynRange Table) {
+  // A valid .dynamic section contains an array of entries terminated with
+  // a DT_NULL entry. However, sometimes the section content may continue
+  // past the DT_NULL entry, so to dump the section correctly, we first find
+  // the end of the entries by iterating over them.
+  size_t Size = 0;
+  while (Size < Table.size())
+    if (Table[Size++].getTag() == DT_NULL)
+      break;
+
+  return Table.slice(0, Size);
+}
+
 template <class ELFT> void GNUStyle<ELFT>::printFileHeaders(const ELFO *Obj) {
   const Elf_Ehdr *e = Obj->getHeader();
   OS << "ELF Header:\n";
   OS << "  Magic:  ";
   std::string Str;
   for (int i = 0; i < ELF::EI_NIDENT; i++)
     OS << format(" %02x", static_cast<int>(e->e_ident[i]));
   OS << "\n";
void GNUStyle<ELFT>::printDynamicRelocation(const ELFO *Obj, Elf_Rela R,
                                             bool IsRela) {
   uint32_t SymIndex = R.getSymbol(Obj->isMips64EL());
   const Elf_Sym *Sym = this->dumper()->dynamic_symbols().begin() + SymIndex;
   std::string SymbolName = maybeDemangle(
       unwrapOrError(Sym->getName(this->dumper()->getDynamicStringTable())));
   printRelocation(Obj, Sym, SymbolName, R, IsRela);
 }
 
+template <class ELFT> void GNUStyle<ELFT>::printDynamic(const ELFO *Obj) {
+  Elf_Dyn_Range Table =
+      rectifyDynamicTable<ELFT>(this->dumper()->dynamic_table());
+  if (Table.empty())
+    return;
+
+  const DynRegionInfo &DynamicTableRegion =
+      this->dumper()->getDynamicTableRegion();
+
+  OS << "Dynamic section at offset "
+     << format_hex(reinterpret_cast<const uint8_t *>(DynamicTableRegion.Addr) -
+                       Obj->base(),
+                   1)
+     << " contains " << Table.size() << " entries:\n";
+
+  bool Is64 = ELFT::Is64Bits;
+  OS << "  Tag" << (Is64 ? "                " : "        ") << "Type"
+     << "                 "
+     << "Name/Value\n";
+  for (auto Entry : Table) {
+    uintX_t Tag = Entry.getTag();
+    std::string TypeString = getTypeString(Obj->getHeader()->e_machine, Tag);
+    OS << format("  0x%0*x %-20s ", Is64 ? 16 : 8, Tag,
+                 ("(" + TypeString + ")").c_str());
+    this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal());
+    OS << "\n";
+  }
+}
+
 template <class ELFT>
 void GNUStyle<ELFT>::printDynamicRelocations(const ELFO *Obj) {
   const DynRegionInfo &DynRelRegion = this->dumper()->getDynRelRegion();
   const DynRegionInfo &DynRelaRegion = this->dumper()->getDynRelaRegion();
   const DynRegionInfo &DynRelrRegion = this->dumper()->getDynRelrRegion();
   const DynRegionInfo &DynPLTRelRegion = this->dumper()->getDynPLTRelRegion();
   if (DynRelaRegion.Size > 0) {
     OS << "\n'RELA' relocation section at offset "

 }
 
 template <class ELFT>
 void LLVMStyle<ELFT>::printDynamicSymbols(const ELFO *Obj) {
   ListScope Group(W, "DynamicSymbols");
   this->dumper()->printSymbolsHelper(true);
 }
 
+template <class ELFT> void LLVMStyle<ELFT>::printDynamic(const ELFFile<ELFT> *Obj) {
+  Elf_Dyn_Range Table =
+      rectifyDynamicTable<ELFT>(this->dumper()->dynamic_table());
+  if (Table.empty())
+    return;
+
+  raw_ostream &OS = W.getOStream();
+  W.startLine() << "DynamicSection [ (" << Table.size() << " entries)\n";
+
+  bool Is64 = ELFT::Is64Bits;
+  W.startLine() << "  Tag" << (Is64 ? "                " : "        ") << "Type"
+                << "                 "
+                << "Name/Value\n";
+  for (auto Entry : Table) {
+    uintX_t Tag = Entry.getTag();
+    W.startLine() << "  " << format_hex(Tag, Is64 ? 18 : 10, true) << " "
+                  << format("%-21s",
+                            getTypeString(Obj->getHeader()->e_machine, Tag));
+    this->dumper()->printDynamicEntry(OS, Tag, Entry.getVal());
+    OS << "\n";
+  }
+
+  W.startLine() << "]\n";
+}
+
 template <class ELFT>
 void LLVMStyle<ELFT>::printDynamicRelocations(const ELFO *Obj) {
   const DynRegionInfo &DynRelRegion = this->dumper()->getDynRelRegion();
   const DynRegionInfo &DynRelaRegion = this->dumper()->getDynRelaRegion();
   const DynRegionInfo &DynRelrRegion = this->dumper()->getDynRelrRegion();
   const DynRegionInfo &DynPLTRelRegion = this->dumper()->getDynPLTRelRegion();
   if (DynRelRegion.Size && DynRelaRegion.Size)
     report_fatal_error("There are both REL and RELA dynamic relocations");