From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 4 Aug 2011 15:50:13 +0000 (+0000)
Subject: print st_shndx with the correct number of bits.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=251a2bbfb00ceb254d7ac1d35ae975ad9e2145cf;p=oota-llvm.git

print st_shndx with the correct number of bits.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136880 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll b/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
index 7bbe0485f87..a4bab85692d 100644
--- a/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
+++ b/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
@@ -24,7 +24,7 @@
 ; OBJ-NEXT:     'st_bind', 0x0
 ; OBJ-NEXT:     'st_type', 0x1
 ; OBJ-NEXT:     'st_other', 0x00
-; OBJ-NEXT:     'st_shndx', 0x00000004
+; OBJ-NEXT:     'st_shndx', 0x0004
 
 define i32 @main(i32 %argc) nounwind {
   %1 = load i32* @sum, align 4
diff --git a/test/MC/ELF/abs.s b/test/MC/ELF/abs.s
index 363ffcc2a6c..48dbe3dffcc 100644
--- a/test/MC/ELF/abs.s
+++ b/test/MC/ELF/abs.s
@@ -11,6 +11,6 @@
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x0000fff1)
+// CHECK-NEXT:  ('st_shndx', 0xfff1)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/alias-reloc.s b/test/MC/ELF/alias-reloc.s
index 146bb93069b..bd68becf8c1 100644
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -36,7 +36,7 @@ foo2:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -46,7 +46,7 @@ foo2:
 // CHECK-NEXT:  ('st_bind', 0x2)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000004)
+// CHECK-NEXT:  ('st_shndx', 0x0004)
 // CHECK-NEXT:  ('st_value', 0x0000000000000005)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/alias.s b/test/MC/ELF/alias.s
index 706ea036b8a..f3826280135 100644
--- a/test/MC/ELF/alias.s
+++ b/test/MC/ELF/alias.s
@@ -21,7 +21,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -30,7 +30,7 @@ bar4 = foo4
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x2)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -39,7 +39,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -48,7 +48,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -57,7 +57,7 @@ bar4 = foo4
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x2)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -72,7 +72,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK:       # Symbol 10
@@ -80,6 +80,6 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index d118bbb789c..2a23f9574e4 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -47,7 +47,7 @@
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000007)
+// CHECK-NEXT:  ('st_shndx', 0x0007)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -56,7 +56,7 @@
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000002)
+// CHECK-NEXT:  ('st_shndx', 0x0002)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -66,7 +66,7 @@
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/common.s b/test/MC/ELF/common.s
index dd3a0dae19c..046306e3d37 100644
--- a/test/MC/ELF/common.s
+++ b/test/MC/ELF/common.s
@@ -38,7 +38,7 @@
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x1)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000004)
+// CHECK-NEXT:  ('st_shndx', 0x0004)
 // CHECK-NEXT:  ('st_value', 0x0000000000000010)
 // CHECK-NEXT:  ('st_size', 0x0000000000000008)
 // CHECK-NEXT: ),
@@ -51,7 +51,7 @@
 // CHECK-NEXT: ('st_bind', 0x1)
 // CHECK-NEXT: ('st_type', 0x1)
 // CHECK-NEXT: ('st_other', 0x00)
-// CHECK-NEXT: ('st_shndx', 0x0000fff2)
+// CHECK-NEXT: ('st_shndx', 0xfff2)
 // CHECK-NEXT: ('st_value', 0x0000000000000004)
 // CHECK-NEXT: ('st_size', 0x0000000000000004)
 
@@ -71,7 +71,7 @@ foo:
 // CHECK-NEXT: ('st_bind', 0x1)
 // CHECK-NEXT: ('st_type', 0x1)
 // CHECK-NEXT: ('st_other', 0x00)
-// CHECK-NEXT: ('st_shndx', 0x0000fff2)
+// CHECK-NEXT: ('st_shndx', 0xfff2)
 // CHECK-NEXT: ('st_value', 0x0000000000000010)
 // CHECK-NEXT: ('st_size', 0x0000000000000028)
 
@@ -82,7 +82,7 @@ foo:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x1)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x0000fff2)
+// CHECK-NEXT:  ('st_shndx', 0xfff2)
 // CHECK-NEXT:  ('st_value', 0x0000000000000004)
 // CHECK-NEXT:  ('st_size', 0x0000000000000004)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/file.s b/test/MC/ELF/file.s
index 9661e4ecee9..434fb6e2b3c 100644
--- a/test/MC/ELF/file.s
+++ b/test/MC/ELF/file.s
@@ -9,7 +9,7 @@ foa:
 // CHECK-NEXT:     ('st_bind', 0x0)
 // CHECK-NEXT:     ('st_type', 0x4)
 // CHECK-NEXT:     ('st_other', 0x00)
-// CHECK-NEXT:     ('st_shndx', 0x0000fff1)
+// CHECK-NEXT:     ('st_shndx', 0xfff1)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
 // CHECK-NEXT:     ('st_size', 0x0000000000000000)
 // CHECK-NEXT:    ),
@@ -18,6 +18,6 @@ foa:
 // CHECK-NEXT:     ('st_bind', 0x0)
 // CHECK-NEXT:     ('st_type', 0x0)
 // CHECK-NEXT:     ('st_other', 0x00)
-// CHECK-NEXT:     ('st_shndx', 0x00000001)
+// CHECK-NEXT:     ('st_shndx', 0x0001)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
 // CHECK-NEXT:     ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s
index c7ffb0a98b7..b32a9cc1697 100644
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -26,6 +26,6 @@ foo:
 // CHECK-NEXT:     ('st_bind', 0x0)
 // CHECK-NEXT:     ('st_type', 0x3)
 // CHECK-NEXT:     ('st_other', 0x00)
-// CHECK-NEXT:     ('st_shndx', 0x00000001)
+// CHECK-NEXT:     ('st_shndx', 0x0001)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
 // CHECK-NEXT:     ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index f30910c6a6d..c5cf0697a34 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -90,7 +90,7 @@ foo:
 // CHECK-NEXT:     ('st_bind', 0x0)
 // CHECK-NEXT:     ('st_type', 0x3)
 // CHECK-NEXT:     ('st_other', 0x00)
-// CHECK-NEXT:     ('st_shndx', 0x00000005)
+// CHECK-NEXT:     ('st_shndx', 0x0005)
 
 // Symbol number 8 is zed
 // CHECK:        # Symbol 8
diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s
index c91e6e06b0a..1e57315b005 100644
--- a/test/MC/ELF/noexec.s
+++ b/test/MC/ELF/noexec.s
@@ -18,7 +18,7 @@
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000004)
+// CHECK-NEXT:   ('st_shndx', 0x0004)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index 31b0d6a6311..e5313af5430 100644
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -14,7 +14,7 @@
 // CHECK-NEXT:     ('st_bind', 0x1)
 // CHECK-NEXT:     ('st_type', 0x0)
 // CHECK-NEXT:     ('st_other', 0x00)
-// CHECK-NEXT:     ('st_shndx', 0x00000000)
+// CHECK-NEXT:     ('st_shndx', 0x0000)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
 // CHECK-NEXT:     ('st_size', 0x0000000000000000)
 // CHECK-NEXT:    ),
diff --git a/test/MC/ELF/pr9292.s b/test/MC/ELF/pr9292.s
index d97772fdf89..05f377faa71 100644
--- a/test/MC/ELF/pr9292.s
+++ b/test/MC/ELF/pr9292.s
@@ -11,7 +11,7 @@ mov %eax,bar
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -20,7 +20,7 @@ mov %eax,bar
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index 4ae30e009a7..442176307fa 100644
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -176,7 +176,7 @@
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x6)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000005)
+// CHECK-NEXT:  ('st_shndx', 0x0005)
 
 // Symbol 7 is section 4
 // CHECK:      # Symbol 7
@@ -186,7 +186,7 @@
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000004)
+// CHECK-NEXT:  ('st_shndx', 0x0004)
 
 
         .text
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index 87ff8375b1a..ff53599d412 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -118,4 +118,4 @@ bar:
 // CHECK:  ('st_bind', 0x0)
 // CHECK:  ('st_type', 0x3)
 // CHECK:  ('st_other', 0x00)
-// CHECK:  ('st_shndx', 0x00000001)
+// CHECK:  ('st_shndx', 0x0001)
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index 1e5826809fe..b004f608cd7 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -41,6 +41,6 @@ defined3:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/set.s b/test/MC/ELF/set.s
index 00b2fa892e3..2258b192367 100644
--- a/test/MC/ELF/set.s
+++ b/test/MC/ELF/set.s
@@ -8,7 +8,7 @@
 // CHECK-NEXT:     ('st_bind', 0x0)
 // CHECK-NEXT:     ('st_type', 0x0)
 // CHECK-NEXT:     ('st_other', 0x00)
-// CHECK-NEXT:     ('st_shndx', 0x0000fff1)
+// CHECK-NEXT:     ('st_shndx', 0xfff1)
 // CHECK-NEXT:     ('st_value', 0xffffffff80000000)
 // CHECK-NEXT:     ('st_size', 0x0000000000000000)
 // CHECK-NEXT:    ),
@@ -28,7 +28,7 @@
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/symref.s b/test/MC/ELF/symref.s
index 0ab5d649229..e8909113050 100644
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -59,7 +59,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -68,7 +68,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -77,7 +77,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -86,7 +86,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -95,7 +95,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -104,7 +104,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -113,7 +113,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000003)
+// CHECK-NEXT:  ('st_shndx', 0x0003)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -122,7 +122,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000004)
+// CHECK-NEXT:  ('st_shndx', 0x0004)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -131,7 +131,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000014)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -140,7 +140,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000014)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -149,7 +149,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -158,7 +158,7 @@ global1:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/tls-i386.s b/test/MC/ELF/tls-i386.s
index e0876d770b6..197418d93ce 100644
--- a/test/MC/ELF/tls-i386.s
+++ b/test/MC/ELF/tls-i386.s
@@ -16,7 +16,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 6
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'foo2'
@@ -25,7 +25,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'foo3'
@@ -34,7 +34,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000010) # 'foo4'
@@ -43,7 +43,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x00000015) # 'foo5'
@@ -52,7 +52,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 10
 // CHECK-NEXT:  (('st_name', 0x0000001a) # 'foo6'
@@ -61,7 +61,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 11
 // CHECK-NEXT:  (('st_name', 0x0000001f) # 'foo7'
@@ -70,5 +70,5 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:  ),
diff --git a/test/MC/ELF/tls.s b/test/MC/ELF/tls.s
index 0936044606a..d6d7de6ff2c 100644
--- a/test/MC/ELF/tls.s
+++ b/test/MC/ELF/tls.s
@@ -14,7 +14,7 @@ foobar:
 // CHECK-NEXT:  ('st_bind', 0x0)
 // CHECK-NEXT:  ('st_type', 0x6)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000005)
+// CHECK-NEXT:  ('st_shndx', 0x0005)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -24,7 +24,7 @@ foobar:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -33,7 +33,7 @@ foobar:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -42,7 +42,7 @@ foobar:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
diff --git a/test/MC/ELF/type.s b/test/MC/ELF/type.s
index 24559ee6cd6..2b25a6b69f6 100644
--- a/test/MC/ELF/type.s
+++ b/test/MC/ELF/type.s
@@ -17,7 +17,7 @@ bar:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x1)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -26,7 +26,7 @@ bar:
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x2)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000001)
+// CHECK-NEXT:  ('st_shndx', 0x0001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/undef.s b/test/MC/ELF/undef.s
index 26415d50af8..e377c633174 100644
--- a/test/MC/ELF/undef.s
+++ b/test/MC/ELF/undef.s
@@ -39,7 +39,7 @@
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x1)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:   ),
diff --git a/test/MC/ELF/weak.s b/test/MC/ELF/weak.s
index 3536ac1138d..07a83913631 100644
--- a/test/MC/ELF/weak.s
+++ b/test/MC/ELF/weak.s
@@ -14,7 +14,7 @@ bar:
 //CHECK-NEXT:    ('st_bind', 0x2)
 //CHECK-NEXT:    ('st_type', 0x0)
 //CHECK-NEXT:    ('st_other', 0x00)
-//CHECK-NEXT:    ('st_shndx', 0x00000001)
+//CHECK-NEXT:    ('st_shndx', 0x0001)
 //CHECK-NEXT:    ('st_value', 0x0000000000000004)
 //CHECK-NEXT:    ('st_size', 0x0000000000000000)
 //CHECK-NEXT:   ),
@@ -23,7 +23,7 @@ bar:
 //CHECK-NEXT:   ('st_bind', 0x2)
 //CHECK-NEXT:   ('st_type', 0x0)
 //CHECK-NEXT:   ('st_other', 0x00)
-//CHECK-NEXT:   ('st_shndx', 0x00000000)
+//CHECK-NEXT:   ('st_shndx', 0x0000)
 //CHECK-NEXT:   ('st_value', 0x0000000000000000)
 //CHECK-NEXT:   ('st_size', 0x0000000000000000)
 //CHECK-NEXT:  ),
diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s
index bd986062efc..a01c72a4879 100644
--- a/test/MC/ELF/weakref-reloc.s
+++ b/test/MC/ELF/weakref-reloc.s
@@ -25,7 +25,7 @@
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -34,7 +34,7 @@
 // CHECK-NEXT:  ('st_bind', 0x2)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
@@ -43,7 +43,7 @@
 // CHECK-NEXT:  ('st_bind', 0x1)
 // CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00)
-// CHECK-NEXT:  ('st_shndx', 0x00000000)
+// CHECK-NEXT:  ('st_shndx', 0x0000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/weakref.s b/test/MC/ELF/weakref.s
index 790b0abb6fa..e12d2c74eb8 100644
--- a/test/MC/ELF/weakref.s
+++ b/test/MC/ELF/weakref.s
@@ -74,7 +74,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -83,7 +83,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000018)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -92,7 +92,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000018)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -101,7 +101,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x000000000000001c)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -110,7 +110,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000020)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -119,7 +119,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -128,7 +128,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000003)
+// CHECK-NEXT:   ('st_shndx', 0x0003)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -137,7 +137,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x0)
 // CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000004)
+// CHECK-NEXT:   ('st_shndx', 0x0004)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -146,7 +146,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000028)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -155,7 +155,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000030)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -164,7 +164,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000030)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -173,7 +173,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000034)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -182,7 +182,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000038)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -191,7 +191,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000001)
+// CHECK-NEXT:   ('st_shndx', 0x0001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000040)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -200,7 +200,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -209,7 +209,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x2)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -218,7 +218,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
@@ -227,7 +227,7 @@ bar15:
 // CHECK-NEXT:   ('st_bind', 0x1)
 // CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00)
-// CHECK-NEXT:   ('st_shndx', 0x00000000)
+// CHECK-NEXT:   ('st_shndx', 0x0000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index 09a167c5687..bc6ed805924 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -109,7 +109,7 @@ def dumpSymtab(f, section, strtab):
         print "     ('st_bind', %s)" % common_dump.HexDump(st_bind[0], st_bind[1])
         print "     ('st_type', %s)" % common_dump.HexDump(st_type[0], st_type[1])
         print "     ('st_other', %s)" % common_dump.HexDump(f.read8(), 8)
-        print "     ('st_shndx', %s)" % common_dump.HexDump(f.read16())
+        print "     ('st_shndx', %s)" % common_dump.HexDump(f.read16(), 16)
         if f.is64Bit:
             print "     ('st_value', %s)" % common_dump.HexDump(f.read64(), 64)
             print "     ('st_size', %s)" % common_dump.HexDump(f.read64(), 64)