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 fbdf162a63fb6e93c6285a6f447ad57ba03e2b53..dd0ca5ced0c9260dd3062aab4482d51f23ae507d 100644 (file)
--- 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 c9591f86c86958b8324e0fce20e01b5ad24bda45..0aa7f41cc4be010e12e83db83e07bc5598842308 100644 (file)
--- a/test/MC/ARM/elf-thumbfunc.s
+++ b/test/MC/ARM/elf-thumbfunc.s
@@ -17,4 +17,4 @@ foo:
 @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 18a5156868dd9b521a85d4c22d69bd29afc9d49c..2de8f7c2d7096db9f339082618202cd5babb8170 100644 (file)
--- 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 3accec5c22f10464c272f0770820c10dbf3ad80c..71975ba8148adec7447252c67e46af01f05dc698 100644 (file)
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -34,7 +34,7 @@ foo2:
 // 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 @@ foo2:
 // 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 46cb4f697d234dd910e26a7269331198250cb94b..e429bd75781f65bb92196c74774a1373338ac347 100644 (file)
--- a/test/MC/ELF/alias.s
+++ b/test/MC/ELF/alias.s
@@ -19,7 +19,7 @@ bar4 = foo4
 // 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 @@ bar4 = foo4
 // 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 @@ bar4 = foo4
 // 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 @@ bar4 = foo4
 // 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 @@ bar4 = foo4
 // 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 @@ bar4 = foo4
 // 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 @@ bar4 = foo4
 // 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 f8bfd0e842764743b1c278e706f8dd48d647beb7..b1e5b3d8cfc7db1fd3a2c4e927f47a99d6a553d1 100644 (file)
--- a/test/MC/ELF/basic-elf-32.s
+++ b/test/MC/ELF/basic-elf-32.s
@@ -61,18 +61,18 @@ main:                                   # @main
 // 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 48c50532e0d9b01210c3eb7d5915c6c505cafaba..3f65a302f0358f7ff7ac03926ae0a738524c12ed 100644 (file)
--- a/test/MC/ELF/basic-elf-64.s
+++ b/test/MC/ELF/basic-elf-64.s
@@ -65,18 +65,18 @@ main:                                   # @main
 // 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 e74570382cbc927e6b05827ef0b917e2d7a4c562..47005dd08f53eb305ff9a5b83f2362f469e2549d 100644 (file)
--- 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 c6a97a0908c5489f14551a6683477b540a0e7c79..21020b5ce3683eec3e959c455ca3828e17f73985 100644 (file)
--- 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 @@ foo:
 
 // 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 @@ foo:
 // 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 c8f8a41fe39a38f62f2dcd3a55f3557c2b6ffaa8..37c8799feebe169048a193914e5b21f67f9096c3 100644 (file)
--- a/test/MC/ELF/file.s
+++ b/test/MC/ELF/file.s
@@ -7,7 +7,7 @@ foa:
 // 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 @@ foa:
 // 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 2d71cc893d875e37f0de23717bf4c923115a2c4e..747e6979c06bffb31a867b46487161e296e8843d 100644 (file)
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -24,7 +24,7 @@ foo:
 // 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 018a6a623e5d466177a170b1baa68f3714882ba4..d5579f6d188925af059fed0a61291e73285a76f7 100644 (file)
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -88,7 +88,7 @@ foo:
 // 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 96966ae79e18985194fcc4edf973f164bcaee510..073c148f0308f4f9166fdcfb109f502921263321 100644 (file)
--- 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 bffd1e6c60cf0fc8ee2b624c450183586c7fcd8d..4e793e33954fbd5d4d76d06324b8fea33a3ed2b7 100644 (file)
--- 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 4d6db21e6cfd13e65b23a82c53eec29bdb801844..9155e74cf109617e58d8393743d583a74ed4e2bf 100644 (file)
--- a/test/MC/ELF/pr9292.s
+++ b/test/MC/ELF/pr9292.s
@@ -9,7 +9,7 @@ mov %eax,bar
 
 // 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 @@ mov %eax,bar
 // 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 d3021164d2715139a0307a1e9e4172c41bce0862..48b0354f2f70f48e99431dc4c1caf870308434b4 100644 (file)
--- 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 62cc05971a516ff85813827daa03ae7a437b8868..54f0ce0747f14d517c8b62f6dfd303fdbbd40abe 100644 (file)
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -116,6 +116,6 @@ bar:
 // 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 f85f410da8860f731c0e4d0fdec0aed4779bcee7..d402aff7f7b2a9592a7109caab31249225725123 100644 (file)
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -39,7 +39,7 @@ defined3:
 // 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 9c32947ba3f735d7749187378cceefc8a6815eef..2ade90fb473204c9d139ce9440e34f8b9c5b0da0 100644 (file)
--- 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 78afc0d89d1ee4ecca757b8e8dedfa02e1dc575a..5dbb0014b9facd1e6eecf20a7af32d660d49e703 100644 (file)
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -57,7 +57,7 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 @@ global1:
 // 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 7dde9b2ff3290bc9fcbede35892c42c709ddf44d..7c52e9dbf55c0d0295f14b6b7dbceb9fcfb253bb 100644 (file)
--- 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 7721b889224db0eb182b4a5058852d183683e1a6..07b3767112a29c677ebd2798d7859e926eff1025 100644 (file)
--- a/test/MC/ELF/tls.s
+++ b/test/MC/ELF/tls.s
@@ -12,7 +12,7 @@ foobar:
 
 // 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 @@ foobar:
 // 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 @@ foobar:
 // 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 @@ foobar:
 // 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 10d551ae8d69c32b697228b9b59f5018c5b00614..07e1e3bd797fcef06fb009ad873cec37b11f5280 100644 (file)
--- a/test/MC/ELF/type.s
+++ b/test/MC/ELF/type.s
@@ -15,7 +15,7 @@ bar:
 // 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 @@ bar:
 // 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 4b7f32de64e817777e89c926d0fb66f1db36c3bb..866b93c644855b8135ef950f8b25b453bcd31e17 100644 (file)
--- 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 cfd5a6329ae98ceedb5991f000bd7ad6fd2a08a6..7c896743eb974abd0a5796d28919cc55034caf1d 100644 (file)
--- a/test/MC/ELF/weak.s
+++ b/test/MC/ELF/weak.s
@@ -12,7 +12,7 @@ bar:
 //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 @@ bar:
 //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 49b97dc2bf4c502a51d0ddc4b47b1849c68f7213..e32b0be13cc40bec64190fa25ef309d46a6acb28 100644 (file)
--- 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 2325a9634dcc03eeb5f1e5b40ca57d8006779772..98286dd31103646bfbaac1330fb0cfa9b794bc87 100644 (file)
--- a/test/MC/ELF/weakref.s
+++ b/test/MC/ELF/weakref.s
@@ -72,7 +72,7 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 @@ bar15:
 // 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 a94079c5241b01a37efb63d91caa66e43109410e..d335e69b4373a04762dd6b4bc26607518e3aa8fe 100755 (executable)
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -107,7 +107,7 @@ def dumpSymtab(f, section, strtab):
         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: