diff --git a/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test b/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test
--- a/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test
+++ b/llvm/test/tools/llvm-objdump/elf-dynamic-section-machine-specific.test
@@ -37,56 +37,56 @@
 
 ## Case 2: Test that MIPS machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=2 -o %t.mips %s
-# RUN: llvm-objdump -p %t.mips | FileCheck %s --check-prefix=MIPS
+# RUN: llvm-objdump -p %t.mips | FileCheck %s  --strict-whitespace --match-full-lines --check-prefix=MIPS
 
-# MIPS:      Dynamic Section:
-# 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:Dynamic Section:
+# 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
 ## FIXME: llvm-objdump does not print spaces after MIPS_DELTA_INSTANCE_NO, MIPS_PROTECTED_GOTIDX
 ##        and other long tags. The output looks broken because of that.
-# 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:  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
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-objdump/elf-dynamic-section.test b/llvm/test/tools/llvm-objdump/elf-dynamic-section.test
--- a/llvm/test/tools/llvm-objdump/elf-dynamic-section.test
+++ b/llvm/test/tools/llvm-objdump/elf-dynamic-section.test
@@ -1,64 +1,64 @@
 # RUN: yaml2obj %s > %t
 # RUN: llvm-objdump -p %t | FileCheck %s
 
-# CHECK:      Dynamic Section:
-# CHECK-NEXT:   NEEDED               D
-# CHECK-NEXT:   PLTRELSZ             0x0000000000000010
-# CHECK-NEXT:   PLTGOT               0x0000000000001000
-# CHECK-NEXT:   HASH                 0x0000000000001000
-# CHECK-NEXT:   STRTAB               0x0000000000001000
-# CHECK-NEXT:   SYMTAB               0x0000000000001000
-# CHECK-NEXT:   RELA                 0x0000000000001000
-# CHECK-NEXT:   RELASZ               0x0000000000000010
-# CHECK-NEXT:   RELAENT              0x0000000000000789
-# CHECK-NEXT:   STRSZ                0x0000000000000010
-# CHECK-NEXT:   SYMENT               0x0000000000000987
-# CHECK-NEXT:   INIT                 0x0000000000001000
-# CHECK-NEXT:   FINI                 0x0000000000001000
-# CHECK-NEXT:   SONAME               U
-# CHECK-NEXT:   RPATH                f
-# CHECK-NEXT:   SYMBOLIC             0x1234567890abcdef
-# CHECK-NEXT:   REL                  0x0000000000001000
-# CHECK-NEXT:   RELSZ                0x0000000000000010
-# CHECK-NEXT:   RELENT               0x0000000000000123
-# CHECK-NEXT:   PLTREL               0x0000000000000007
-# CHECK-NEXT:   DEBUG                0xfedcba0987654321
-# CHECK-NEXT:   TEXTREL              0x1122334455667788
-# CHECK-NEXT:   JMPREL               0x0000000000001000
-# CHECK-NEXT:   BIND_NOW             0x8877665544332211
-# CHECK-NEXT:   INIT_ARRAY           0x0000000000001000
-# CHECK-NEXT:   FINI_ARRAY           0x0000000000001000
-# CHECK-NEXT:   INIT_ARRAYSZ         0x0000000000000010
-# CHECK-NEXT:   FINI_ARRAYSZ         0x0000000000000010
-# CHECK-NEXT:   RUNPATH              w
-# CHECK-NEXT:   FLAGS                0xaabbccddeeff9900
-# CHECK-NEXT:   PREINIT_ARRAY        0x0000000000001000
-# CHECK-NEXT:   PREINIT_ARRAYSZ      0x0000000000000010
-# CHECK-NEXT:   SYMTAB_SHNDX         0x0000000000001000
-# CHECK-NEXT:   RELRSZ               0x0000000000000010
-# CHECK-NEXT:   RELR                 0x0000000000001000
-# CHECK-NEXT:   RELRENT              0x0000000000004321
-# CHECK-NEXT:   ANDROID_REL          0x0000000000001000
-# CHECK-NEXT:   ANDROID_RELSZ        0x0000000000000010
-# CHECK-NEXT:   ANDROID_RELA         0x0000000000001000
-# CHECK-NEXT:   ANDROID_RELASZ       0x0000000000000010
-# CHECK-NEXT:   ANDROID_RELR         0x0000000000001000
-# CHECK-NEXT:   ANDROID_RELRSZ       0x0000000000000010
-# CHECK-NEXT:   ANDROID_RELRENT      0x0000000000001234
-# CHECK-NEXT:   GNU_HASH             0x0000000000001000
-# CHECK-NEXT:   TLSDESC_PLT          0x0000000000001000
-# CHECK-NEXT:   TLSDESC_GOT          0x0000000000001000
-# CHECK-NEXT:   RELACOUNT            0x0000000000000000
-# CHECK-NEXT:   RELCOUNT             0x0000000000000000
-# CHECK-NEXT:   FLAGS_1              0x0000000087654321
-# CHECK-NEXT:   VERSYM               0x0000000000001000
-# CHECK-NEXT:   VERDEF               0x0000000000001000
-# CHECK-NEXT:   VERDEFNUM            0x0000000000000000
-# CHECK-NEXT:   VERNEED              0x0000000000001000
-# CHECK-NEXT:   VERNEEDNUM           0x0000000000000000
-# CHECK-NEXT:   AUXILIARY            D
-# CHECK-NEXT:   FILTER               U
-# CHECK-NEXT:   <unknown:>0x1234abcd 0x0000000000000001
+#      CHECK:Dynamic Section:
+# CHECK-NEXT:  NEEDED               D
+# CHECK-NEXT:  PLTRELSZ             0x0000000000000010
+# CHECK-NEXT:  PLTGOT               0x0000000000001000
+# CHECK-NEXT:  HASH                 0x0000000000001000
+# CHECK-NEXT:  STRTAB               0x0000000000001000
+# CHECK-NEXT:  SYMTAB               0x0000000000001000
+# CHECK-NEXT:  RELA                 0x0000000000001000
+# CHECK-NEXT:  RELASZ               0x0000000000000010
+# CHECK-NEXT:  RELAENT              0x0000000000000789
+# CHECK-NEXT:  STRSZ                0x0000000000000010
+# CHECK-NEXT:  SYMENT               0x0000000000000987
+# CHECK-NEXT:  INIT                 0x0000000000001000
+# CHECK-NEXT:  FINI                 0x0000000000001000
+# CHECK-NEXT:  SONAME               U
+# CHECK-NEXT:  RPATH                f
+# CHECK-NEXT:  SYMBOLIC             0x1234567890abcdef
+# CHECK-NEXT:  REL                  0x0000000000001000
+# CHECK-NEXT:  RELSZ                0x0000000000000010
+# CHECK-NEXT:  RELENT               0x0000000000000123
+# CHECK-NEXT:  PLTREL               0x0000000000000007
+# CHECK-NEXT:  DEBUG                0xfedcba0987654321
+# CHECK-NEXT:  TEXTREL              0x1122334455667788
+# CHECK-NEXT:  JMPREL               0x0000000000001000
+# CHECK-NEXT:  BIND_NOW             0x8877665544332211
+# CHECK-NEXT:  INIT_ARRAY           0x0000000000001000
+# CHECK-NEXT:  FINI_ARRAY           0x0000000000001000
+# CHECK-NEXT:  INIT_ARRAYSZ         0x0000000000000010
+# CHECK-NEXT:  FINI_ARRAYSZ         0x0000000000000010
+# CHECK-NEXT:  RUNPATH              w
+# CHECK-NEXT:  FLAGS                0xaabbccddeeff9900
+# CHECK-NEXT:  PREINIT_ARRAY        0x0000000000001000
+# CHECK-NEXT:  PREINIT_ARRAYSZ      0x0000000000000010
+# CHECK-NEXT:  SYMTAB_SHNDX         0x0000000000001000
+# CHECK-NEXT:  RELRSZ               0x0000000000000010
+# CHECK-NEXT:  RELR                 0x0000000000001000
+# CHECK-NEXT:  RELRENT              0x0000000000004321
+# CHECK-NEXT:  ANDROID_REL          0x0000000000001000
+# CHECK-NEXT:  ANDROID_RELSZ        0x0000000000000010
+# CHECK-NEXT:  ANDROID_RELA         0x0000000000001000
+# CHECK-NEXT:  ANDROID_RELASZ       0x0000000000000010
+# CHECK-NEXT:  ANDROID_RELR         0x0000000000001000
+# CHECK-NEXT:  ANDROID_RELRSZ       0x0000000000000010
+# CHECK-NEXT:  ANDROID_RELRENT      0x0000000000001234
+# CHECK-NEXT:  GNU_HASH             0x0000000000001000
+# CHECK-NEXT:  TLSDESC_PLT          0x0000000000001000
+# CHECK-NEXT:  TLSDESC_GOT          0x0000000000001000
+# CHECK-NEXT:  RELACOUNT            0x0000000000000000
+# CHECK-NEXT:  RELCOUNT             0x0000000000000000
+# CHECK-NEXT:  FLAGS_1              0x0000000087654321
+# CHECK-NEXT:  VERSYM               0x0000000000001000
+# CHECK-NEXT:  VERDEF               0x0000000000001000
+# CHECK-NEXT:  VERDEFNUM            0x0000000000000000
+# CHECK-NEXT:  VERNEED              0x0000000000001000
+# CHECK-NEXT:  VERNEEDNUM           0x0000000000000000
+# CHECK-NEXT:  AUXILIARY            D
+# CHECK-NEXT:  FILTER               U
+# CHECK-NEXT:  <unknown:>0x1234abcd 0x0000000000000001
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-tags-machine-specific.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-tags-machine-specific.test
--- a/llvm/test/tools/llvm-readobj/ELF/dynamic-tags-machine-specific.test
+++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-tags-machine-specific.test
@@ -48,111 +48,113 @@
 
 ## Case 2: Test that MIPS machine-specific tags can be dumped.
 # RUN: yaml2obj --docnum=2 %s -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
