From 65ad8dc807174b53615181a8170befdf60b6771d Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 4 Aug 2011 14:27:46 +0000
Subject: [PATCH] Another counter goes decimal.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136871 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/MC/ARM/elf-reloc-01.ll        |  2 +-
 test/MC/ARM/elf-reloc-02.ll        |  2 +-
 test/MC/ARM/elf-reloc-03.ll        |  2 +-
 test/MC/ARM/elf-thumbfunc-reloc.ll |  2 +-
 test/MC/ARM/elf-thumbfunc.s        |  2 +-
 test/MC/ELF/abs.s                  |  2 +-
 test/MC/ELF/alias-reloc.s          |  4 ++--
 test/MC/ELF/alias.s                | 20 ++++++++---------
 test/MC/ELF/comdat.s               |  6 ++---
 test/MC/ELF/common.s               |  4 ++--
 test/MC/ELF/file.s                 |  4 ++--
 test/MC/ELF/local-reloc.s          |  2 +-
 test/MC/ELF/merge.s                |  8 +++----
 test/MC/ELF/noexec.s               |  2 +-
 test/MC/ELF/pic-diff.s             |  2 +-
 test/MC/ELF/pr9292.s               |  2 +-
 test/MC/ELF/relax.s                |  2 +-
 test/MC/ELF/relocation-386.s       |  6 ++---
 test/MC/ELF/relocation.s           |  2 +-
 test/MC/ELF/rename.s               |  2 +-
 test/MC/ELF/symref.s               | 24 ++++++++++----------
 test/MC/ELF/tls-i386.s             | 12 +++++-----
 test/MC/ELF/tls.s                  |  6 ++---
 test/MC/ELF/type.s                 |  4 ++--
 test/MC/ELF/undef.s                | 16 ++++++-------
 test/MC/ELF/weak.s                 |  4 ++--
 test/MC/ELF/weakref-plt.s          |  2 +-
 test/MC/ELF/weakref-reloc.s        |  6 ++---
 test/MC/ELF/weakref.s              | 36 +++++++++++++++---------------
 test/Scripts/elf-dump              |  2 +-
 30 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/test/MC/ARM/elf-reloc-01.ll b/test/MC/ARM/elf-reloc-01.ll
index 4ddc3ca9b0f..a17ef616dc1 100644
--- a/test/MC/ARM/elf-reloc-01.ll
+++ b/test/MC/ARM/elf-reloc-01.ll
@@ -65,6 +65,6 @@ declare void @exit(i32) noreturn nounwind
 ;; OBJ-NEXT:     'r_sym', 0x00000002
 ;; OBJ-NEXT:     'r_type', 0x0000002b
 
-;; OBJ:         Symbol 0x00000002
+;; OBJ:         Symbol 2
 ;; OBJ-NEXT:    '_MergedGlobals'
 ;; OBJ-NEXT:    'st_value', 0x00000010
diff --git a/test/MC/ARM/elf-reloc-02.ll b/test/MC/ARM/elf-reloc-02.ll
index 7b2d8858374..972c7fe4c4b 100644
--- a/test/MC/ARM/elf-reloc-02.ll
+++ b/test/MC/ARM/elf-reloc-02.ll
@@ -46,5 +46,5 @@ declare void @exit(i32) noreturn nounwind
 ;; OBJ-NEXT:    'r_sym', 0x00000002
 ;; OBJ-NEXT:    'r_type', 0x0000002b
 
-;; OBJ:          Symbol 0x00000002
+;; OBJ:          Symbol 2
 ;; OBJ-NEXT:    '.L.str'
diff --git a/test/MC/ARM/elf-reloc-03.ll b/test/MC/ARM/elf-reloc-03.ll
index d07743e40b0..3d1584f40d4 100644
--- a/test/MC/ARM/elf-reloc-03.ll
+++ b/test/MC/ARM/elf-reloc-03.ll
@@ -93,5 +93,5 @@ declare void @exit(i32) noreturn nounwind
 ;; OBJ-NEXT:     'r_sym', 0x0000000c
 ;; OBJ-NEXT:     'r_type', 0x0000002b
 
