Don't print a counter in hex.

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

24 files changed, 38 insertions, 38 deletions

diff --git a/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll b/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
index 69d4a14..bf555fc 100644
--- a/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
+++ b/test/CodeGen/ARM/2010-12-15-elf-lcomm.ll
@@ -15,7 +15,7 @@
 
 
 
-; OBJ:          Section 0x00000004
+; OBJ:          Section 4
 ; OBJ-NEXT:     '.bss'
 
 ; OBJ:          'array00'
diff --git a/test/MC/ARM/xscale-attributes.ll b/test/MC/ARM/xscale-attributes.ll
index e576278..3ccf02b 100644
--- a/test/MC/ARM/xscale-attributes.ll
+++ b/test/MC/ARM/xscale-attributes.ll
@@ -17,7 +17,7 @@ entry:
 ; ASM-NEXT:      .eabi_attribute 8, 1
 ; ASM-NEXT:      .eabi_attribute 9, 1
 
-; OBJ:           Section 0x00000004
+; OBJ:           Section 4
 ; OBJ-NEXT:      'sh_name', 0x0000000c
 ; OBJ-NEXT:      'sh_type', 0x70000003
 ; OBJ-NEXT:	   'sh_flags', 0x00000000
diff --git a/test/MC/ELF/align.s b/test/MC/ELF/align.s
index c1e7086..ff18329 100644
--- a/test/MC/ELF/align.s
+++ b/test/MC/ELF/align.s
@@ -7,7 +7,7 @@
 	.section	.rodata,"a",@progbits
 	.align	8
 
-// CHECK: # Section 0x00000003
+// CHECK: # Section 3
 // CHECK-NEXT:  (('sh_name', 0x00000007) # '.bss'
 // CHECK-NEXT:   ('sh_type', 0x00000008)
 // CHECK-NEXT:   ('sh_flags', 0x00000003)
@@ -19,7 +19,7 @@
 // CHECK-NEXT:   ('sh_addralign', 0x00000004)
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000004
+// CHECK-NEXT:  # Section 4
 // CHECK-NEXT:  (('sh_name', 0x00000026) # '.rodata'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
diff --git a/test/MC/ELF/cfi-adjust-cfa-offset.s b/test/MC/ELF/cfi-adjust-cfa-offset.s
index d9000e6..8e15651 100644
--- a/test/MC/ELF/cfi-adjust-cfa-offset.s
+++ b/test/MC/ELF/cfi-adjust-cfa-offset.s
@@ -11,7 +11,7 @@ f:
 	ret
 	.cfi_endproc
 
-// CHECK:       # Section 0x00000004
+// CHECK:       # Section 4
 // CHECK-NEXT:  (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
@@ -24,7 +24,7 @@ f:
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:   ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 1c000000 1c000000 00000000 0a000000 00440e10 410e1444 0e080000 00000000')
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000005
+// CHECK-NEXT:  # Section 5
 // CHECK-NEXT:  (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000004)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/cfi-def-cfa-offset.s b/test/MC/ELF/cfi-def-cfa-offset.s
index 33e0a59..d71e12a 100644
--- a/test/MC/ELF/cfi-def-cfa-offset.s
+++ b/test/MC/ELF/cfi-def-cfa-offset.s
@@ -10,7 +10,7 @@ f:
 	ret
 	.cfi_endproc
 
-// CHECK:      # Section 0x00000004
+// CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
@@ -24,7 +24,7 @@ f:
 // CHECK-NEXT:  ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 0a000000 00440e10 450e0800')
 // CHECK-NEXT: ),
 
-// CHECK:       # Section 0x00000005
+// CHECK:       # Section 5
 // CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000004)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/cfi-rel-offset.s b/test/MC/ELF/cfi-rel-offset.s
index b470eda..f8cd96a 100644
--- a/test/MC/ELF/cfi-rel-offset.s
+++ b/test/MC/ELF/cfi-rel-offset.s
@@ -14,7 +14,7 @@ f:
         .cfi_rel_offset 6,0
 	.cfi_endproc
 
-// CHECK:       # Section 0x00000004
+// CHECK:       # Section 4
 // CHECK-NEXT:  (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
@@ -27,7 +27,7 @@ f:
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:   ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 24000000 1c000000 00000000 05000000 00410e08 410d0641 11067f41 0e104186 02000000 00000000')
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000005
+// CHECK-NEXT:  # Section 5
 // CHECK-NEXT:  (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000004)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/cfi-rel-offset2.s b/test/MC/ELF/cfi-rel-offset2.s
index 89db1b6..8a8fff6 100644
--- a/test/MC/ELF/cfi-rel-offset2.s
+++ b/test/MC/ELF/cfi-rel-offset2.s
@@ -6,7 +6,7 @@ f:
         .cfi_rel_offset 6,16
 	.cfi_endproc
 
-// CHECK:       # Section 0x00000004
+// CHECK:       # Section 4
 // CHECK-NEXT:  (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
@@ -19,7 +19,7 @@ f:
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:   ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 01000000 00411106 7f000000')
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000005
+// CHECK-NEXT:  # Section 5
 // CHECK-NEXT:  (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000004)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/cfi-remember.s b/test/MC/ELF/cfi-remember.s
index 80c46d6..4dd25be 100644
--- a/test/MC/ELF/cfi-remember.s
+++ b/test/MC/ELF/cfi-remember.s
@@ -9,7 +9,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:      # Section 0x00000004
+// CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
@@ -23,7 +23,7 @@ f:
 // CHECK-NEXT:  ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 03000000 00410a41 0b000000')
 // CHECK-NEXT: ),
 
-// CHECK:      # Section 0x00000005
+// CHECK:      # Section 5
 // CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000004)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/cfi-same-value.s b/test/MC/ELF/cfi-same-value.s
index 930579b..817f585 100644
--- a/test/MC/ELF/cfi-same-value.s
+++ b/test/MC/ELF/cfi-same-value.s
@@ -7,7 +7,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:       # Section 0x00000004
+// CHECK:       # Section 4
 // CHECK-NEXT:  (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
@@ -20,7 +20,7 @@ f:
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:   ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 02000000 00410806 00000000')
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000005
+// CHECK-NEXT:  # Section 5
 // CHECK-NEXT:  (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x00000004)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/cfi.s b/test/MC/ELF/cfi.s
index 1636e48..080ac8f 100644
--- a/test/MC/ELF/cfi.s
+++ b/test/MC/ELF/cfi.s
@@ -212,7 +212,7 @@ f36:
         nop
         .cfi_endproc
 
-// CHECK:      # Section 0x00000004
+// CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
@@ -226,7 +226,7 @@ f36:
 // CHECK-NEXT:  ('_section_data', '14000000 00000000 017a4c52 00017810 02031b0c 07089001 14000000 1c000000 00000000 01000000 04000000 00000000 20000000 00000000 017a504c 52000178 100b0000 00000000 00000003 1b0c0708 90010000 14000000 28000000 00000000 01000000 04000000 00000000 14000000 70000000 00000000 01000000 04000000 00000000 20000000 00000000 017a504c 52000178 100b0000 00000000 00000002 1b0c0708 90010000 10000000 28000000 00000000 01000000 02000000 18000000 00000000 017a5052 00017810 04020000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 06030000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a040000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 040a0000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 060b0000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a0c0000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a080000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a100000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 04120000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 06130000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a140000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 041a0000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 061b0000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a1c0000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a180000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a800000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 04820000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 06830000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a840000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 048a0000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 068b0000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a8c0000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a880000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a900000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 04920000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 06930000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a940000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 049a0000 1b0c0708 90010000 10000000 20000000 00000000 01000000 00000000 18000000 00000000 017a5052 00017810 069b0000 00001b0c 07089001 10000000 20000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a9c0000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000 1c000000 00000000 017a5052 00017810 0a980000 00000000 00001b0c 07089001 10000000 24000000 00000000 01000000 00000000')
 // CHECK-NEXT: ),
 
-// CHECK:        # Section 0x00000005
+// CHECK:        # Section 5
 // CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000004)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index be7128b..bfdfd49 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -3,7 +3,7 @@
 // Test that we produce the group sections and that they are a the beginning
 // of the file.
 
-// CHECK:       # Section 0x00000001
+// CHECK:       # Section 1
 // CHECK-NEXT:  (('sh_name', 0x0000001b) # '.group'
 // CHECK-NEXT:   ('sh_type', 0x00000011)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
@@ -15,7 +15,7 @@
 // CHECK-NEXT:   ('sh_addralign', 0x00000004)
 // CHECK-NEXT:   ('sh_entsize', 0x00000004)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000002
+// CHECK-NEXT:  # Section 2
 // CHECK-NEXT:  (('sh_name', 0x0000001b) # '.group'
 // CHECK-NEXT:   ('sh_type', 0x00000011)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
@@ -27,7 +27,7 @@
 // CHECK-NEXT:   ('sh_addralign', 0x00000004)
 // CHECK-NEXT:   ('sh_entsize', 0x00000004)
 // CHECK-NEXT:  ),
-// CHECK-NEXT:  # Section 0x00000003
+// CHECK-NEXT:  # Section 3
 // CHECK-NEXT:  (('sh_name', 0x0000001b) # '.group'
 // CHECK-NEXT:   ('sh_type', 0x00000011)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/debug-loc.s b/test/MC/ELF/debug-loc.s
index 68e36a5..6757655 100644
--- a/test/MC/ELF/debug-loc.s
+++ b/test/MC/ELF/debug-loc.s
@@ -7,7 +7,7 @@
 // FIXME: This size is the same as gnu as, but we can probably do a bit better.
 // FIXME2: We need a debug_line dumper so that we can test the actual contents.
 
-// CHECK:      # Section 0x00000004
+// CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x00000011) # '.debug_line'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/empty-dwarf-lines.s b/test/MC/ELF/empty-dwarf-lines.s
index 1b135a6..d840e5e 100644
--- a/test/MC/ELF/empty-dwarf-lines.s
+++ b/test/MC/ELF/empty-dwarf-lines.s
@@ -7,7 +7,7 @@
 c:
         .asciz   "hi\n"
 
-// CHECK:      # Section 0x00000004
+// CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x0000000c) # '.debug_line'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/entsize.s b/test/MC/ELF/entsize.s
index 415eaef..6b6a7d7 100644
--- a/test/MC/ELF/entsize.s
+++ b/test/MC/ELF/entsize.s
@@ -32,7 +32,7 @@
     .quad 42
     .quad 42
 
-// CHECK: # Section 0x00000004
+// CHECK: # Section 4
 // CHECK-NEXT:   ('sh_name', 0x00000048) # '.rodata.str1.1'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000032)
@@ -44,7 +44,7 @@
 // CHECK-NEXT:   ('sh_addralign', 0x00000001)
 // CHECK-NEXT:   ('sh_entsize', 0x00000001)
 
-// CHECK: # Section 0x00000005
+// CHECK: # Section 5
 // CHECK-NEXT:   ('sh_name', 0x00000039) # '.rodata.str2.1'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000032)
@@ -56,7 +56,7 @@
 // CHECK-NEXT:   ('sh_addralign', 0x00000001)
 // CHECK-NEXT:   ('sh_entsize', 0x00000002)
 
-// CHECK: # Section 0x00000006
+// CHECK: # Section 6
 // CHECK-NEXT:   ('sh_name', 0x0000002c) # '.rodata.cst8
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000012)
diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s
index 8384e0e..c1c9e52 100644
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -7,7 +7,7 @@
 foo:
 
 // Section number 1 is .text
-// CHECK:        # Section 0x00000001
+// CHECK:        # Section 1
 // CHECK-next:  (('sh_name', 0x00000001) # '.text'
 
 // Relocation refers to symbol number 2
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index c3129c5..e6f5d74 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -73,7 +73,7 @@ foo:
 // CHECK-NEXT:  ])
 
 // Section 5 is "sec1"
-// CHECK: # Section 0x00000005
+// CHECK: # Section 5
 // CHECK-NEXT:  (('sh_name', 0x00000035) # '.sec1'
 
 // Symbol number 1 is .Lfoo
diff --git a/test/MC/ELF/n_bytes.s b/test/MC/ELF/n_bytes.s
index 59d67bf..ec5816d 100644
--- a/test/MC/ELF/n_bytes.s
+++ b/test/MC/ELF/n_bytes.s
@@ -5,7 +5,7 @@
         .8byte 42, 1, 2, 3
         .int 42, 1, 2, 3
 
-// CHECK:      # Section 0x00000001
+// CHECK:      # Section 1
 // CHECK-NEXT: (('sh_name', 0x00000001) # '.text'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000006)
diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s
index c4b7d98..281f826 100644
--- a/test/MC/ELF/noexec.s
+++ b/test/MC/ELF/noexec.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -mc-no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  | FileCheck  %s
 
-// CHECK:       # Section 0x00000004
+// CHECK:       # Section 4
 // CHECK-NEXT:  (('sh_name', 0x0000000c) # '.note.GNU-stack'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index 25f3450..af23ae6 100644
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -162,7 +162,7 @@
 // CHECK-NEXT: ),
 
 // Section 4 is bss
-// CHECK:      # Section 0x00000004
+// CHECK:      # Section 4
 // CHECK-NEXT: (('sh_name', 0x0000000b) # '.bss'
 
 // CHECK:      # Symbol 0x00000001
diff --git a/test/MC/ELF/relocation-pc.s b/test/MC/ELF/relocation-pc.s
index 848d3ba..b3e87f7 100644
--- a/test/MC/ELF/relocation-pc.s
+++ b/test/MC/ELF/relocation-pc.s
@@ -5,7 +5,7 @@
 	loope	0                 # R_X86_64_PC8
 	jmp	-256              # R_X86_64_PC32
 
-// CHECK:      # Section 0x00000002
+// CHECK:      # Section 2
 // CHECK-NEXT: (('sh_name', 0x00000001) # '.rela.text'
 // CHECK-NEXT:  ('sh_type', 0x00000004)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index 173f22c..3bc134b 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -20,7 +20,7 @@ bar:
         addq	$bar,%rax         # R_X86_64_32S
 
 
-// CHECK:  # Section 0x00000001
+// CHECK:  # Section 1
 // CHECK: (('sh_name', 0x00000006) # '.text'
 
 // CHECK: # Relocation 0x00000000
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index f8a7d5f..2bfece0 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -16,7 +16,7 @@ defined3:
         .global defined1
 
 // Section 1 is .text
-// CHECK:      # Section 0x00000001
+// CHECK:      # Section 1
 // CHECK-NEXT: (('sh_name', 0x00000006) # '.text'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000006)
diff --git a/test/MC/ELF/section.s b/test/MC/ELF/section.s
index 5fb5525..f39da29 100644
--- a/test/MC/ELF/section.s
+++ b/test/MC/ELF/section.s
@@ -30,7 +30,7 @@
 // CHECK-NEXT:  ('sh_addralign', 0x00000001)
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Section 0x0000000b
+// CHECK-NEXT: # Section 11
 // CHECK-NEXT: (('sh_name', 0x00000048) # '.fini'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000006)
@@ -42,7 +42,7 @@
 // CHECK-NEXT:  ('sh_addralign', 0x00000001)
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Section 0x0000000c
+// CHECK-NEXT: # Section 12
 // CHECK-NEXT: (('sh_name', 0x00000076) # '.rodata'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
@@ -54,7 +54,7 @@
 // CHECK-NEXT:  ('sh_addralign', 0x00000001)
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Section 0x0000000d
+// CHECK-NEXT: # Section 13
 // CHECK-NEXT: (('sh_name', 0x00000058) # 'zed'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index 003a4ef..9794bfd 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -205,7 +205,7 @@ def dumpELF(path, opts):
 
     print "('_sections', ["
     for index in range(e_shnum):
-        print "  # Section %s" % common_dump.HexDump(index)
+        print "  # Section %s" % index
         sections[index].dump(shstrtab, f, strtab, opts.dumpSectionData)
     print "])"