[ELF] Fix GCC8 warnings about "fall through", NFCI

[Hahnfeld]

Summary

Add break statements in Object/ELF.cpp since the code should consider the
generic tags for Hexagon, MIPS, and PPC. Add a test (copied from llvm-readobj)
to show that this works correctly (earlier versions of this patch would have
asserted).

The warnings in X86ELFObjectWriter.cpp are actually false-positives since
the nested switch() handles all possible values and returns in all cases.
Make this explicit by adding llvm_unreachable's.

[ruiu]

llvm/lib/Object/ELF.cpp

441 ↗

(On Diff #188939)

Looks like in LLVM something like "Invalid dynamic tag type" is more common error message to pass to llvm_unreachable.

llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

116 ↗

(On Diff #188939)

Ditto -- I'd pass "Invalid relocation type".

[ruiu]

LGTM with these changes.

[MaskRay]

getDynamicTagAsString is used by llvm-objdump and it'd be better if llvm-objdump can parse some malformed binaries (with bad .dynsym). If the tag is unknown, falling back to the default label (return "<unknown:>0x"...) may make more sense.

[Hahnfeld]

In D58837#1416035, @MaskRay wrote:

getDynamicTagAsString is used by llvm-objdump and it'd be better if llvm-objdump can parse some malformed binaries (with bad .dynsym). If the tag is unknown, falling back to the default label (return "<unknown:>0x"...) may make more sense.

I think we could just add a break and handle that case in the generic switch below. But I think you're right, the current patch would break for Hexagon, MIPS and PPC64. I tested with assertions enabled, but maybe there is no test case exercising this code path?

[MaskRay]

In D58837#1416042, @Hahnfeld wrote:

In D58837#1416035, @MaskRay wrote:

getDynamicTagAsString is used by llvm-objdump and it'd be better if llvm-objdump can parse some malformed binaries (with bad .dynsym). If the tag is unknown, falling back to the default label (return "<unknown:>0x"...) may make more sense.

I think we could just add a break and handle that case in the generic switch below. But I think you're right, the current patch would break for Hexagon, MIPS and PPC64. I tested with assertions enabled, but maybe there is no test case exercising this code path?

Yes. For this patch using break; should be good enough. There may not be tests for such corrupted binaries.

[Hahnfeld]

Replace llvm_unreachables in Object/ELF.cpp by break statements and add test to exercise this code path.

[Hahnfeld]

In D58837#1416063, @MaskRay wrote:

In D58837#1416042, @Hahnfeld wrote:

I think we could just add a break and handle that case in the generic switch below. But I think you're right, the current patch would break for Hexagon, MIPS and PPC64. I tested with assertions enabled, but maybe there is no test case exercising this code path?

Yes. For this patch using break; should be good enough. There may not be tests for such corrupted binaries.

I've added one which would have asserted in the previous version of this patch.

[MaskRay]

llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

1 ↗

(On Diff #189049)

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

Does FileCheck %S/../llvm-readobj/xxxxx.test work?

[Hahnfeld]

llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

1 ↗

(On Diff #189049)

Yes, but from what I've seen in reviews so far it's generally not a good idea to reuse tests for two separate tools. And it wouldn't work anyway because the format is different.

What we could do though is moving the ELF description to some INPUTS/ and use it in both tests. That would leave the checks separate, but de-duplicate the yaml content. Let me know if you think that's worth it.

[MaskRay]

llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

1 ↗

(On Diff #189049)

Sorry my previous comment was a bit off. The check lines are separate from the rest of the input file. So it should be possible to use llvm-objdump <some operations> %S/../llvm-readobj/xxx.test | FileCheck %s

[Hahnfeld]

Move common ELF description to Inputs/.

[Hahnfeld]

llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

1 ↗

(On Diff #189049)

I've put it into %S/../llvm-readobj/Inputs/ which should make the intent clear that the file is used by multiple tests.

[Hahnfeld]

Gentle ping

[MaskRay]

llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

116 ↗

(On Diff #188939)

Is this done?

[Hahnfeld]

llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

116 ↗

(On Diff #188939)

I've updated the message to say "unexpected relocation type!" which is used elsewhere in this file. That should be visible in the latest diff.

llvm/trunk/lib/Object/ELF.cpp

 #define DYNAMIC_TAG(n, v)
   switch (Arch) {
   case ELF::EM_HEXAGON:
     switch (Type) {
 #define HEXAGON_DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value)
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef HEXAGON_DYNAMIC_TAG
     }
+    break;
 
   case ELF::EM_MIPS:
     switch (Type) {
 #define MIPS_DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value)
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef MIPS_DYNAMIC_TAG
     }
+    break;
 
   case ELF::EM_PPC64:
     switch (Type) {
 #define PPC64_DYNAMIC_TAG(name, value) DYNAMIC_STRINGIFY_ENUM(name, value)
 #include "llvm/BinaryFormat/DynamicTags.def"
 #undef PPC64_DYNAMIC_TAG
     }
+    break;
   }
 #undef DYNAMIC_TAG
   switch (Type) {
 // Now handle all dynamic tags except the architecture specific ones
 #define MIPS_DYNAMIC_TAG(name, value)
 #define HEXAGON_DYNAMIC_TAG(name, value)
 #define PPC64_DYNAMIC_TAG(name, value)
 // Also ignore marker tags such as DT_HIOS (maps to DT_VERNEEDNUM), etc.

llvm/trunk/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

case RT64_32:
       return IsPCRel ? ELF::R_X86_64_PC32 : ELF::R_X86_64_32;
     case RT64_32S:
       return ELF::R_X86_64_32S;
     case RT64_16:
       return IsPCRel ? ELF::R_X86_64_PC16 : ELF::R_X86_64_16;
     case RT64_8:
       return IsPCRel ? ELF::R_X86_64_PC8 : ELF::R_X86_64_8;
     }
+    llvm_unreachable("unexpected relocation type!");
   case MCSymbolRefExpr::VK_GOT:
     switch (Type) {
     case RT64_64:
       return IsPCRel ? ELF::R_X86_64_GOTPC64 : ELF::R_X86_64_GOT64;
     case RT64_32:
       return IsPCRel ? ELF::R_X86_64_GOTPC32 : ELF::R_X86_64_GOT32;
     case RT64_32S:
     case RT64_16:
     case RT64_8:
       llvm_unreachable("Unimplemented");
     }
+    llvm_unreachable("unexpected relocation type!");
   case MCSymbolRefExpr::VK_GOTOFF:
     assert(Type == RT64_64);
     assert(!IsPCRel);
     return ELF::R_X86_64_GOTOFF64;
   case MCSymbolRefExpr::VK_TPOFF:
     assert(!IsPCRel);
     switch (Type) {
     case RT64_64:
       return ELF::R_X86_64_TPOFF64;
     case RT64_32:
       return ELF::R_X86_64_TPOFF32;
     case RT64_32S:
     case RT64_16:
     case RT64_8:
       llvm_unreachable("Unimplemented");
     }
+    llvm_unreachable("unexpected relocation type!");
   case MCSymbolRefExpr::VK_DTPOFF:
     assert(!IsPCRel);
     switch (Type) {
     case RT64_64:
       return ELF::R_X86_64_DTPOFF64;
     case RT64_32:
       return ELF::R_X86_64_DTPOFF32;
     case RT64_32S:
     case RT64_16:
     case RT64_8:
       llvm_unreachable("Unimplemented");
     }
+    llvm_unreachable("unexpected relocation type!");
   case MCSymbolRefExpr::VK_SIZE:
     assert(!IsPCRel);
     switch (Type) {
     case RT64_64:
       return ELF::R_X86_64_SIZE64;
     case RT64_32:
       return ELF::R_X86_64_SIZE32;
     case RT64_32S:
     case RT64_16:
     case RT64_8:
       llvm_unreachable("Unimplemented");
     }
+    llvm_unreachable("unexpected relocation type!");
   case MCSymbolRefExpr::VK_TLSCALL:
     return ELF::R_X86_64_TLSDESC_CALL;
   case MCSymbolRefExpr::VK_TLSDESC:
     return ELF::R_X86_64_GOTPC32_TLSDESC;
   case MCSymbolRefExpr::VK_TLSGD:
     checkIs32(Ctx, Loc, Type);
     return ELF::R_X86_64_TLSGD;
   case MCSymbolRefExpr::VK_GOTTPOFF:
case MCSymbolRefExpr::VK_GOTPCREL:
     default:
       return ELF::R_X86_64_GOTPCREL;
     case X86::reloc_riprel_4byte_relax:
       return ELF::R_X86_64_GOTPCRELX;
     case X86::reloc_riprel_4byte_relax_rex:
     case X86::reloc_riprel_4byte_movq_load:
       return ELF::R_X86_64_REX_GOTPCRELX;
     }
+    llvm_unreachable("unexpected relocation type!");
   }
 }
 
 enum X86_32RelType { RT32_32, RT32_16, RT32_8 };
 
 static X86_32RelType getType32(X86_64RelType T) {
   switch (T) {
   case RT64_64:
case MCSymbolRefExpr::VK_X86_ABS8:
     switch (Type) {
     case RT32_32:
       return IsPCRel ? ELF::R_386_PC32 : ELF::R_386_32;
     case RT32_16:
       return IsPCRel ? ELF::R_386_PC16 : ELF::R_386_16;
     case RT32_8:
       return IsPCRel ? ELF::R_386_PC8 : ELF::R_386_8;
     }
+    llvm_unreachable("unexpected relocation type!");
   case MCSymbolRefExpr::VK_GOT:
     assert(Type == RT32_32);
     if (IsPCRel)
       return ELF::R_386_GOTPC;
     // Older versions of ld.bfd/ld.gold/lld do not support R_386_GOT32X and we
     // want to maintain compatibility.
     if (!Ctx.getAsmInfo()->canRelaxRelocations())
       return ELF::R_386_GOT32;

llvm/trunk/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test

+# Test that hexagon machine-specific tags can be dumped.
+# RUN: yaml2obj --docnum=1 -o %t.hex \
+# RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
+# RUN: llvm-objdump -p %t.hex | FileCheck %s --check-prefix=HEXAGON
+
+# HEXAGON:      Dynamic Section:
+# HEXAGON-NEXT:   HASH                 0x0000000000001000
+# HEXAGON-NEXT:   HEXAGON_SYMSZ        0x0000000000000010
+# HEXAGON-NEXT:   HEXAGON_VER          0x0000000000001000
+# HEXAGON-NEXT:   HEXAGON_PLT          0x0000000000001000
+# HEXAGON-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
+
+
+# Test that MIPS machine-specific tags can be dumped.
+# RUN: yaml2obj --docnum=2 -o %t.mips \
+# RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
+# RUN: llvm-objdump -p %t.mips | FileCheck %s --check-prefix=MIPS
+
+# MIPS:      Dynamic Section:
+# MIPS-NEXT:   HASH                 0x0000000000001000
+# MIPS-NEXT:   MIPS_RLD_VERSION     0x0000000012345678
+# MIPS-NEXT:   MIPS_TIME_STAMP      0x0000000011223344
+# MIPS-NEXT:   MIPS_ICHECKSUM       0x0000000011112222
+# MIPS-NEXT:   MIPS_IVERSION        0x0000000000000001
+# MIPS-NEXT:   MIPS_FLAGS           0x0000000011111111
+# MIPS-NEXT:   MIPS_BASE_ADDRESS    0x0000000087654321
+# MIPS-NEXT:   MIPS_MSYM            0x0000000000001000
+# MIPS-NEXT:   MIPS_CONFLICT        0x0000000000001000
+# MIPS-NEXT:   MIPS_LIBLIST         0x0000000000001000
+# MIPS-NEXT:   MIPS_LOCAL_GOTNO     0x0000000000000001
+# MIPS-NEXT:   MIPS_CONFLICTNO      0x0000000000000001
+# MIPS-NEXT:   MIPS_LIBLISTNO       0x0000000000000001
+# MIPS-NEXT:   MIPS_SYMTABNO        0x0000000000000001
+# MIPS-NEXT:   MIPS_UNREFEXTNO      0x0000000000000000
+# MIPS-NEXT:   MIPS_GOTSYM          0x0000000000000000
+# MIPS-NEXT:   MIPS_HIPAGENO        0x0000000088776655
+# MIPS-NEXT:   MIPS_RLD_MAP         0x0000000000001000
+# MIPS-NEXT:   MIPS_DELTA_CLASS     0x0000000000001000
+# MIPS-NEXT:   MIPS_DELTA_CLASS_NO  0x0000000000000001
+# MIPS-NEXT:   MIPS_DELTA_INSTANCE  0x0000000000001000
+# MIPS-NEXT:   MIPS_DELTA_INSTANCE_NO0x0000000000000001
+# MIPS-NEXT:   MIPS_DELTA_RELOC     0x0000000000001000
+# MIPS-NEXT:   MIPS_DELTA_RELOC_NO  0x0000000000000001
+# MIPS-NEXT:   MIPS_DELTA_SYM       0x0000000000001000
+# MIPS-NEXT:   MIPS_DELTA_SYM_NO    0x0000000000000001
+# MIPS-NEXT:   MIPS_DELTA_CLASSSYM  0x0000000000001000
+# MIPS-NEXT:   MIPS_DELTA_CLASSSYM_NO0x0000000000000001
+# MIPS-NEXT:   MIPS_CXX_FLAGS       0x0000000088887777
+# MIPS-NEXT:   MIPS_PIXIE_INIT      0x0000000000001000
+# MIPS-NEXT:   MIPS_LOCALPAGE_GOTIDX0x0000000000000001
+# MIPS-NEXT:   MIPS_LOCAL_GOTIDX    0x0000000000000001
+# MIPS-NEXT:   MIPS_HIDDEN_GOTIDX   0x0000000000000001
+# MIPS-NEXT:   MIPS_PROTECTED_GOTIDX0x0000000000000001
+# MIPS-NEXT:   MIPS_OPTIONS         0x0000000000001000
+# MIPS-NEXT:   MIPS_INTERFACE       0x0000000000001000
+# MIPS-NEXT:   MIPS_DYNSTR_ALIGN    0x0000000088888888
+# MIPS-NEXT:   MIPS_INTERFACE_SIZE  0x0000000000000010
+# MIPS-NEXT:   MIPS_RLD_TEXT_RESOLVE_ADDR0x0000000000000008
+# MIPS-NEXT:   MIPS_PERF_SUFFIX     0x0000000000000000
+# MIPS-NEXT:   MIPS_COMPACT_SIZE    0x0000000000000010
+# MIPS-NEXT:   MIPS_GP_VALUE        0x0000000000000001
+# MIPS-NEXT:   MIPS_AUX_DYNAMIC     0x0000000000001000
+# MIPS-NEXT:   MIPS_PLTGOT          0x0000000000001000
+# MIPS-NEXT:   MIPS_RWPLT           0x0000000000001000
+# MIPS-NEXT:   MIPS_RLD_MAP_REL     0x0000000000001000
+# MIPS-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
+
+
+# Test that PPC64 machine-specific tags can be dumped.
+# RUN: yaml2obj --docnum=3 -o %t.ppc \
+# RUN:          %S/../llvm-readobj/Inputs/elf-dynamic-tags-machine-specific.yaml
+# RUN: llvm-objdump -p %t.ppc | FileCheck %s --check-prefix=PPC
+
+# PPC:      Dynamic Section:
+# PPC-NEXT:   HASH                 0x0000000000001000
+# PPC-NEXT:   PPC64_GLINK          0x0000000000001000
+# PPC-NEXT:   <unknown:>0x1234abcd 0x0000000000000001

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

+# Used by llvm-readobj/elf-dynamic-tags-machine-specific.test and
+# llvm-objdump/elf-dynamic-section-machine-specific.test.
+
+# First document: Hexagon
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_HEXAGON
+Sections:
+  - Name:    .dynstr
+    Type:    SHT_STRTAB
+    Address: 0x1000
+    Size:    0x10
+    Content: "004400550066007700"
+  - Name:    .dynamic
+    Type:    SHT_DYNAMIC
+    Address: 0x1010
+    Entries:
+      - Tag:   DT_HASH
+        Value: 0x1000
+      - Tag:   DT_HEXAGON_SYMSZ
+        Value: 0x10
+      - Tag:   DT_HEXAGON_VER
+        Value: 0x1000
+      - Tag:   DT_HEXAGON_PLT
+        Value: 0x1000
+      - Tag:   0x1234abcd
+        Value: 0x1
+      - Tag:   DT_NULL
+        Value: 0
+ProgramHeaders:
+  - Type: PT_LOAD
+    VAddr: 0x1000
+    Sections:
+      - Section: .dynstr
+      - Section: .dynamic
+  - Type: PT_DYNAMIC
+    VAddr: 0x1010
+    Sections:
+      - Section: .dynamic
+
+# Second document: MIPS
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_MIPS
+Sections:
+  - Name:    .dynstr
+    Type:    SHT_STRTAB
+    Address: 0x1000
+    Size:    0x10
+    Content: "004400550066007700"
+  - Name:    .dynamic
+    Type:    SHT_DYNAMIC
+    Address: 0x1010
+    Entries:
+      - Tag:   DT_HASH
+        Value: 0x1000
+      - Tag:   DT_MIPS_RLD_VERSION
+        Value: 0x12345678
+      - Tag:   DT_MIPS_TIME_STAMP
+        Value: 0x11223344
+      - Tag:   DT_MIPS_ICHECKSUM
+        Value: 0x11112222
+      - Tag:   DT_MIPS_IVERSION
+        Value: 0x1
+      - Tag:   DT_MIPS_FLAGS
+        Value: 0x11111111
+      - Tag:   DT_MIPS_BASE_ADDRESS
+        Value: 0x87654321
+      - Tag:   DT_MIPS_MSYM
+        Value: 0x1000
+      - Tag:   DT_MIPS_CONFLICT
+        Value: 0x1000
+      - Tag:   DT_MIPS_LIBLIST
+        Value: 0x1000
+      - Tag:   DT_MIPS_LOCAL_GOTNO
+        Value: 0x1
+      - Tag:   DT_MIPS_CONFLICTNO
+        Value: 0x1
+      - Tag:   DT_MIPS_LIBLISTNO
+        Value: 0x1
+      - Tag:   DT_MIPS_SYMTABNO
+        Value: 0x1
+      - Tag:   DT_MIPS_UNREFEXTNO
+        Value: 0x0
+      - Tag:   DT_MIPS_GOTSYM
+        Value: 0x0
+      - Tag:   DT_MIPS_HIPAGENO
+        Value: 0x88776655
+      - Tag:   DT_MIPS_RLD_MAP
+        Value: 0x1000
+      - Tag:   DT_MIPS_DELTA_CLASS
+        Value: 0x1000
+      - Tag:   DT_MIPS_DELTA_CLASS_NO
+        Value: 0x1
+      - Tag:   DT_MIPS_DELTA_INSTANCE
+        Value: 0x1000
+      - Tag:   DT_MIPS_DELTA_INSTANCE_NO
+        Value: 0x1
+      - Tag:   DT_MIPS_DELTA_RELOC
+        Value: 0x1000
+      - Tag:   DT_MIPS_DELTA_RELOC_NO
+        Value: 0x1
+      - Tag:   DT_MIPS_DELTA_SYM
+        Value: 0x1000
+      - Tag:   DT_MIPS_DELTA_SYM_NO
+        Value: 0x1
+      - Tag:   DT_MIPS_DELTA_CLASSSYM
+        Value: 0x1000
+      - Tag:   DT_MIPS_DELTA_CLASSSYM_NO
+        Value: 0x1
+      - Tag:   DT_MIPS_CXX_FLAGS
+        Value: 0x88887777
+      - Tag:   DT_MIPS_PIXIE_INIT
+        Value: 0x1000
+      - Tag:   DT_MIPS_LOCALPAGE_GOTIDX
+        Value: 0x1
+      - Tag:   DT_MIPS_LOCAL_GOTIDX
+        Value: 0x1
+      - Tag:   DT_MIPS_HIDDEN_GOTIDX
+        Value: 0x1
+      - Tag:   DT_MIPS_PROTECTED_GOTIDX
+        Value: 0x1
+      - Tag:   DT_MIPS_OPTIONS
+        Value: 0x1000
+      - Tag:   DT_MIPS_INTERFACE
+        Value: 0x1000
+      - Tag:   DT_MIPS_DYNSTR_ALIGN
+        Value: 0x88888888
+      - Tag:   DT_MIPS_INTERFACE_SIZE
+        Value: 0x10
+      - Tag:   DT_MIPS_RLD_TEXT_RESOLVE_ADDR
+        Value: 0x8
+      - Tag:   DT_MIPS_PERF_SUFFIX
+        Value: 0x0
+      - Tag:   DT_MIPS_COMPACT_SIZE
+        Value: 0x10
+      - Tag:   DT_MIPS_GP_VALUE
+        Value: 0x1
+      - Tag:   DT_MIPS_AUX_DYNAMIC
+        Value: 0x1000
+      - Tag:   DT_MIPS_PLTGOT
+        Value: 0x1000
+      - Tag:   DT_MIPS_RWPLT
+        Value: 0x1000
+      - Tag:   DT_MIPS_RLD_MAP_REL
+        Value: 0x1000
+      - Tag:   0x1234abcd
+        Value: 0x1
+      - Tag:   DT_NULL
+        Value: 0
+ProgramHeaders:
+  - Type: PT_LOAD
+    VAddr: 0x1000
+    Sections:
+      - Section: .dynstr
+      - Section: .dynamic
+  - Type: PT_DYNAMIC
+    VAddr: 0x1010
+    Sections:
+      - Section: .dynamic
+
+# Third document: PPC64
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS64
+  Data:    ELFDATA2LSB
+  Type:    ET_EXEC
+  Machine: EM_PPC64
+Sections:
+  - Name:    .dynstr
+    Type:    SHT_STRTAB
+    Address: 0x1000
+    Size:    0x10
+    Content: "004400550066007700"
+  - Name:    .dynamic
+    Type:    SHT_DYNAMIC
+    Address: 0x1010
+    Entries:
+      - Tag:   DT_HASH
+        Value: 0x1000
+      - Tag:   DT_PPC64_GLINK
+        Value: 0x1000
+      - Tag:   0x1234abcd
+        Value: 0x1
+      - Tag:   DT_NULL
+        Value: 0
+ProgramHeaders:
+  - Type: PT_LOAD
+    VAddr: 0x1000
+    Sections:
+      - Section: .dynstr
+      - Section: .dynamic
+  - Type: PT_DYNAMIC
+    VAddr: 0x1010
+    Sections:
+      - Section: .dynamic

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

 # Test that hexagon machine-specific tags can be dumped.
-# RUN: yaml2obj --docnum=1 %s -o %t.hex
+# 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
 
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_EXEC
-  Machine: EM_HEXAGON
-Sections:
-  - Name:    .dynstr
-    Type:    SHT_STRTAB
-    Address: 0x1000
-    Size:    0x10
-    Content: "004400550066007700"
-  - Name:    .dynamic
-    Type:    SHT_DYNAMIC
-    Address: 0x1010
-    Entries:
-      - Tag:   DT_HEXAGON_SYMSZ
-        Value: 0x10
-      - Tag:   DT_HEXAGON_VER
-        Value: 0x1000
-      - Tag:   DT_HEXAGON_PLT
-        Value: 0x1000
-      - Tag:   DT_NULL
-        Value: 0
-ProgramHeaders:
-  - Type: PT_LOAD
-    VAddr: 0x1000
-    Sections:
-      - Section: .dynstr
-      - Section: .dynamic
-  - Type: PT_DYNAMIC
-    VAddr: 0x1010
-    Sections:
-      - Section: .dynamic
-
-# LLVM-HEXAGON:      DynamicSection [ (4 entries)
+# 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 [ (4 entries)
+# GNU-HEXAGON:      DynamicSection [ (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: ]
 
+
 # Test that MIPS machine-specific tags can be dumped.
-# RUN: yaml2obj --docnum=2 %s -o %t.mips
+# 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 [ (46 entries)
+# LLVM-MIPS:      DynamicSection [ (48 entries)
 # LLVM-MIPS-NEXT:   Tag                Type                 Name/Value
+# LLVM-MIPS-NEXT:   0x0000000000000004 HASH                 0x1000
 # LLVM-MIPS-NEXT:   0x0000000070000001 MIPS_RLD_VERSION     305419896
 # LLVM-MIPS-NEXT:   0x0000000070000002 MIPS_TIME_STAMP      0x11223344
 # LLVM-MIPS-NEXT:   0x0000000070000003 MIPS_ICHECKSUM       0x11112222
 # LLVM-MIPS-NEXT:   0x0000000070000004 MIPS_IVERSION        0x1
 # LLVM-MIPS-NEXT:   0x0000000070000005 MIPS_FLAGS           QUICKSTART SGI_ONLY PIXIE CORD
 # LLVM-MIPS-NEXT:   0x0000000070000006 MIPS_BASE_ADDRESS    0x87654321
 # LLVM-MIPS-NEXT:   0x0000000070000007 MIPS_MSYM            0x1000
 # LLVM-MIPS-NEXT:   0x0000000070000008 MIPS_CONFLICT        0x1000

 # LLVM-MIPS-NEXT:   0x000000007000002D MIPS_RLD_TEXT_RESOLVE_ADDR0x8
 # LLVM-MIPS-NEXT:   0x000000007000002E MIPS_PERF_SUFFIX     0x0
 # LLVM-MIPS-NEXT:   0x000000007000002F MIPS_COMPACT_SIZE    0x10
 # LLVM-MIPS-NEXT:   0x0000000070000030 MIPS_GP_VALUE        0x1
 # 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 [ (46 entries)
+# 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:   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: ]
 
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_EXEC
-  Machine: EM_MIPS
-Sections:
-  - Name:    .dynstr
-    Type:    SHT_STRTAB
-    Address: 0x1000
-    Size:    0x10
-    Content: "004400550066007700"
-  - Name:    .dynamic
-    Type:    SHT_DYNAMIC
-    Address: 0x1010
-    Entries:
-      - Tag:   DT_MIPS_RLD_VERSION
-        Value: 0x12345678
-      - Tag:   DT_MIPS_TIME_STAMP
-        Value: 0x11223344
-      - Tag:   DT_MIPS_ICHECKSUM
-        Value: 0x11112222
-      - Tag:   DT_MIPS_IVERSION
-        Value: 0x1
-      - Tag:   DT_MIPS_FLAGS
-        Value: 0x11111111
-      - Tag:   DT_MIPS_BASE_ADDRESS
-        Value: 0x87654321
-      - Tag:   DT_MIPS_MSYM
-        Value: 0x1000
-      - Tag:   DT_MIPS_CONFLICT
-        Value: 0x1000
-      - Tag:   DT_MIPS_LIBLIST
-        Value: 0x1000
-      - Tag:   DT_MIPS_LOCAL_GOTNO
-        Value: 0x1
-      - Tag:   DT_MIPS_CONFLICTNO
-        Value: 0x1
-      - Tag:   DT_MIPS_LIBLISTNO
-        Value: 0x1
-      - Tag:   DT_MIPS_SYMTABNO
-        Value: 0x1
-      - Tag:   DT_MIPS_UNREFEXTNO
-        Value: 0x0
-      - Tag:   DT_MIPS_GOTSYM
-        Value: 0x0
-      - Tag:   DT_MIPS_HIPAGENO
-        Value: 0x88776655
-      - Tag:   DT_MIPS_RLD_MAP
-        Value: 0x1000
-      - Tag:   DT_MIPS_DELTA_CLASS
-        Value: 0x1000
-      - Tag:   DT_MIPS_DELTA_CLASS_NO
-        Value: 0x1
-      - Tag:   DT_MIPS_DELTA_INSTANCE
-        Value: 0x1000
-      - Tag:   DT_MIPS_DELTA_INSTANCE_NO
-        Value: 0x1
-      - Tag:   DT_MIPS_DELTA_RELOC
-        Value: 0x1000
-      - Tag:   DT_MIPS_DELTA_RELOC_NO
-        Value: 0x1
-      - Tag:   DT_MIPS_DELTA_SYM
-        Value: 0x1000
-      - Tag:   DT_MIPS_DELTA_SYM_NO
-        Value: 0x1
-      - Tag:   DT_MIPS_DELTA_CLASSSYM
-        Value: 0x1000
-      - Tag:   DT_MIPS_DELTA_CLASSSYM_NO
-        Value: 0x1
-      - Tag:   DT_MIPS_CXX_FLAGS
-        Value: 0x88887777
-      - Tag:   DT_MIPS_PIXIE_INIT
-        Value: 0x1000
-      - Tag:   DT_MIPS_LOCALPAGE_GOTIDX
-        Value: 0x1
-      - Tag:   DT_MIPS_LOCAL_GOTIDX
-        Value: 0x1
-      - Tag:   DT_MIPS_HIDDEN_GOTIDX
-        Value: 0x1
-      - Tag:   DT_MIPS_PROTECTED_GOTIDX
-        Value: 0x1
-      - Tag:   DT_MIPS_OPTIONS
-        Value: 0x1000
-      - Tag:   DT_MIPS_INTERFACE
-        Value: 0x1000
-      - Tag:   DT_MIPS_DYNSTR_ALIGN
-        Value: 0x88888888
-      - Tag:   DT_MIPS_INTERFACE_SIZE
-        Value: 0x10
-      - Tag:   DT_MIPS_RLD_TEXT_RESOLVE_ADDR
-        Value: 0x8
-      - Tag:   DT_MIPS_PERF_SUFFIX
-        Value: 0x0
-      - Tag:   DT_MIPS_COMPACT_SIZE
-        Value: 0x10
-      - Tag:   DT_MIPS_GP_VALUE
-        Value: 0x1
-      - Tag:   DT_MIPS_AUX_DYNAMIC
-        Value: 0x1000
-      - Tag:   DT_MIPS_PLTGOT
-        Value: 0x1000
-      - Tag:   DT_MIPS_RWPLT
-        Value: 0x1000
-      - Tag:   DT_MIPS_RLD_MAP_REL
-        Value: 0x1000
-      - Tag:   DT_NULL
-        Value: 0
-ProgramHeaders:
-  - Type: PT_LOAD
-    VAddr: 0x1000
-    Sections:
-      - Section: .dynstr
-      - Section: .dynamic
-  - Type: PT_DYNAMIC
-    VAddr: 0x1010
-    Sections:
-      - Section: .dynamic
 
 # Test that PPC64 machine-specific tags can be dumped.
-# RUN: yaml2obj --docnum=3 %s -o %t.ppc
+# 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 [ (2 entries)
+# 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 [ (2 entries)
+# GNU-PPC:      DynamicSection [ (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: ]
-
---- !ELF
-FileHeader:
-  Class:   ELFCLASS64
-  Data:    ELFDATA2LSB
-  Type:    ET_EXEC
-  Machine: EM_PPC64
-Sections:
-  - Name:    .dynstr
-    Type:    SHT_STRTAB
-    Address: 0x1000
-    Size:    0x10
-    Content: "004400550066007700"
-  - Name:    .dynamic
-    Type:    SHT_DYNAMIC
-    Address: 0x1010
-    Entries:
-      - Tag:   DT_PPC64_GLINK
-        Value: 0x1000
-      - Tag:   DT_NULL
-        Value: 0
-ProgramHeaders:
-  - Type: PT_LOAD
-    VAddr: 0x1000
-    Sections:
-      - Section: .dynstr
-      - Section: .dynamic
-  - Type: PT_DYNAMIC
-    VAddr: 0x1010
-    Sections:
-      - Section: .dynamic