-;; OBJ:      Symbol 0x0000000c
+;; OBJ:      Symbol 12
 ;; OBJ-NEXT:    'vtable'
diff --git a/test/MC/ARM/elf-thumbfunc-reloc.ll b/test/MC/ARM/elf-thumbfunc-reloc.ll
index 3c7816b8874..67ef1c78b87 100644
--- a/test/MC/ARM/elf-thumbfunc-reloc.ll
+++ b/test/MC/ARM/elf-thumbfunc-reloc.ll
@@ -32,6 +32,6 @@ entry:
 ; CHECK-NEXT:      'r_type', 0x0000000a
 
 ; make sure foo is thumb function: bit 0 = 1
-; CHECK:           Symbol 0x00000007
+; CHECK:           Symbol 7
 ; CHECK-NEXT:      'foo'
 ; CHECK-NEXT:      'st_value', 0x00000001
diff --git a/test/MC/ARM/elf-thumbfunc.s b/test/MC/ARM/elf-thumbfunc.s
index a1b3c311e8c..792f299323a 100644
--- a/test/MC/ARM/elf-thumbfunc.s
+++ b/test/MC/ARM/elf-thumbfunc.s
@@ -12,7 +12,7 @@ foo:
 	bx	lr
 
 @@ make sure foo is thumb function: bit 0 = 1 (st_value)
-@CHECK:           Symbol 0x00000004
+@CHECK:           Symbol 4
 @CHECK-NEXT:      'st_name', 0x00000001
 @CHECK-NEXT:      'st_value', 0x00000001
 @CHECK-NEXT:      'st_size', 0x00000000
diff --git a/test/MC/ELF/abs.s b/test/MC/ELF/abs.s
index c598b11e291..8e4d7f080de 100644
--- a/test/MC/ELF/abs.s
+++ b/test/MC/ELF/abs.s
@@ -6,7 +6,7 @@
 .Lbar:
         zed = .Lfoo - .Lbar
 
-// CHECK:      # Symbol 0x00000001
+// CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000001) # 'zed'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
diff --git a/test/MC/ELF/alias-reloc.s b/test/MC/ELF/alias-reloc.s
index 18318fac780..9d7115618c0 100644
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -31,7 +31,7 @@ foo2:
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 // CHECK-NEXT: ),
 
-// CHECK:       # Symbol 0x00000001
+// CHECK:       # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -41,7 +41,7 @@ foo2:
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 
-// CHECK:      # Symbol 0x00000006
+// CHECK:      # Symbol 6
 // CHECK-NEXT: (('st_name', 0x0000000e) # 'bar2'
 // CHECK-NEXT:  ('st_bind', 0x00000002)
 // CHECK-NEXT:  ('st_type', 0x00000000)
diff --git a/test/MC/ELF/alias.s b/test/MC/ELF/alias.s
index 42d54bc431d..4afc2a324fb 100644
--- a/test/MC/ELF/alias.s
+++ b/test/MC/ELF/alias.s
@@ -16,7 +16,7 @@ foo4:
 bar4 = foo4
 
         .long foo2
-// CHECK:       # Symbol 0x00000001
+// CHECK:       # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -25,7 +25,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000002
+// CHECK-NEXT:  # Symbol 2
 // CHECK-NEXT: (('st_name', 0x0000001d) # 'bar4'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000002)
@@ -34,7 +34,7 @@ bar4 = foo4
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT:  # Symbol 0x00000003
+// CHECK-NEXT:  # Symbol 3
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -43,7 +43,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT:  # Symbol 0x00000004
+// CHECK-NEXT:  # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x0000000e) # 'foo3'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -52,7 +52,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000005
+// CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000018) # 'foo4'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000002)
@@ -61,13 +61,13 @@ bar4 = foo4
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000006
+// CHECK-NEXT: # Symbol 6
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000007
+// CHECK:       # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000008
+// CHECK:       # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000009
+// CHECK:       # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x00000013) # 'bar3'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -75,7 +75,7 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
-// CHECK:       # Symbol 0x0000000a
+// CHECK:       # Symbol 10
 // CHECK-NEXT:  (('st_name', 0x00000009) # 'bar2'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index bfdfd493134..1fe84b4697e 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -42,7 +42,7 @@
 
 // Test that g1 and g2 are local, but g3 is an undefined global.
 
-// CHECK:      # Symbol 0x00000001
+// CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000001) # 'g1'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -51,7 +51,7 @@
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000002
+// CHECK-NEXT: # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000004) # 'g2'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -61,7 +61,7 @@
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
-// CHECK:      # Symbol 0x0000000d
+// CHECK:      # Symbol 13
 // CHECK-NEXT: (('st_name', 0x00000007) # 'g3'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
diff --git a/test/MC/ELF/common.s b/test/MC/ELF/common.s
index 70e2ed2a95a..6d9c4f79157 100644
--- a/test/MC/ELF/common.s
+++ b/test/MC/ELF/common.s
@@ -33,7 +33,7 @@
         .local	common6
         .comm	common6,8,16
 
-// CHECK:      # Symbol 0x00000003
+// CHECK:      # Symbol 3
 // CHECK-NEXT: (('st_name', 0x00000011) # 'common6'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000001)
@@ -77,7 +77,7 @@ foo:
 
         .comm	common5,4,4
 
-// CHECK:      # Symbol 0x00000009
+// CHECK:      # Symbol 9
 // CHECK-NEXT: (('st_name', 0x0000002d) # 'common5'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000001)
diff --git a/test/MC/ELF/file.s b/test/MC/ELF/file.s
index d8ccbe6e5ae..7a5ce64da34 100644
--- a/test/MC/ELF/file.s
+++ b/test/MC/ELF/file.s
@@ -4,7 +4,7 @@
 
 .file "foo"
 foa:
-// CHECK:    # Symbol 0x00000001
+// CHECK:    # Symbol 1
 // CHECK-NEXT:    (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:     ('st_bind', 0x00000000)
 // CHECK-NEXT:     ('st_type', 0x00000004)
@@ -13,7 +13,7 @@ foa:
 // CHECK-NEXT:     ('st_value', 0x0000000000000000)
 // CHECK-NEXT:     ('st_size', 0x0000000000000000)
 // CHECK-NEXT:    ),
-// CHECK-NEXT:    # Symbol 0x00000002
+// CHECK-NEXT:    # Symbol 2
 // CHECK-NEXT:    (('st_name', 0x00000005) # 'foa'
 // CHECK-NEXT:     ('st_bind', 0x00000000)
 // CHECK-NEXT:     ('st_type', 0x00000000)
diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s
index 06c806edbe9..000e1e7876f 100644
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -21,7 +21,7 @@ foo:
 // CHECK-NEXT:  ])
 
 // Symbol number 2 is section number 1
-// CHECK:    # Symbol 0x00000002
+// CHECK:    # Symbol 2
 // CHECK-NEXT:    (('st_name', 0x00000000) # ''
 // CHECK-NEXT:     ('st_bind', 0x00000000)
 // CHECK-NEXT:     ('st_type', 0x00000003)
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index 0f615e998f1..7ab0d10d124 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -77,15 +77,15 @@ foo:
 // CHECK-NEXT:  (('sh_name', 0x00000035) # '.sec1'
 
 // Symbol number 1 is .Lfoo
-// CHECK:      # Symbol 0x00000001
+// CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000001) # '.Lfoo'
 
 // Symbol number 2 is foo
-// CHECK:      # Symbol 0x00000002
+// CHECK:      # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000007) # 'foo'
 
 // Symbol number 6 is section 5
-// CHECK:        # Symbol 0x00000006
+// CHECK:        # Symbol 6
 // CHECK-NEXT:    (('st_name', 0x00000000) # ''
 // CHECK-NEXT:     ('st_bind', 0x00000000)
 // CHECK-NEXT:     ('st_type', 0x00000003)