+# RUN: llvm-readobj --dynamic-table %t.mips \
+# RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=LLVM-MIPS
+# RUN: llvm-readelf --dynamic-table %t.mips \
+# RUN:  | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=GNU-MIPS
 
-# LLVM-MIPS:      DynamicSection [ (47 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:   0x0000000070000009 MIPS_LIBLIST         0x1000
-# LLVM-MIPS-NEXT:   0x000000007000000A MIPS_LOCAL_GOTNO     1
-# LLVM-MIPS-NEXT:   0x000000007000000B MIPS_CONFLICTNO      0x1
-# LLVM-MIPS-NEXT:   0x0000000070000010 MIPS_LIBLISTNO       0x1
-# LLVM-MIPS-NEXT:   0x0000000070000011 MIPS_SYMTABNO        1
-# LLVM-MIPS-NEXT:   0x0000000070000012 MIPS_UNREFEXTNO      0
-# LLVM-MIPS-NEXT:   0x0000000070000013 MIPS_GOTSYM          0x0
-# LLVM-MIPS-NEXT:   0x0000000070000014 MIPS_HIPAGENO        0x88776655
-# LLVM-MIPS-NEXT:   0x0000000070000016 MIPS_RLD_MAP         0x1000
-# LLVM-MIPS-NEXT:   0x0000000070000017 MIPS_DELTA_CLASS     0x1000
-# LLVM-MIPS-NEXT:   0x0000000070000018 MIPS_DELTA_CLASS_NO  0x1
-# LLVM-MIPS-NEXT:   0x0000000070000019 MIPS_DELTA_INSTANCE  0x1000
+#      LLVM-MIPS:DynamicSection [ (47 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:  0x0000000070000009 MIPS_LIBLIST         0x1000
+# LLVM-MIPS-NEXT:  0x000000007000000A MIPS_LOCAL_GOTNO     1
+# LLVM-MIPS-NEXT:  0x000000007000000B MIPS_CONFLICTNO      0x1
+# LLVM-MIPS-NEXT:  0x0000000070000010 MIPS_LIBLISTNO       0x1
+# LLVM-MIPS-NEXT:  0x0000000070000011 MIPS_SYMTABNO        1
+# LLVM-MIPS-NEXT:  0x0000000070000012 MIPS_UNREFEXTNO      0
+# LLVM-MIPS-NEXT:  0x0000000070000013 MIPS_GOTSYM          0x0
+# LLVM-MIPS-NEXT:  0x0000000070000014 MIPS_HIPAGENO        0x88776655
+# LLVM-MIPS-NEXT:  0x0000000070000016 MIPS_RLD_MAP         0x1000
+# LLVM-MIPS-NEXT:  0x0000000070000017 MIPS_DELTA_CLASS     0x1000
+# LLVM-MIPS-NEXT:  0x0000000070000018 MIPS_DELTA_CLASS_NO  0x1
+# LLVM-MIPS-NEXT:  0x0000000070000019 MIPS_DELTA_INSTANCE  0x1000
 ## FIXME: llvm-readobj does not print spaces after MIPS_DELTA_INSTANCE_NO, MIPS_PROTECTED_GOTIDX
 ##        and other long tags. The output looks broken because of that.
