print st_type with the correct number of bits.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136875 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 fbdf162..dd0ca5c 100644
--- a/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
+++ b/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
@@ -22,7 +22,7 @@
 ; OBJ-NEXT:     'st_value', 0x00000000
 ; OBJ-NEXT:     'st_size', 0x00000050
 ; OBJ-NEXT:     'st_bind', 0x0
-; OBJ-NEXT:     'st_type', 0x00000001
+; OBJ-NEXT:     'st_type', 0x1
 ; OBJ-NEXT:     'st_other', 0x00000000
 ; OBJ-NEXT:     'st_shndx', 0x00000004
 
diff --git a/test/MC/ARM/elf-thumbfunc.s b/test/MC/ARM/elf-thumbfunc.s
index c9591f8..0aa7f41 100644
--- a/test/MC/ARM/elf-thumbfunc.s
+++ b/test/MC/ARM/elf-thumbfunc.s
@@ -17,4 +17,4 @@
 @CHECK-NEXT:      'st_value', 0x00000001
 @CHECK-NEXT:      'st_size', 0x00000000
 @CHECK-NEXT:      'st_bind', 0x1
-@CHECK-NEXT:      'st_type', 0x00000002
+@CHECK-NEXT:      'st_type', 0x2
diff --git a/test/MC/ELF/abs.s b/test/MC/ELF/abs.s
index 18a5156..2de8f7c 100644
--- a/test/MC/ELF/abs.s
+++ b/test/MC/ELF/abs.s
@@ -9,7 +9,7 @@
 // CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000001) # 'zed'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x0000fff1)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/alias-reloc.s b/test/MC/ELF/alias-reloc.s
index 3accec5..71975ba 100644
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -34,7 +34,7 @@
 // CHECK:       # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -44,7 +44,7 @@
 // CHECK:      # Symbol 6
 // CHECK-NEXT: (('st_name', 0x0000000e) # 'bar2'
 // CHECK-NEXT:  ('st_bind', 0x2)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000004)
 // CHECK-NEXT:  ('st_value', 0x0000000000000005)
diff --git a/test/MC/ELF/alias.s b/test/MC/ELF/alias.s
index 46cb4f6..e429bd7 100644
--- a/test/MC/ELF/alias.s
+++ b/test/MC/ELF/alias.s
@@ -19,7 +19,7 @@
 // CHECK:       # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -28,7 +28,7 @@
 // CHECK-NEXT:  # Symbol 2
 // CHECK-NEXT: (('st_name', 0x0000001d) # 'bar4'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000002)
+// CHECK-NEXT:  ('st_type', 0x2)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -37,7 +37,7 @@
 // CHECK-NEXT:  # Symbol 3
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -46,7 +46,7 @@
 // CHECK-NEXT:  # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x0000000e) # 'foo3'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -55,7 +55,7 @@
 // CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000018) # 'foo4'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000002)
+// CHECK-NEXT:  ('st_type', 0x2)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -70,7 +70,7 @@
 // CHECK:       # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x00000013) # 'bar3'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -78,7 +78,7 @@
 // CHECK:       # Symbol 10
 // CHECK-NEXT:  (('st_name', 0x00000009) # 'bar2'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/basic-elf-32.s b/test/MC/ELF/basic-elf-32.s
index f8bfd0e..b1e5b3d 100644
--- a/test/MC/ELF/basic-elf-32.s
+++ b/test/MC/ELF/basic-elf-32.s
@@ -61,18 +61,18 @@
 // CHECK:   ])
 
 // CHECK: ('st_bind', 0x0)
-// CHECK: ('st_type', 0x00000003)
+// CHECK: ('st_type', 0x3)
 
 // CHECK: ('st_bind', 0x0)
-// CHECK: ('st_type', 0x00000003)
+// CHECK: ('st_type', 0x3)
 
 // CHECK: ('st_bind', 0x0)
-// CHECK: ('st_type', 0x00000003)
+// CHECK: ('st_type', 0x3)
 
 // CHECK:   # 'main'
 // CHECK:   ('st_bind', 0x1)
-// CHECK-NEXT: ('st_type', 0x00000002)
+// CHECK-NEXT: ('st_type', 0x2)
 
 // CHECK:   # 'puts'
 // CHECK:   ('st_bind', 0x1)