@@ -93,5 +93,5 @@ foo:
 // CHECK-NEXT:     ('st_shndx', 0x00000005)
 
 // Symbol number 8 is zed
-// CHECK:        # Symbol 0x00000008
+// CHECK:        # Symbol 8
 // CHECK-NEXT:    (('st_name', 0x0000000b) # 'zed'
diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s
index 281f8265ef6..566a3c2a2fa 100644
--- a/test/MC/ELF/noexec.s
+++ b/test/MC/ELF/noexec.s
@@ -13,7 +13,7 @@
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:  ),
 
-// CHECK:       # Symbol 0x00000004
+// CHECK:       # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000003)
diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index cbd3bccc408..1e04d375c25 100644
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -9,7 +9,7 @@
 // CHECK-NEXT:    ),
 // CHECK-NEXT:   ])
 
-// CHECK:         # Symbol 0x00000005
+// CHECK:         # Symbol 5
 // CHECK-NEXT:    (('st_name', 0x00000005) # 'baz'
 // CHECK-NEXT:     ('st_bind', 0x00000001)
 // CHECK-NEXT:     ('st_type', 0x00000000)
diff --git a/test/MC/ELF/pr9292.s b/test/MC/ELF/pr9292.s
index a198fed8794..69f442f26df 100644
--- a/test/MC/ELF/pr9292.s
+++ b/test/MC/ELF/pr9292.s
@@ -15,7 +15,7 @@ mov %eax,bar
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000005
+// CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
diff --git a/test/MC/ELF/relax.s b/test/MC/ELF/relax.s
index 2c0e285db59..f86dc5c0643 100644
--- a/test/MC/ELF/relax.s
+++ b/test/MC/ELF/relax.s
@@ -23,5 +23,5 @@ foo:
 // CHECK-NEXT: ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ('_section_data', 'ebfeebfc ebfa')
 
-// CHECK:       # Symbol 0x00000006
+// CHECK:       # Symbol 6
 // CHECK-NEXT: (('st_name', 0x00000005) # 'foo'
diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index 92b95aee9b3..cb8660dd866 100644
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -165,11 +165,11 @@
 // CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x0000000b) # '.bss'
 
-// CHECK:      # Symbol 0x00000001
+// CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000005) # '.Lfoo'
 
 // Symbol 4 is zed
-// CHECK:      # Symbol 0x00000004
+// CHECK:      # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000035) # 'zed'
 // CHECK-NEXT:  ('st_value', 0x00000000)
 // CHECK-NEXT:  ('st_size', 0x00000000)
@@ -179,7 +179,7 @@
 // CHECK-NEXT:  ('st_shndx', 0x00000005)
 
 // Symbol 7 is section 4
-// CHECK:      # Symbol 0x00000007
+// CHECK:      # Symbol 7
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_value', 0x00000000)
 // CHECK-NEXT:  ('st_size', 0x00000000)
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index 222336aad29..163222263e9 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -113,7 +113,7 @@ bar:
 // CHECK-NEXT:  ('r_type', 0x0000000b)
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 
-// CHECK:   # Symbol 0x00000002
+// CHECK:   # Symbol 2
 // CHECK: (('st_name', 0x00000000) # ''
 // CHECK:  ('st_bind', 0x00000000)
 // CHECK:  ('st_type', 0x00000003)
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index c07aa9c80e2..05e28b6cf8f 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -36,7 +36,7 @@ defined3:
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 
 // Symbol 2 is section 1
-// CHECK:      # Symbol 0x00000002
+// CHECK:      # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000003)
diff --git a/test/MC/ELF/symref.s b/test/MC/ELF/symref.s
index 341c2680c86..698e92df875 100644
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -54,7 +54,7 @@ global1:
 // CHECK-NEXT: ),
 // CHECK-NEXT:])
 
-// CHECK:      # Symbol 0x00000001
+// CHECK:      # Symbol 1
 // CHECK-NEXT: (('st_name', 0x00000013) # 'bar1@zed'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -63,7 +63,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000002
+// CHECK-NEXT: # Symbol 2
 // CHECK-NEXT: (('st_name', 0x00000025) # 'bar3@@zed'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -72,7 +72,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000003
+// CHECK-NEXT: # Symbol 3
 // CHECK-NEXT: (('st_name', 0x0000002f) # 'bar5@@zed'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -81,7 +81,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000004
+// CHECK-NEXT: # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000001) # 'defined1'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -90,7 +90,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000005
+// CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x0000000a) # 'defined2'
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -99,7 +99,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000006
+// CHECK-NEXT: # Symbol 6
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000003)
@@ -108,7 +108,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000007
+// CHECK-NEXT: # Symbol 7
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000003)
@@ -117,7 +117,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000008
+// CHECK-NEXT: # Symbol 8
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
 // CHECK-NEXT:  ('st_bind', 0x00000000)
 // CHECK-NEXT:  ('st_type', 0x00000003)
@@ -126,7 +126,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000009
+// CHECK-NEXT: # Symbol 9
 // CHECK-NEXT: (('st_name', 0x0000004a) # 'g1@@zed'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -135,7 +135,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000014)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x0000000a
+// CHECK-NEXT: # Symbol 10
 // CHECK-NEXT: (('st_name', 0x00000042) # 'global1'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -144,7 +144,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000014)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x0000000b
+// CHECK-NEXT: # Symbol 11
 // CHECK-NEXT: (('st_name', 0x0000001c) # 'bar2@zed'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -153,7 +153,7 @@ global1:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x0000000c
+// CHECK-NEXT: # Symbol 12
 // CHECK-NEXT: (('st_name', 0x00000039) # 'bar6@zed'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
diff --git a/test/MC/ELF/tls-i386.s b/test/MC/ELF/tls-i386.s
index c754121cd69..3adfefc0153 100644
--- a/test/MC/ELF/tls-i386.s
+++ b/test/MC/ELF/tls-i386.s
@@ -18,7 +18,7 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000006
+// CHECK-NEXT:  # Symbol 6
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'foo2'
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
@@ -27,7 +27,7 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000007
+// CHECK-NEXT:  # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'foo3'
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
@@ -36,7 +36,7 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000008
+// CHECK-NEXT:  # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000010) # 'foo4'
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
@@ -45,7 +45,7 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000009
+// CHECK-NEXT:  # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x00000015) # 'foo5'
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
@@ -54,7 +54,7 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000a
+// CHECK-NEXT:  # Symbol 10
 // CHECK-NEXT:  (('st_name', 0x0000001a) # 'foo6'
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
@@ -63,7 +63,7 @@
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000b
+// CHECK-NEXT:  # Symbol 11
 // CHECK-NEXT:  (('st_name', 0x0000001f) # 'foo7'
 // CHECK-NEXT:   ('st_value', 0x00000000)
 // CHECK-NEXT:   ('st_size', 0x00000000)
diff --git a/test/MC/ELF/tls.s b/test/MC/ELF/tls.s
index f9d6425f10e..9acaa338466 100644
--- a/test/MC/ELF/tls.s
+++ b/test/MC/ELF/tls.s
@@ -19,7 +19,7 @@ foobar:
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
-// CHECK:       # Symbol 0x00000007
+// CHECK:       # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'foo1'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000006)
@@ -28,7 +28,7 @@ foobar:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000008
+// CHECK-NEXT:  # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'foo2'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000006)
@@ -37,7 +37,7 @@ foobar:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000009
+// CHECK-NEXT:  # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'foo3'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000006)
diff --git a/test/MC/ELF/type.s b/test/MC/ELF/type.s
index 4b98c02e97d..66361d57528 100644
--- a/test/MC/ELF/type.s
+++ b/test/MC/ELF/type.s
@@ -12,7 +12,7 @@ bar:
 // Test that gnu_unique_object is accepted.
         .type zed,@gnu_unique_object
 
-// CHECK:      # Symbol 0x00000004
+// CHECK:      # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000005) # 'bar'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000001)
@@ -21,7 +21,7 @@ bar:
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000005
+// CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000002)
diff --git a/test/MC/ELF/undef.s b/test/MC/ELF/undef.s
index fc3a2d23be3..bf071c030ae 100644
--- a/test/MC/ELF/undef.s
+++ b/test/MC/ELF/undef.s
@@ -20,21 +20,21 @@
         movsd   .Lsym8(%rip), %xmm1
 
 // CHECK:      ('_symbols', [
-// CHECK-NEXT:  # Symbol 0x00000000
+// CHECK-NEXT:  # Symbol 0
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000001
+// CHECK:       # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x0000000d) # '.Lsym8'
-// CHECK:       # Symbol 0x00000002
+// CHECK:       # Symbol 2
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000003
+// CHECK:       # Symbol 3
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000004
+// CHECK:       # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000005
+// CHECK:       # Symbol 5
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
-// CHECK:       # Symbol 0x00000006
+// CHECK:       # Symbol 6
 // CHECK-NEXT:  (('st_name', 0x00000001) # '.Lsym1'
-// CHECK:       # Symbol 0x00000007
+// CHECK:       # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000008) # 'sym6'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000001)
diff --git a/test/MC/ELF/weak.s b/test/MC/ELF/weak.s
index 67e9b188eb0..0e544fc24fa 100644
--- a/test/MC/ELF/weak.s
+++ b/test/MC/ELF/weak.s
@@ -9,7 +9,7 @@
         .weak bar
 bar:
 
-//CHECK:        # Symbol 0x00000004
+//CHECK:        # Symbol 4
 //CHECK-NEXT:   (('st_name', 0x00000005) # 'bar'
 //CHECK-NEXT:    ('st_bind', 0x00000002)
 //CHECK-NEXT:    ('st_type', 0x00000000)
@@ -18,7 +18,7 @@ bar:
 //CHECK-NEXT:    ('st_value', 0x0000000000000004)
 //CHECK-NEXT:    ('st_size', 0x0000000000000000)
 //CHECK-NEXT:   ),
-//CHECK-NEXT:   # Symbol 0x00000005
+//CHECK-NEXT:   # Symbol 5
 //CHECK:       (('st_name', 0x00000001) # 'foo'
 //CHECK-NEXT:   ('st_bind', 0x00000002)
 //CHECK-NEXT:   ('st_type', 0x00000000)
diff --git a/test/MC/ELF/weakref-plt.s b/test/MC/ELF/weakref-plt.s
index 26ba3f6df54..27ab65015eb 100644
--- a/test/MC/ELF/weakref-plt.s
+++ b/test/MC/ELF/weakref-plt.s
@@ -3,6 +3,6 @@
 	.weakref	bar,foo
 	call	bar@PLT
 
-// CHECK:      # Symbol 0x00000005
+// CHECK:      # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x00000002)
diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s
index 273d27ed4f8..bed80d27b5e 100644
--- a/test/MC/ELF/weakref-reloc.s
+++ b/test/MC/ELF/weakref-reloc.s
@@ -20,7 +20,7 @@
 // CHECK-NEXT:  ('r_addend', 0xfffffffffffffffc)
 // CHECK-NEXT: ),
 
-// CHECK:      # Symbol 0x00000004
+// CHECK:      # Symbol 4
 // CHECK-NEXT: (('st_name', 0x00000009) # '_GLOBAL_OFFSET_TABLE_'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -29,7 +29,7 @@
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000005
+// CHECK-NEXT: # Symbol 5
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
 // CHECK-NEXT:  ('st_bind', 0x00000002)
 // CHECK-NEXT:  ('st_type', 0x00000000)
@@ -38,7 +38,7 @@
 // CHECK-NEXT:  ('st_value', 0x0000000000000000)
 // CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Symbol 0x00000006
+// CHECK-NEXT: # Symbol 6
 // CHECK-NEXT: (('st_name', 0x00000005) # 'zed'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
 // CHECK-NEXT:  ('st_type', 0x00000000)
diff --git a/test/MC/ELF/weakref.s b/test/MC/ELF/weakref.s
index 9100073551a..ac1a6c5f168 100644
--- a/test/MC/ELF/weakref.s
+++ b/test/MC/ELF/weakref.s
@@ -69,7 +69,7 @@ bar15:
         .long bar15
         .long foo15
 
-// CHECK:       # Symbol 0x00000000
+// CHECK:       # Symbol 0
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -78,7 +78,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000001
+// CHECK-NEXT:  # Symbol 1
 // CHECK-NEXT:  (('st_name', 0x00000015) # 'bar6'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -87,7 +87,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000018)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000002
+// CHECK-NEXT:  # Symbol 2
 // CHECK-NEXT:  (('st_name', 0x0000001a) # 'bar7'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -96,7 +96,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000018)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000003
+// CHECK-NEXT:  # Symbol 3
 // CHECK-NEXT:  (('st_name', 0x0000001f) # 'bar8'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -105,7 +105,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x000000000000001c)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000004
+// CHECK-NEXT:  # Symbol 4
 // CHECK-NEXT:  (('st_name', 0x00000024) # 'bar9'
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -114,7 +114,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000020)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000005
+// CHECK-NEXT:  # Symbol 5
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000003)
@@ -123,7 +123,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000006
+// CHECK-NEXT:  # Symbol 6
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000003)
@@ -132,7 +132,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000007
+// CHECK-NEXT:  # Symbol 7
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
 // CHECK-NEXT:   ('st_bind', 0x00000000)
 // CHECK-NEXT:   ('st_type', 0x00000003)
@@ -141,7 +141,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000008
+// CHECK-NEXT:  # Symbol 8
 // CHECK-NEXT:  (('st_name', 0x00000029) # 'bar10'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -150,7 +150,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000028)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000009
+// CHECK-NEXT:  # Symbol 9
 // CHECK-NEXT:  (('st_name', 0x0000002f) # 'bar11'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -159,7 +159,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000030)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000a
+// CHECK-NEXT:  # Symbol 10
 // CHECK-NEXT:  (('st_name', 0x00000035) # 'bar12'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -168,7 +168,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000030)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000b
+// CHECK-NEXT:  # Symbol 11
 // CHECK-NEXT:  (('st_name', 0x0000003b) # 'bar13'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -177,7 +177,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000034)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000c
+// CHECK-NEXT:  # Symbol 12
 // CHECK-NEXT:  (('st_name', 0x00000041) # 'bar14'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -186,7 +186,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000038)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000d
+// CHECK-NEXT:  # Symbol 13
 // CHECK-NEXT:  (('st_name', 0x00000047) # 'bar15'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -195,7 +195,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000040)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000e
+// CHECK-NEXT:  # Symbol 14
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'bar2'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -204,7 +204,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x0000000f
+// CHECK-NEXT:  # Symbol 15
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'bar3'
 // CHECK-NEXT:   ('st_bind', 0x00000002)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -213,7 +213,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000010
+// CHECK-NEXT:  # Symbol 16
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'bar4'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
@@ -222,7 +222,7 @@ bar15:
 // CHECK-NEXT:   ('st_value', 0x0000000000000000)
 // CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Symbol 0x00000011
+// CHECK-NEXT:  # Symbol 17
 // CHECK-NEXT:  (('st_name', 0x00000010) # 'bar5'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index d3fad347728..f116e3a0aa0 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -97,7 +97,7 @@ def dumpSymtab(f, section, strtab):
 
     for index in range(entries):
         f.seek(section.sh_offset + index * section.sh_entsize)
-        print "    # Symbol %s" % common_dump.HexDump(index)
+        print "    # Symbol %s" % index
         name = f.read32()
         print "    (('st_name', %s)" % common_dump.HexDump(name), "# %r" % strtab[name]
         if not f.is64Bit:
-- 
2.34.1