diff --git a/llvm/test/tools/llvm-readobj/elf-hash-symbols.test b/llvm/test/tools/llvm-readobj/elf-hash-symbols.test
--- a/llvm/test/tools/llvm-readobj/elf-hash-symbols.test
+++ b/llvm/test/tools/llvm-readobj/elf-hash-symbols.test
@@ -29,17 +29,22 @@
   Type:    ET_DYN
   Machine: EM_386
 Sections:
-## The contents of .hash and .gnu.hash were generated by a linker.
   - Name:    .hash
     Type:    SHT_HASH
     Flags:   [ SHF_ALLOC ]
     Link:    .dynsym
-    Content: '0300000006000000010000000000000000000000000000000500000004000000020000000000000003000000'
+    Bucket:  [ 1, 0, 0 ]
+    Chain:   [ 0, 5, 4, 2, 0, 3 ]
   - Name:    .gnu.hash
     Type:    SHT_GNU_HASH
     Flags:   [ SHF_ALLOC ]
     Link:    .dynsym
-    Content: 0300000002000000010000000500000048991200000000000200000004000000685C880B9169880BF46D880BCB60880B
+    Header:
+      SymNdx: 0x2
+      Shift2: 0x0
+    BloomFilter: [ 0x0 ]
+    HashBuckets: [ 0x0, 0x2, 0x4 ]
+    HashValues:  [ 0x0B885C68, 0x0B886991, 0x0B886DF4, 0x0B8860CB ]
   - Name:  .dynamic
     Type:  SHT_DYNAMIC
     Flags: [ SHF_ALLOC ]
@@ -109,17 +114,22 @@
   Type:    ET_DYN
   Machine: EM_X86_64
 Sections:
-## The contents of .hash and .gnu.hash were generated by a linker.
   - Name:    .hash
     Type:    SHT_HASH
     Flags:   [ SHF_ALLOC ]
     Link:    .dynsym
-    Content: '0300000006000000010000000000000000000000000000000500000004000000020000000000000003000000'
+    Bucket:  [ 1, 0, 0 ]
+    Chain:   [ 0, 5, 4, 2, 0, 3 ]
   - Name:    .gnu.hash
     Type:    SHT_GNU_HASH
     Flags:   [ SHF_ALLOC ]
     Link:    .dynsym
-    Content: 030000000200000001000000060000000808020040019200000000000200000004000000685C880B9169880BF46D880BCB60880B
+    Header:
+      SymNdx: 0x2
+      Shift2: 0x0
+    BloomFilter: [ 0x0 ]
+    HashBuckets: [ 0x00000000, 0x00000002, 0x00000004 ]
+    HashValues:  [ 0x0B885C68, 0x0B886991, 0x0B886DF4, 0x0B8860CB ]
   - Name:  .dynamic
     Type:  SHT_DYNAMIC
     Flags: [ SHF_ALLOC ]
@@ -185,12 +195,12 @@
   Type:    ET_DYN
   Machine: EM_386
 Sections:
-## The contents of .hash was generated by a linker.
   - Name:    .hash
     Type:    SHT_HASH
     Flags:   [ SHF_ALLOC ]
     Link:    .dynsym
-    Content: '0300000006000000010000000000000000000000000000000500000004000000020000000000000003000000'
+    Bucket: [ 1, 0, 0 ]
+    Chain:  [ 0, 5, 4, 2, 0, 3 ]
   - Name:  .dynamic
     Type:  SHT_DYNAMIC
     Flags: [ SHF_ALLOC ]
@@ -246,12 +256,16 @@
   Type:    ET_DYN
   Machine: EM_386
 Sections:
-## The contents of .gnu.hash was generated by a linker.
   - Name:    .gnu.hash
     Type:    SHT_GNU_HASH
     Flags:   [ SHF_ALLOC ]
     Link:    .dynsym
-    Content: 0300000002000000010000000500000048991200000000000200000004000000685C880B9169880BF46D880BCB60880B
+    Header:
+      SymNdx: 0x2
+      Shift2: 0x0
+    BloomFilter: [ 0x0 ]
+    HashBuckets: [ 0x0, 0x2, 0x4 ]
+    HashValues:  [ 0x0B885C68, 0x0B886991, 0x0B886DF4, 0x0B8860CB ]
   - Name:  .dynamic
     Type:  SHT_DYNAMIC
     Flags: [ SHF_ALLOC ]