-// CHECK-NEXT: ('st_type', 0x00000000)
+// CHECK-NEXT: ('st_type', 0x0)
diff --git a/test/MC/ELF/basic-elf-64.s b/test/MC/ELF/basic-elf-64.s
index 48c5053..3f65a30 100644
--- a/test/MC/ELF/basic-elf-64.s
+++ b/test/MC/ELF/basic-elf-64.s
@@ -65,18 +65,18 @@
 // CHECK:   ])
 
 // CHECK: ('st_bind', 0x0)
-// CHECK: ('st_type', 0x00000003)
+// CHECK: ('st_type', 0x3)
 
 // CHECK: ('st_bind', 0x0)
-// CHECK: ('st_type', 0x00000003)
+// CHECK: ('st_type', 0x3)
 
 // CHECK: ('st_bind', 0x0)
-// CHECK: ('st_type', 0x00000003)
+// CHECK: ('st_type', 0x3)
 
 // CHECK:   # 'main'
 // CHECK-NEXT: ('st_bind', 0x1)
-// CHECK-NEXT: ('st_type', 0x00000002)
+// CHECK-NEXT: ('st_type', 0x2)
 
 // CHECK:   # 'puts'
 // CHECK-NEXT: ('st_bind', 0x1)
-// CHECK-NEXT: ('st_type', 0x00000000)
+// CHECK-NEXT: ('st_type', 0x0)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index e745703..47005dd 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -45,7 +45,7 @@
 // CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000001) # 'g1'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000007)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -54,7 +54,7 @@
 // CHECK-NEXT: # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000004) # 'g2'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000002)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -64,7 +64,7 @@
 // CHECK:      # Symbol 13
 // CHECK-NEXT: (('st_name', 0x00000007) # 'g3'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/common.s b/test/MC/ELF/common.s
index c6a97a0..21020b5 100644
--- a/test/MC/ELF/common.s
+++ b/test/MC/ELF/common.s
@@ -10,7 +10,7 @@
 
 // CHECK: ('st_name', 0x00000001) # 'common1'
 // CHECK-NEXT: ('st_bind', 0x0)
-// CHECK-NEXT: ('st_type', 0x00000001)
+// CHECK-NEXT: ('st_type', 0x1)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx',
 // CHECK-NEXT: ('st_value', 0x0000000000000000)
@@ -24,7 +24,7 @@
 
 // CHECK: ('st_name', 0x00000009) # 'common2'
 // CHECK-NEXT: ('st_bind', 0x0)
-// CHECK-NEXT: ('st_type', 0x00000001)
+// CHECK-NEXT: ('st_type', 0x1)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx',
 // CHECK-NEXT: ('st_value', 0x0000000000000001)
@@ -36,7 +36,7 @@
 // CHECK:      # Symbol 3
 // CHECK-NEXT: (('st_name', 0x00000011) # 'common6'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000001)
+// CHECK-NEXT:  ('st_type', 0x1)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000004)
 // CHECK-NEXT:  ('st_value', 0x0000000000000010)
@@ -49,7 +49,7 @@
 
 // CHECK: ('st_name', 0x00000019) # 'common3'
 // CHECK-NEXT: ('st_bind', 0x1)
-// CHECK-NEXT: ('st_type', 0x00000001)
+// CHECK-NEXT: ('st_type', 0x1)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx', 0x0000fff2)
 // CHECK-NEXT: ('st_value', 0x0000000000000004)
@@ -69,7 +69,7 @@
 
 // CHECK: ('st_name', 0x00000025) # 'common4'
 // CHECK-NEXT: ('st_bind', 0x1)
-// CHECK-NEXT: ('st_type', 0x00000001)
+// CHECK-NEXT: ('st_type', 0x1)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx', 0x0000fff2)
 // CHECK-NEXT: ('st_value', 0x0000000000000010)
@@ -80,7 +80,7 @@
 // CHECK:      # Symbol 9
 // CHECK-NEXT: (('st_name', 0x0000002d) # 'common5'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000001)
+// CHECK-NEXT:  ('st_type', 0x1)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x0000fff2)
 // CHECK-NEXT:  ('st_value', 0x0000000000000004)
diff --git a/test/MC/ELF/file.s b/test/MC/ELF/file.s
index c8f8a41..37c8799 100644
--- a/test/MC/ELF/file.s
+++ b/test/MC/ELF/file.s
@@ -7,7 +7,7 @@
 // CHECK:    # Symbol 1
 // CHECK-NEXT:    (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:     ('st_bind', 0x0)
-// CHECK-NEXT:     ('st_type', 0x00000004)
+// CHECK-NEXT:     ('st_type', 0x4)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x0000fff1)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
@@ -16,7 +16,7 @@
 // CHECK-NEXT:    # Symbol 2
 // CHECK-NEXT:    (('st_name', 0x00000005) # 'foa'
 // CHECK-NEXT:     ('st_bind', 0x0)
-// CHECK-NEXT:     ('st_type', 0x00000000)
+// CHECK-NEXT:     ('st_type', 0x0)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000001)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s
index 2d71cc8..747e697 100644
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -24,7 +24,7 @@
 // CHECK:    # Symbol 2
 // CHECK-NEXT:    (('st_name', 0x00000000) # ''
 // CHECK-NEXT:     ('st_bind', 0x0)
-// CHECK-NEXT:     ('st_type', 0x00000003)
+// CHECK-NEXT:     ('st_type', 0x3)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000001)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index 018a6a6..d5579f6 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -88,7 +88,7 @@
 // CHECK:        # Symbol 6
 // CHECK-NEXT:    (('st_name', 0x00000000) # ''
 // CHECK-NEXT:     ('st_bind', 0x0)
-// CHECK-NEXT:     ('st_type', 0x00000003)
+// CHECK-NEXT:     ('st_type', 0x3)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000005)
 
diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s
index 96966ae..073c148 100644
--- a/test/MC/ELF/noexec.s
+++ b/test/MC/ELF/noexec.s
@@ -16,7 +16,7 @@
 // CHECK:       # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000003)
+// CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000004)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index bffd1e6..4e793e3 100644
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -12,7 +12,7 @@
 // CHECK:         # Symbol 5
 // CHECK-NEXT:    (('st_name', 0x00000005) # 'baz'
 // CHECK-NEXT:     ('st_bind', 0x1)
-// CHECK-NEXT:     ('st_type', 0x00000000)
+// CHECK-NEXT:     ('st_type', 0x0)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000000)
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/pr9292.s b/test/MC/ELF/pr9292.s
index 4d6db21..9155e74 100644
--- a/test/MC/ELF/pr9292.s
+++ b/test/MC/ELF/pr9292.s
@@ -9,7 +9,7 @@
 
 // CHECK:      (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -18,7 +18,7 @@
 // CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index d302116..48b0354 100644
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -174,7 +174,7 @@
 // CHECK-NEXT:  ('st_value', 0x00000000)
 // CHECK-NEXT:  ('st_size', 0x00000000)
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000006)
+// CHECK-NEXT:  ('st_type', 0x6)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000005)
 
@@ -184,7 +184,7 @@
 // CHECK-NEXT:  ('st_value', 0x00000000)
 // CHECK-NEXT:  ('st_size', 0x00000000)
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000003)
+// CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000004)
 
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index 62cc059..54f0ce0 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -116,6 +116,6 @@
 // CHECK:   # Symbol 2
 // CHECK: (('st_name', 0x00000000) # ''
 // CHECK:  ('st_bind', 0x0)
-// CHECK:  ('st_type', 0x00000003)
+// CHECK:  ('st_type', 0x3)
 // CHECK:  ('st_other', 0x00000000)
 // CHECK:  ('st_shndx', 0x00000001)
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index f85f410..d402aff 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -39,7 +39,7 @@
 // CHECK:      # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000003)
+// CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/set.s b/test/MC/ELF/set.s
index 9c32947..2ade90f 100644
--- a/test/MC/ELF/set.s
+++ b/test/MC/ELF/set.s
@@ -6,7 +6,7 @@
 
 // CHECK:         (('st_name', 0x00000001) # 'kernbase'
 // CHECK-NEXT:     ('st_bind', 0x0)
-// CHECK-NEXT:     ('st_type', 0x00000000)
+// CHECK-NEXT:     ('st_type', 0x0)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x0000fff1)
 // CHECK-NEXT:     ('st_value', 0xffffffff80000000)
@@ -26,7 +26,7 @@
 // Test that there is an undefined reference to bar
 // CHECK:      (('st_name', 0x0000000a) # 'bar'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/symref.s b/test/MC/ELF/symref.s
index 78afc0d..5dbb001 100644
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -57,7 +57,7 @@
 // CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000013) # 'bar1@zed'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -66,7 +66,7 @@
 // CHECK-NEXT: # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000025) # 'bar3@@zed'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -75,7 +75,7 @@
 // CHECK-NEXT: # Symbol 3
 // CHECK-NEXT: (('st_name', 0x0000002f) # 'bar5@@zed'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -84,7 +84,7 @@
 // CHECK-NEXT: # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000001) # 'defined1'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -93,7 +93,7 @@
 // CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x0000000a) # 'defined2'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -102,7 +102,7 @@
 // CHECK-NEXT: # Symbol 6
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000003)
+// CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -111,7 +111,7 @@
 // CHECK-NEXT: # Symbol 7
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000003)
+// CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000003)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -120,7 +120,7 @@
 // CHECK-NEXT: # Symbol 8
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000003)
+// CHECK-NEXT:  ('st_type', 0x3)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000004)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -129,7 +129,7 @@
 // CHECK-NEXT: # Symbol 9
 // CHECK-NEXT: (('st_name', 0x0000004a) # 'g1@@zed'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000014)
@@ -138,7 +138,7 @@
 // CHECK-NEXT: # Symbol 10
 // CHECK-NEXT: (('st_name', 0x00000042) # 'global1'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000014)
@@ -147,7 +147,7 @@
 // CHECK-NEXT: # Symbol 11
 // CHECK-NEXT: (('st_name', 0x0000001c) # 'bar2@zed'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -156,7 +156,7 @@
 // CHECK-NEXT: # Symbol 12
 // CHECK-NEXT: (('st_name', 0x00000039) # 'bar6@zed'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/tls-i386.s b/test/MC/ELF/tls-i386.s
index 7dde9b2..7c52e9d 100644
--- a/test/MC/ELF/tls-i386.s
+++ b/test/MC/ELF/tls-i386.s
@@ -14,7 +14,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
@@ -23,7 +23,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
@@ -32,7 +32,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
@@ -41,7 +41,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
@@ -50,7 +50,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
@@ -59,7 +59,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
@@ -68,7 +68,7 @@
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
diff --git a/test/MC/ELF/tls.s b/test/MC/ELF/tls.s
index 7721b88..07b3767 100644
--- a/test/MC/ELF/tls.s
+++ b/test/MC/ELF/tls.s
@@ -12,7 +12,7 @@
 
 // CHECK:      (('st_name', 0x00000010) # 'foobar'
 // CHECK-NEXT:  ('st_bind', 0x0)
-// CHECK-NEXT:  ('st_type', 0x00000006)
+// CHECK-NEXT:  ('st_type', 0x6)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000005)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -22,7 +22,7 @@
 // CHECK:       # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'foo1'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -31,7 +31,7 @@
 // CHECK-NEXT:  # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'foo2'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -40,7 +40,7 @@
 // CHECK-NEXT:  # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'foo3'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000006)
+// CHECK-NEXT:   ('st_type', 0x6)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/type.s b/test/MC/ELF/type.s
index 10d551a..07e1e3b 100644
--- a/test/MC/ELF/type.s
+++ b/test/MC/ELF/type.s
@@ -15,7 +15,7 @@
 // CHECK:      # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000001)
+// CHECK-NEXT:  ('st_type', 0x1)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -24,7 +24,7 @@
 // CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000002)
+// CHECK-NEXT:  ('st_type', 0x2)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/undef.s b/test/MC/ELF/undef.s
index 4b7f32d..866b93c 100644
--- a/test/MC/ELF/undef.s
+++ b/test/MC/ELF/undef.s
@@ -37,7 +37,7 @@
 // CHECK:       # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000008) # 'sym6'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000001)
+// CHECK-NEXT:   ('st_type', 0x1)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/weak.s b/test/MC/ELF/weak.s
index cfd5a63..7c89674 100644
--- a/test/MC/ELF/weak.s
+++ b/test/MC/ELF/weak.s
@@ -12,7 +12,7 @@
 //CHECK:        # Symbol 4
 //CHECK-NEXT:   (('st_name', 0x00000005) # 'bar'
 //CHECK-NEXT:    ('st_bind', 0x2)
-//CHECK-NEXT:    ('st_type', 0x00000000)
+//CHECK-NEXT:    ('st_type', 0x0)
 //CHECK-NEXT:    ('st_other', 0x00000000)
 //CHECK-NEXT:    ('st_shndx', 0x00000001)
 //CHECK-NEXT:    ('st_value', 0x0000000000000004)
@@ -21,7 +21,7 @@
 //CHECK-NEXT:   # Symbol 5
 //CHECK:       (('st_name', 0x00000001) # 'foo'
 //CHECK-NEXT:   ('st_bind', 0x2)
-//CHECK-NEXT:   ('st_type', 0x00000000)
+//CHECK-NEXT:   ('st_type', 0x0)
 //CHECK-NEXT:   ('st_other', 0x00000000)
 //CHECK-NEXT:   ('st_shndx', 0x00000000)
 //CHECK-NEXT:   ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s
index 49b97dc..e32b0be 100644
--- a/test/MC/ELF/weakref-reloc.s
+++ b/test/MC/ELF/weakref-reloc.s
@@ -23,7 +23,7 @@
 // CHECK:      # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000009) # '_GLOBAL_OFFSET_TABLE_'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -32,7 +32,7 @@
 // CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x2)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
@@ -41,7 +41,7 @@
 // CHECK-NEXT: # Symbol 6
 // CHECK-NEXT: (('st_name', 0x00000005) # 'zed'
 // CHECK-NEXT:  ('st_bind', 0x1)
-// CHECK-NEXT:  ('st_type', 0x00000000)
+// CHECK-NEXT:  ('st_type', 0x0)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
diff --git a/test/MC/ELF/weakref.s b/test/MC/ELF/weakref.s
index 2325a96..98286dd 100644
--- a/test/MC/ELF/weakref.s
+++ b/test/MC/ELF/weakref.s
@@ -72,7 +72,7 @@
 // CHECK:       # Symbol 0
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -81,7 +81,7 @@
 // CHECK-NEXT:  # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x00000015) # 'bar6'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000018)
@@ -90,7 +90,7 @@
 // CHECK-NEXT:  # Symbol 2
 // CHECK-NEXT:  (('st_name', 0x0000001a) # 'bar7'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000018)
@@ -99,7 +99,7 @@
 // CHECK-NEXT:  # Symbol 3
 // CHECK-NEXT:  (('st_name', 0x0000001f) # 'bar8'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x000000000000001c)
@@ -108,7 +108,7 @@
 // CHECK-NEXT:  # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x00000024) # 'bar9'
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000020)
@@ -117,7 +117,7 @@
 // CHECK-NEXT:  # Symbol 5
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000003)
+// CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -126,7 +126,7 @@
 // CHECK-NEXT:  # Symbol 6
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000003)
+// CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000003)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -135,7 +135,7 @@
 // CHECK-NEXT:  # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x0)
-// CHECK-NEXT:   ('st_type', 0x00000003)
+// CHECK-NEXT:   ('st_type', 0x3)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000004)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -144,7 +144,7 @@
 // CHECK-NEXT:  # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000029) # 'bar10'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000028)
@@ -153,7 +153,7 @@
 // CHECK-NEXT:  # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x0000002f) # 'bar11'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000030)
@@ -162,7 +162,7 @@
 // CHECK-NEXT:  # Symbol 10
 // CHECK-NEXT:  (('st_name', 0x00000035) # 'bar12'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000030)
@@ -171,7 +171,7 @@
 // CHECK-NEXT:  # Symbol 11
 // CHECK-NEXT:  (('st_name', 0x0000003b) # 'bar13'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000034)
@@ -180,7 +180,7 @@
 // CHECK-NEXT:  # Symbol 12
 // CHECK-NEXT:  (('st_name', 0x00000041) # 'bar14'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000038)
@@ -189,7 +189,7 @@
 // CHECK-NEXT:  # Symbol 13
 // CHECK-NEXT:  (('st_name', 0x00000047) # 'bar15'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000040)
@@ -198,7 +198,7 @@
 // CHECK-NEXT:  # Symbol 14
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'bar2'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -207,7 +207,7 @@
 // CHECK-NEXT:  # Symbol 15
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'bar3'
 // CHECK-NEXT:   ('st_bind', 0x2)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -216,7 +216,7 @@
 // CHECK-NEXT:  # Symbol 16
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'bar4'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
@@ -225,7 +225,7 @@
 // CHECK-NEXT:  # Symbol 17
 // CHECK-NEXT:  (('st_name', 0x00000010) # 'bar5'
 // CHECK-NEXT:   ('st_bind', 0x1)
-// CHECK-NEXT:   ('st_type', 0x00000000)
+// CHECK-NEXT:   ('st_type', 0x0)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index a94079c..d335e69 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -107,7 +107,7 @@
         st_bind = (st_info >> 4, 4)
         st_type = (st_info & 0xf, 4)
         print "     ('st_bind', %s)" % common_dump.HexDump(st_bind[0], st_bind[1])
-        print "     ('st_type', %s)" % common_dump.HexDump(st_type[0], 32)
+        print "     ('st_type', %s)" % common_dump.HexDump(st_type[0], st_type[1])
         print "     ('st_other', %s)" % common_dump.HexDump(f.read8())
         print "     ('st_shndx', %s)" % common_dump.HexDump(f.read16())
         if f.is64Bit: