Don't print a counter in hex.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136869 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 69d4a14822991cc8f58f3b91527b055b3ef906e8..bf555fcb196487935ef36e05c18bab1e1459ac27 100644 (file)
--- 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 e576278c3dcf9e2b2ff274c0dcd8a7a09f28ac93..3ccf02b95e2c97bab2b4cf9fd349835b854520d6 100644 (file)
--- 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 c1e7086b8e60ca87c990caadf241c543ecfc79d1..ff183298cc70b13ede14f607c62f9a79534a2f00 100644 (file)
--- 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 d9000e60b432a06769f972a56b6dfc43a8086b2a..8e15651660849874b9bc3f76e691f9924c6b820f 100644 (file)
--- 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 33e0a59cc7c2d7655047388858aa8a2c3a674ea5..d71e12a7af2a9049123ecf58b20788ebd4ecc0fe 100644 (file)
--- 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 b470eda8105391329d6b0030892b3b6d1d5a317e..f8cd96a57d6790c9373d2628dbd3a7d9205b7da4 100644 (file)
--- 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 89db1b62815a046a474bc1c79b1ad351b4c3f411..8a8fff659509a11a89f7a01cc13f2961efd9d686 100644 (file)
--- 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 80c46d61ffa912986f7efa752b4363da2c6cc457..4dd25bec7b65469e33e9fb8a9aee79ee61350c65 100644 (file)
--- 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 930579ba5f21184794240f3d2f69868f6ea01ece..817f58567be2dedffbc1a19b8254afd38c4ccfa3 100644 (file)
--- 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 1636e4839cd336c054da1d6e368b5bbe27afc188..080ac8f30eb14a5366cf7904c425933976ab095e 100644 (file)
--- 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 be7128baf4e60903b9e78c55e65b4357e53129e6..bfdfd49313436a12f4398dd516308d2942bac553 100644 (file)
--- 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 68e36a55c715a96ef0c4665e7edaa88622cdf527..675765547c1e1f3c30445055451bd0d79de10402 100644 (file)
--- 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 1b135a677ddc024e85ca1668dfef53328110b1cf..d840e5ee1a5b8ed3a4e9355a94f459aaedc4a71a 100644 (file)
--- 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 415eaefe46606466b9483ce4be165437715c61c5..6b6a7d792a295e75de170b412caf451ec79bdc85 100644 (file)
--- 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 8384e0e6cb771f9d0786b593126cbe4ffe6981a7..c1c9e52cb3e4515afb6158d2f364b60a776af295 100644 (file)
--- 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 c3129c5aee24d9f6da857b7cb0daca86e8bb4a16..e6f5d745aa72e7f8c2c0f917cfa086119143dd16 100644 (file)
--- 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 59d67bfa71f5cb2ffa4d473e96ddd037140a886d..ec5816ddcd9e05c300a555578a7d69ab891c0c1e 100644 (file)
--- 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 c4b7d9851b9306b158390872fbe5ab2ec10225ad..281f8265ef6900f25ebd36658e50e265c234345e 100644 (file)
--- 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 25f3450d44d9a2fcdab1cc60baba1a9e0def5bf6..af23ae6f2ea9afa4c17c18bbec30f4a0cc6eef83 100644 (file)
--- 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 848d3ba81ab95e0a11e6f84a1b28b620e01d5398..b3e87f706f339809f81e31536d80217e6fa9ef36 100644 (file)
--- 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 173f22c04b2579e84727f385a75040df758f9ae5..3bc134b1f37196a1e5eb56e6c9ea198d40490f51 100644 (file)
--- 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 f8a7d5f1cd57b2676c3e18a86cd4fe7cac4736b2..2bfece0eef2940939eea3f17e616dcd218a4a66e 100644 (file)
--- 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 5fb5525cba64f0cf6d0261b05ae55bd6e576c238..f39da2968122121c9a9580a2b4a4b178444a49eb 100644 (file)
--- 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 003a4ef79a5bad1314b7de64429f404fd1166aad..9794bfd9d8dc93b6d667249a400e19677a4c4660 100755 (executable)
--- 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 "])"