-# LLVM-MIPS-NEXT:   0x000000007000001A MIPS_DELTA_INSTANCE_NO0x1
-# LLVM-MIPS-NEXT:   0x000000007000001B MIPS_DELTA_RELOC     0x1000
-# LLVM-MIPS-NEXT:   0x000000007000001C MIPS_DELTA_RELOC_NO  0x1
-# LLVM-MIPS-NEXT:   0x000000007000001D MIPS_DELTA_SYM       0x1000
-# LLVM-MIPS-NEXT:   0x000000007000001E MIPS_DELTA_SYM_NO    0x1
-# LLVM-MIPS-NEXT:   0x0000000070000020 MIPS_DELTA_CLASSSYM  0x1000
-# LLVM-MIPS-NEXT:   0x0000000070000021 MIPS_DELTA_CLASSSYM_NO0x1
-# LLVM-MIPS-NEXT:   0x0000000070000022 MIPS_CXX_FLAGS       0x88887777
-# LLVM-MIPS-NEXT:   0x0000000070000023 MIPS_PIXIE_INIT      0x1000
-# LLVM-MIPS-NEXT:   0x0000000070000025 MIPS_LOCALPAGE_GOTIDX0x1
-# LLVM-MIPS-NEXT:   0x0000000070000026 MIPS_LOCAL_GOTIDX    0x1
-# LLVM-MIPS-NEXT:   0x0000000070000027 MIPS_HIDDEN_GOTIDX   0x1
-# LLVM-MIPS-NEXT:   0x0000000070000028 MIPS_PROTECTED_GOTIDX0x1
-# LLVM-MIPS-NEXT:   0x0000000070000029 MIPS_OPTIONS         0x1000
-# LLVM-MIPS-NEXT:   0x000000007000002A MIPS_INTERFACE       0x1000
-# LLVM-MIPS-NEXT:   0x000000007000002B MIPS_DYNSTR_ALIGN    0x88888888
-# LLVM-MIPS-NEXT:   0x000000007000002C MIPS_INTERFACE_SIZE  0x10
-# 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:   0x0000000000000000 NULL                 0x0
-# LLVM-MIPS-NEXT: ]
+# LLVM-MIPS-NEXT:  0x000000007000001A MIPS_DELTA_INSTANCE_NO0x1
+# LLVM-MIPS-NEXT:  0x000000007000001B MIPS_DELTA_RELOC     0x1000
+# LLVM-MIPS-NEXT:  0x000000007000001C MIPS_DELTA_RELOC_NO  0x1
+# LLVM-MIPS-NEXT:  0x000000007000001D MIPS_DELTA_SYM       0x1000
+# LLVM-MIPS-NEXT:  0x000000007000001E MIPS_DELTA_SYM_NO    0x1
+# LLVM-MIPS-NEXT:  0x0000000070000020 MIPS_DELTA_CLASSSYM  0x1000
+# LLVM-MIPS-NEXT:  0x0000000070000021 MIPS_DELTA_CLASSSYM_NO0x1
+# LLVM-MIPS-NEXT:  0x0000000070000022 MIPS_CXX_FLAGS       0x88887777
+# LLVM-MIPS-NEXT:  0x0000000070000023 MIPS_PIXIE_INIT      0x1000
+# LLVM-MIPS-NEXT:  0x0000000070000025 MIPS_LOCALPAGE_GOTIDX0x1
+# LLVM-MIPS-NEXT:  0x0000000070000026 MIPS_LOCAL_GOTIDX    0x1
+# LLVM-MIPS-NEXT:  0x0000000070000027 MIPS_HIDDEN_GOTIDX   0x1
+# LLVM-MIPS-NEXT:  0x0000000070000028 MIPS_PROTECTED_GOTIDX0x1
+# LLVM-MIPS-NEXT:  0x0000000070000029 MIPS_OPTIONS         0x1000
+# LLVM-MIPS-NEXT:  0x000000007000002A MIPS_INTERFACE       0x1000
+# LLVM-MIPS-NEXT:  0x000000007000002B MIPS_DYNSTR_ALIGN    0x88888888
+# LLVM-MIPS-NEXT:  0x000000007000002C MIPS_INTERFACE_SIZE  0x10
+# 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:  0x0000000000000000 NULL                 0x0
+# LLVM-MIPS-NEXT:]
 
-# GNU-MIPS:      Dynamic section at offset {{.*}} contains 47 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:   0x0000000000000000 (NULL)                       0x0
+#      GNU-MIPS:Dynamic section at offset {{.*}} contains 47 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:  0x0000000000000000 (NULL)               0x0
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test
--- a/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test
+++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test
@@ -2,139 +2,141 @@
 ## Also show that -d is an alias for --dynamic-table.
 
 # RUN: yaml2obj %s -o %t
-# RUN: llvm-readobj --dynamic-table %t | FileCheck %s --check-prefix=LLVM
+# RUN: llvm-readobj --dynamic-table %t \
+# RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=LLVM
 # RUN: llvm-readobj -d %t | FileCheck %s --check-prefix=LLVM
-# RUN: llvm-readelf --dynamic-table %t | FileCheck %s --check-prefix=GNU
+# RUN: llvm-readelf --dynamic-table %t \
+# RUN:   | FileCheck %s --strict-whitespace --match-full-lines --check-prefix=GNU
 # RUN: llvm-readelf -d %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)
-# LLVM-NEXT:   0x0000000000000003 PLTGOT               0x1000
-# LLVM-NEXT:   0x0000000000000004 HASH                 0x1000
-# LLVM-NEXT:   0x0000000000000005 STRTAB               0x1000
-# LLVM-NEXT:   0x0000000000000006 SYMTAB               0x1000
-# LLVM-NEXT:   0x0000000000000007 RELA                 0x1000
-# LLVM-NEXT:   0x0000000000000008 RELASZ               16 (bytes)
-# LLVM-NEXT:   0x0000000000000009 RELAENT              1929 (bytes)
-# LLVM-NEXT:   0x000000000000000A STRSZ                16 (bytes)
-# LLVM-NEXT:   0x000000000000000B SYMENT               2439 (bytes)
-# LLVM-NEXT:   0x000000000000000C INIT                 0x1000
-# LLVM-NEXT:   0x000000000000000D FINI                 0x1000
-# LLVM-NEXT:   0x000000000000000E SONAME               Library soname: [U]
-# LLVM-NEXT:   0x000000000000000F RPATH                Library rpath: [f]
-# LLVM-NEXT:   0x0000000000000010 SYMBOLIC             0x1234567890ABCDEF
-# LLVM-NEXT:   0x0000000000000011 REL                  0x1000
-# LLVM-NEXT:   0x0000000000000012 RELSZ                16 (bytes)
-# LLVM-NEXT:   0x0000000000000013 RELENT               291 (bytes)
-# LLVM-NEXT:   0x0000000000000014 PLTREL               RELA
-# LLVM-NEXT:   0x0000000000000015 DEBUG                0xFEDCBA0987654321
-# LLVM-NEXT:   0x0000000000000016 TEXTREL              0x1122334455667788
-# LLVM-NEXT:   0x0000000000000017 JMPREL               0x1000
-# LLVM-NEXT:   0x0000000000000018 BIND_NOW             0x8877665544332211
-# LLVM-NEXT:   0x0000000000000019 INIT_ARRAY           0x1000
-# LLVM-NEXT:   0x000000000000001A FINI_ARRAY           0x1000
-# LLVM-NEXT:   0x000000000000001B INIT_ARRAYSZ         16 (bytes)
-# LLVM-NEXT:   0x000000000000001C FINI_ARRAYSZ         16 (bytes)
-# LLVM-NEXT:   0x000000000000001D RUNPATH              Library runpath: [w]
-# LLVM-NEXT:   0x000000000000001E FLAGS                ORIGIN SYMBOLIC TEXTREL BIND_NOW STATIC_TLS {{$}}
-# LLVM-NEXT:   0x0000000000000020 PREINIT_ARRAY        0x1000
-# LLVM-NEXT:   0x0000000000000021 PREINIT_ARRAYSZ      16 (bytes)
-# LLVM-NEXT:   0x0000000000000022 SYMTAB_SHNDX         0x1000
-# LLVM-NEXT:   0x0000000000000023 RELRSZ               0x10
-# LLVM-NEXT:   0x0000000000000024 RELR                 0x1000
-# LLVM-NEXT:   0x0000000000000025 RELRENT              0x4321
-# LLVM-NEXT:   0x000000006000000F ANDROID_REL          0x1000
-# LLVM-NEXT:   0x0000000060000010 ANDROID_RELSZ        16 (bytes)
-# LLVM-NEXT:   0x0000000060000011 ANDROID_RELA         0x1000
-# LLVM-NEXT:   0x0000000060000012 ANDROID_RELASZ       16 (bytes)
-# LLVM-NEXT:   0x000000006FFFE000 ANDROID_RELR         0x1000
-# LLVM-NEXT:   0x000000006FFFE001 ANDROID_RELRSZ       0x10
-# LLVM-NEXT:   0x000000006FFFE003 ANDROID_RELRENT      0x1234
-# LLVM-NEXT:   0x000000006FFFFEF5 GNU_HASH             0x1000
-# LLVM-NEXT:   0x000000006FFFFEF6 TLSDESC_PLT          0x1000
-# LLVM-NEXT:   0x000000006FFFFEF7 TLSDESC_GOT          0x1000
-# LLVM-NEXT:   0x000000006FFFFFF9 RELACOUNT            0
-# LLVM-NEXT:   0x000000006FFFFFFA RELCOUNT             0
-# LLVM-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 {{$}}
-# LLVM-NEXT:   0x000000006FFFFFF0 VERSYM               0x1000
-# LLVM-NEXT:   0x000000006FFFFFFC VERDEF               0x1000
-# LLVM-NEXT:   0x000000006FFFFFFD VERDEFNUM            0
-# LLVM-NEXT:   0x000000006FFFFFFE VERNEED              0x1000
-# LLVM-NEXT:   0x000000006FFFFFFF VERNEEDNUM           0
-# LLVM-NEXT:   0x000000007FFFFFFD AUXILIARY            Auxiliary library: [D]
-# LLVM-NEXT:   0x000000007FFFFFFE USED                 Not needed object: [U]
-# LLVM-NEXT:   0x000000007FFFFFFF FILTER               Filter library: [U]
-# LLVM-NEXT:   0x0000000012345678 <unknown:>0x12345678 0x8765432187654321
-# LLVM-NEXT:   0x000000006ABCDEF0 <unknown:>0x6abcdef0 0x9988776655443322
-# LLVM-NEXT:   0x0000000076543210 <unknown:>0x76543210 0x5555666677778888
-# LLVM-NEXT:   0x0000000000000000 NULL                 0x0
-# LLVM-NEXT: ]
+#      LLVM:DynamicSection [ (61 entries)
+# LLVM-NEXT:  Tag                Type                 Name/Value
+# LLVM-NEXT:  0x0000000000000001 NEEDED               Shared library: [D]
+# LLVM-NEXT:  0x0000000000000002 PLTRELSZ             16 (bytes)
+# LLVM-NEXT:  0x0000000000000003 PLTGOT               0x1000
+# LLVM-NEXT:  0x0000000000000004 HASH                 0x1000
+# LLVM-NEXT:  0x0000000000000005 STRTAB               0x1000
+# LLVM-NEXT:  0x0000000000000006 SYMTAB               0x1000
+# LLVM-NEXT:  0x0000000000000007 RELA                 0x1000
+# LLVM-NEXT:  0x0000000000000008 RELASZ               16 (bytes)
+# LLVM-NEXT:  0x0000000000000009 RELAENT              1929 (bytes)
+# LLVM-NEXT:  0x000000000000000A STRSZ                16 (bytes)
+# LLVM-NEXT:  0x000000000000000B SYMENT               2439 (bytes)
+# LLVM-NEXT:  0x000000000000000C INIT                 0x1000
+# LLVM-NEXT:  0x000000000000000D FINI                 0x1000
+# LLVM-NEXT:  0x000000000000000E SONAME               Library soname: [U]
+# LLVM-NEXT:  0x000000000000000F RPATH                Library rpath: [f]
+# LLVM-NEXT:  0x0000000000000010 SYMBOLIC             0x1234567890ABCDEF
+# LLVM-NEXT:  0x0000000000000011 REL                  0x1000
+# LLVM-NEXT:  0x0000000000000012 RELSZ                16 (bytes)
+# LLVM-NEXT:  0x0000000000000013 RELENT               291 (bytes)
+# LLVM-NEXT:  0x0000000000000014 PLTREL               RELA
+# LLVM-NEXT:  0x0000000000000015 DEBUG                0xFEDCBA0987654321
+# LLVM-NEXT:  0x0000000000000016 TEXTREL              0x1122334455667788
+# LLVM-NEXT:  0x0000000000000017 JMPREL               0x1000
+# LLVM-NEXT:  0x0000000000000018 BIND_NOW             0x8877665544332211
+# LLVM-NEXT:  0x0000000000000019 INIT_ARRAY           0x1000
+# LLVM-NEXT:  0x000000000000001A FINI_ARRAY           0x1000
+# LLVM-NEXT:  0x000000000000001B INIT_ARRAYSZ         16 (bytes)
+# LLVM-NEXT:  0x000000000000001C FINI_ARRAYSZ         16 (bytes)
+# LLVM-NEXT:  0x000000000000001D RUNPATH              Library runpath: [w]
+# LLVM-NEXT:  0x000000000000001E FLAGS                ORIGIN SYMBOLIC TEXTREL BIND_NOW STATIC_TLS {{$}}
+# LLVM-NEXT:  0x0000000000000020 PREINIT_ARRAY        0x1000
+# LLVM-NEXT:  0x0000000000000021 PREINIT_ARRAYSZ      16 (bytes)
+# LLVM-NEXT:  0x0000000000000022 SYMTAB_SHNDX         0x1000
+# LLVM-NEXT:  0x0000000000000023 RELRSZ               0x10
+# LLVM-NEXT:  0x0000000000000024 RELR                 0x1000
+# LLVM-NEXT:  0x0000000000000025 RELRENT              0x4321
+# LLVM-NEXT:  0x000000006000000F ANDROID_REL          0x1000
+# LLVM-NEXT:  0x0000000060000010 ANDROID_RELSZ        16 (bytes)
+# LLVM-NEXT:  0x0000000060000011 ANDROID_RELA         0x1000
+# LLVM-NEXT:  0x0000000060000012 ANDROID_RELASZ       16 (bytes)
+# LLVM-NEXT:  0x000000006FFFE000 ANDROID_RELR         0x1000
+# LLVM-NEXT:  0x000000006FFFE001 ANDROID_RELRSZ       0x10
+# LLVM-NEXT:  0x000000006FFFE003 ANDROID_RELRENT      0x1234
+# LLVM-NEXT:  0x000000006FFFFEF5 GNU_HASH             0x1000
+# LLVM-NEXT:  0x000000006FFFFEF6 TLSDESC_PLT          0x1000
+# LLVM-NEXT:  0x000000006FFFFEF7 TLSDESC_GOT          0x1000
+# LLVM-NEXT:  0x000000006FFFFFF9 RELACOUNT            0
+# LLVM-NEXT:  0x000000006FFFFFFA RELCOUNT             0
+# LLVM-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 {{$}}
+# LLVM-NEXT:  0x000000006FFFFFF0 VERSYM               0x1000
+# LLVM-NEXT:  0x000000006FFFFFFC VERDEF               0x1000
+# LLVM-NEXT:  0x000000006FFFFFFD VERDEFNUM            0
+# LLVM-NEXT:  0x000000006FFFFFFE VERNEED              0x1000
+# LLVM-NEXT:  0x000000006FFFFFFF VERNEEDNUM           0
+# LLVM-NEXT:  0x000000007FFFFFFD AUXILIARY            Auxiliary library: [D]
+# LLVM-NEXT:  0x000000007FFFFFFE USED                 Not needed object: [U]
+# LLVM-NEXT:  0x000000007FFFFFFF FILTER               Filter library: [U]
+# LLVM-NEXT:  0x0000000012345678 <unknown:>0x12345678 0x8765432187654321
+# LLVM-NEXT:  0x000000006ABCDEF0 <unknown:>0x6abcdef0 0x9988776655443322
+# LLVM-NEXT:  0x0000000076543210 <unknown:>0x76543210 0x5555666677778888
+# LLVM-NEXT:  0x0000000000000000 NULL                 0x0
+# LLVM-NEXT:]
 
-# 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)                Library 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)              Library 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:>0x12345678) 0x8765432187654321
-# GNU-NEXT:   0x000000006abcdef0 (<unknown:>0x6abcdef0) 0x9988776655443322
-# GNU-NEXT:   0x0000000076543210 (<unknown:>0x76543210) 0x5555666677778888
-# GNU-NEXT:   0x0000000000000000 (NULL)                 0x0
+#      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)              Library 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)            Library 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:>0x12345678) 0x8765432187654321
+# GNU-NEXT:  0x000000006abcdef0 (<unknown:>0x6abcdef0) 0x9988776655443322
+# GNU-NEXT:  0x0000000076543210 (<unknown:>0x76543210) 0x5555666677778888
+# GNU-NEXT:  0x0000000000000000 (NULL)               0x0
 
 --- !ELF
 FileHeader: