Change anther counter to decimal.

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

37 files changed, 167 insertions, 167 deletions

diff --git a/test/CodeGen/ARM/2010-11-30-reloc-movt.ll b/test/CodeGen/ARM/2010-11-30-reloc-movt.ll
index 930cd8d415..8a0220690d 100644
--- a/test/CodeGen/ARM/2010-11-30-reloc-movt.ll
+++ b/test/CodeGen/ARM/2010-11-30-reloc-movt.ll
@@ -21,17 +21,17 @@ entry:
 ; OBJ-NEXT:    'sh_entsize'
 ; OBJ-NEXT:    '_section_data', '00482de9 000000e3 000040e3 feffffeb 0088bde8'
 
-; OBJ:            Relocation 0x00000000
+; OBJ:            Relocation 0
 ; OBJ-NEXT:       'r_offset', 0x00000004
 ; OBJ-NEXT:       'r_sym', 0x00000007
 ; OBJ-NEXT:        'r_type', 0x0000002b
 
-; OBJ:          Relocation 0x00000001
+; OBJ:          Relocation 1
 ; OBJ-NEXT:       'r_offset', 0x00000008
 ; OBJ-NEXT:       'r_sym'
 ; OBJ-NEXT:        'r_type', 0x0000002c
 
-; OBJ:          # Relocation 0x00000002
+; OBJ:          # Relocation 2
 ; OBJ-NEXT:       'r_offset', 0x0000000c
 ; OBJ-NEXT:       'r_sym', 0x00000008
 ; OBJ-NEXT:       'r_type', 0x0000001c
diff --git a/test/MC/ARM/elf-movt.s b/test/MC/ARM/elf-movt.s
index 18061f57f5..5c89ce3c31 100644
--- a/test/MC/ARM/elf-movt.s
+++ b/test/MC/ARM/elf-movt.s
@@ -27,12 +27,12 @@ barf:                                   @ @barf
 @ OBJ-NEXT:            'sh_entsize', 0x00000000
 @ OBJ-NEXT:            '_section_data', 'f00f0fe3 f40f4fe3'
 
-@ OBJ:              Relocation 0x00000000
+@ OBJ:              Relocation 0
 @ OBJ-NEXT:         'r_offset', 0x00000000
 @ OBJ-NEXT:         'r_sym'
 @ OBJ-NEXT:         'r_type', 0x0000002d
 
-@ OBJ:              Relocation 0x00000001
+@ OBJ:              Relocation 1
 @ OBJ-NEXT:         'r_offset', 0x00000004
 @ OBJ-NEXT:         'r_sym'
 @ OBJ-NEXT:         'r_type', 0x0000002e
diff --git a/test/MC/ARM/elf-reloc-01.ll b/test/MC/ARM/elf-reloc-01.ll
index eb6e2436af..4ddc3ca9b0 100644
--- a/test/MC/ARM/elf-reloc-01.ll
+++ b/test/MC/ARM/elf-reloc-01.ll
@@ -60,7 +60,7 @@ bb3:                                              ; preds = %bb, %entry
 
 declare void @exit(i32) noreturn nounwind
 
-;; OBJ:          Relocation 0x00000001
+;; OBJ:          Relocation 1
 ;; OBJ-NEXT:     'r_offset', 
 ;; OBJ-NEXT:     'r_sym', 0x00000002
 ;; OBJ-NEXT:     'r_type', 0x0000002b
diff --git a/test/MC/ARM/elf-reloc-02.ll b/test/MC/ARM/elf-reloc-02.ll
index 091e89f576..7b2d885837 100644
--- a/test/MC/ARM/elf-reloc-02.ll
+++ b/test/MC/ARM/elf-reloc-02.ll
@@ -41,7 +41,7 @@ declare i32 @write(...)
 
 declare void @exit(i32) noreturn nounwind
 
-;; OBJ:        Relocation 0x00000000
+;; OBJ:        Relocation 0
 ;; OBJ-NEXT:    'r_offset', 
 ;; OBJ-NEXT:    'r_sym', 0x00000002
 ;; OBJ-NEXT:    'r_type', 0x0000002b
diff --git a/test/MC/ARM/elf-reloc-03.ll b/test/MC/ARM/elf-reloc-03.ll
index 91dba554ab..d07743e40b 100644
--- a/test/MC/ARM/elf-reloc-03.ll
+++ b/test/MC/ARM/elf-reloc-03.ll
@@ -88,7 +88,7 @@ entry:
 
 declare void @exit(i32) noreturn nounwind
 
-;; OBJ:           Relocation 0x00000001
+;; OBJ:           Relocation 1
 ;; OBJ-NEXT:     'r_offset', 
 ;; OBJ-NEXT:     'r_sym', 0x0000000c
 ;; OBJ-NEXT:     'r_type', 0x0000002b
diff --git a/test/MC/ARM/elf-thumbfunc-reloc.ll b/test/MC/ARM/elf-thumbfunc-reloc.ll
index 6fce40388e..3c7816b887 100644
--- a/test/MC/ARM/elf-thumbfunc-reloc.ll
+++ b/test/MC/ARM/elf-thumbfunc-reloc.ll
@@ -26,7 +26,7 @@ entry:
 
 ;  Offset     Info    Type            Sym.Value  Sym. Name
 ; 00000008  0000070a R_ARM_THM_CALL    00000001   foo
-; CHECK:           Relocation 0x00000000 
+; CHECK:           Relocation 0
 ; CHECK-NEXT:      'r_offset', 0x00000008
 ; CHECK-NEXT:      'r_sym', 0x00000007
 ; CHECK-NEXT:      'r_type', 0x0000000a
diff --git a/test/MC/ELF/alias-reloc.s b/test/MC/ELF/alias-reloc.s
index 25571656d7..18318fac78 100644
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -17,14 +17,14 @@ foo2:
     .set    bar2,foo2
     .quad    bar2
 
-// CHECK:       # Relocation 0x00000000
+// CHECK:       # Relocation 0
 // CHECK-NEXT:  (('r_offset', 0x00000001)
 // CHECK-NEXT:   ('r_sym', 0x00000001)
 // CHECK-NEXT:   ('r_type', 0x00000004)
 // CHECK-NEXT:   ('r_addend', 0xfffffffffffffffc)
 // CHECK-NEXT:  ),
 
-// CHECK:      # Relocation 0x00000001
+// CHECK:      # Relocation 1
 // CHECK-NEXT: (('r_offset', 0x00000005)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x00000001)
diff --git a/test/MC/ELF/basic-elf-32.s b/test/MC/ELF/basic-elf-32.s
index 7c2927ad79..4435a7f786 100644
--- a/test/MC/ELF/basic-elf-32.s
+++ b/test/MC/ELF/basic-elf-32.s
@@ -42,19 +42,19 @@ main:                                   # @main
 // CHECK:   # '.rel.text'
 
 // CHECK:   ('_relocations', [
-// CHECK:     # Relocation 0x00000000
+// CHECK:     # Relocation 0
 // CHECK:     (('r_offset', 0x00000006)
 // CHECK:      ('r_type', 0x00000001)
 // CHECK:     ),
-// CHECK:     # Relocation 0x00000001
+// CHECK:     # Relocation 1
 // CHECK:     (('r_offset', 0x0000000b)
 // CHECK:      ('r_type', 0x00000002)
 // CHECK:     ),
-// CHECK:     # Relocation 0x00000002
+// CHECK:     # Relocation 2
 // CHECK:     (('r_offset', 0x00000012)
 // CHECK:      ('r_type', 0x00000001)
 // CHECK:     ),
-// CHECK:     # Relocation 0x00000003
+// CHECK:     # Relocation 3
 // CHECK:     (('r_offset', 0x00000017)
 // CHECK:      ('r_type', 0x00000002)
 // CHECK:     ),
diff --git a/test/MC/ELF/basic-elf-64.s b/test/MC/ELF/basic-elf-64.s
index 2e183aa35b..c3c6184fb7 100644
--- a/test/MC/ELF/basic-elf-64.s
+++ b/test/MC/ELF/basic-elf-64.s
@@ -42,22 +42,22 @@ main:                                   # @main
 // CHECK:   # '.rela.text'
 
 // CHECK:   ('_relocations', [
-// CHECK:     # Relocation 0x00000000
+// CHECK:     # Relocation 0
 // CHECK:     (('r_offset', 0x00000005)
 // CHECK:      ('r_type', 0x0000000a)
 // CHECK:      ('r_addend', 0x0000000000000000)
 // CHECK:     ),
-// CHECK:     # Relocation 0x00000001
+// CHECK:     # Relocation 1
 // CHECK:     (('r_offset', 0x0000000a)
 // CHECK:      ('r_type', 0x00000002)
 // CHECK:      ('r_addend', 0xfffffffffffffffc)
 // CHECK:     ),
-// CHECK:     # Relocation 0x00000002
+// CHECK:     # Relocation 2
 // CHECK:     (('r_offset', 0x0000000f)
 // CHECK:      ('r_type', 0x0000000a)
 // CHECK:      ('r_addend', 0x0000000000000006)
 // CHECK:     ),
-// CHECK:     # Relocation 0x00000003
+// CHECK:     # Relocation 3
 // CHECK:     (('r_offset', 0x00000014)
 // CHECK:      ('r_type', 0x00000002)
 // CHECK:      ('r_addend', 0xfffffffffffffffc)
diff --git a/test/MC/ELF/call-abs.s b/test/MC/ELF/call-abs.s
index 885c2d19ba..cf7b3cc339 100644
--- a/test/MC/ELF/call-abs.s
+++ b/test/MC/ELF/call-abs.s
@@ -16,7 +16,7 @@ f:                                      # @f
 	.section	.note.GNU-stack,"",@progbits
 
 // CHECK:      ('_relocations', [
-// CHECK-NEXT:  # Relocation 0x00000000
+// CHECK-NEXT:  # Relocation 0
 // CHECK-NEXT:  (('r_offset', 0x00000004)
 // CHECK-NEXT:   ('r_sym', 0x00000000)
 // CHECK-NEXT:   ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-adjust-cfa-offset.s b/test/MC/ELF/cfi-adjust-cfa-offset.s
index 8e15651660..4bc2a888fa 100644
--- a/test/MC/ELF/cfi-adjust-cfa-offset.s
+++ b/test/MC/ELF/cfi-adjust-cfa-offset.s
@@ -36,7 +36,7 @@ f:
 // CHECK-NEXT:   ('sh_addralign', 0x00000008)
 // CHECK-NEXT:   ('sh_entsize', 0x00000018)
 // CHECK-NEXT:   ('_relocations', [
-// CHECK-NEXT:    # Relocation 0x00000000
+// CHECK-NEXT:    # Relocation 0
 // CHECK-NEXT:    (('r_offset', 0x00000020)
 // CHECK-NEXT:     ('r_sym', 0x00000002)
 // CHECK-NEXT:     ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-advance-loc2.s b/test/MC/ELF/cfi-advance-loc2.s
index c4fa6c9f8e..2acfbd475f 100644
--- a/test/MC/ELF/cfi-advance-loc2.s
+++ b/test/MC/ELF/cfi-advance-loc2.s
@@ -35,7 +35,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-def-cfa-offset.s b/test/MC/ELF/cfi-def-cfa-offset.s
index d71e12a7af..29e9a9fadb 100644
--- a/test/MC/ELF/cfi-def-cfa-offset.s
+++ b/test/MC/ELF/cfi-def-cfa-offset.s
@@ -36,7 +36,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-def-cfa-register.s b/test/MC/ELF/cfi-def-cfa-register.s
index 7c6a45e68f..dcf95be8bc 100644
--- a/test/MC/ELF/cfi-def-cfa-register.s
+++ b/test/MC/ELF/cfi-def-cfa-register.s
@@ -31,7 +31,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-def-cfa.s b/test/MC/ELF/cfi-def-cfa.s
index 3bea6ed7da..bc4b5cf8db 100644
--- a/test/MC/ELF/cfi-def-cfa.s
+++ b/test/MC/ELF/cfi-def-cfa.s
@@ -32,7 +32,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-offset.s b/test/MC/ELF/cfi-offset.s
index 0d96f04447..dc966f34e8 100644
--- a/test/MC/ELF/cfi-offset.s
+++ b/test/MC/ELF/cfi-offset.s
@@ -32,7 +32,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-rel-offset.s b/test/MC/ELF/cfi-rel-offset.s
index f8cd96a57d..a22672560e 100644
--- a/test/MC/ELF/cfi-rel-offset.s
+++ b/test/MC/ELF/cfi-rel-offset.s
@@ -39,7 +39,7 @@ f:
 // CHECK-NEXT:   ('sh_addralign', 0x00000008)
 // CHECK-NEXT:   ('sh_entsize', 0x00000018)
 // CHECK-NEXT:   ('_relocations', [
-// CHECK-NEXT:    # Relocation 0x00000000
+// CHECK-NEXT:    # Relocation 0
 // CHECK-NEXT:    (('r_offset', 0x00000020)
 // CHECK-NEXT:     ('r_sym', 0x00000002)
 // CHECK-NEXT:     ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-rel-offset2.s b/test/MC/ELF/cfi-rel-offset2.s
index 8a8fff6595..bb8e4497b2 100644
--- a/test/MC/ELF/cfi-rel-offset2.s
+++ b/test/MC/ELF/cfi-rel-offset2.s
@@ -31,7 +31,7 @@ f:
 // CHECK-NEXT:   ('sh_addralign', 0x00000008)
 // CHECK-NEXT:   ('sh_entsize', 0x00000018)
 // CHECK-NEXT:   ('_relocations', [
-// CHECK-NEXT:    # Relocation 0x00000000
+// CHECK-NEXT:    # Relocation 0
 // CHECK-NEXT:    (('r_offset', 0x00000020)
 // CHECK-NEXT:     ('r_sym', 0x00000002)
 // CHECK-NEXT:     ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-remember.s b/test/MC/ELF/cfi-remember.s
index 4dd25bec7b..66ca412375 100644
--- a/test/MC/ELF/cfi-remember.s
+++ b/test/MC/ELF/cfi-remember.s
@@ -35,7 +35,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-same-value.s b/test/MC/ELF/cfi-same-value.s
index 817f58567b..8950d9c31c 100644
--- a/test/MC/ELF/cfi-same-value.s
+++ b/test/MC/ELF/cfi-same-value.s
@@ -32,7 +32,7 @@ f:
 // CHECK-NEXT:   ('sh_addralign', 0x00000008)
 // CHECK-NEXT:   ('sh_entsize', 0x00000018)
 // CHECK-NEXT:   ('_relocations', [
-// CHECK-NEXT:    # Relocation 0x00000000
+// CHECK-NEXT:    # Relocation 0
 // CHECK-NEXT:    (('r_offset', 0x00000020)
 // CHECK-NEXT:     ('r_sym', 0x00000002)
 // CHECK-NEXT:     ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi-zero-addr-delta.s b/test/MC/ELF/cfi-zero-addr-delta.s
index 888f4d5173..35a1bd4d29 100644
--- a/test/MC/ELF/cfi-zero-addr-delta.s
+++ b/test/MC/ELF/cfi-zero-addr-delta.s
@@ -38,7 +38,7 @@ f:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/cfi.s b/test/MC/ELF/cfi.s
index 080ac8f30e..cf4979376f 100644
--- a/test/MC/ELF/cfi.s
+++ b/test/MC/ELF/cfi.s
@@ -238,433 +238,433 @@ f36:
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000020)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000001
+// CHECK-NEXT:   # Relocation 1
 // CHECK-NEXT:   (('r_offset', 0x00000029)
 // CHECK-NEXT:    ('r_sym', 0x00000028)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000002
+// CHECK-NEXT:   # Relocation 2
 // CHECK-NEXT:   (('r_offset', 0x00000043)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000003
+// CHECK-NEXT:   # Relocation 3
 // CHECK-NEXT:   (('r_offset', 0x0000005c)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000001)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000004
+// CHECK-NEXT:   # Relocation 4
 // CHECK-NEXT:   (('r_offset', 0x00000065)
 // CHECK-NEXT:    ('r_sym', 0x00000028)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000005
+// CHECK-NEXT:   # Relocation 5
 // CHECK-NEXT:   (('r_offset', 0x00000074)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000002)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000006
+// CHECK-NEXT:   # Relocation 6
 // CHECK-NEXT:   (('r_offset', 0x0000007d)
 // CHECK-NEXT:    ('r_sym', 0x00000028)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000007
+// CHECK-NEXT:   # Relocation 7
 // CHECK-NEXT:   (('r_offset', 0x00000097)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000008
+// CHECK-NEXT:   # Relocation 8
 // CHECK-NEXT:   (('r_offset', 0x000000b0)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000003)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000009
+// CHECK-NEXT:   # Relocation 9
 // CHECK-NEXT:   (('r_offset', 0x000000b9)
 // CHECK-NEXT:    ('r_sym', 0x00000028)
 // CHECK-NEXT:    ('r_type', 0x0000000c)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000000a
+// CHECK-NEXT:   # Relocation 10
 // CHECK-NEXT:   (('r_offset', 0x000000ce)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000c)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000000b
+// CHECK-NEXT:   # Relocation 11
 // CHECK-NEXT:   (('r_offset', 0x000000e0)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000004)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000000c
+// CHECK-NEXT:   # Relocation 12
 // CHECK-NEXT:   (('r_offset', 0x000000fe)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000000d
+// CHECK-NEXT:   # Relocation 13
 // CHECK-NEXT:   (('r_offset', 0x00000110)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000005)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000000e
+// CHECK-NEXT:   # Relocation 14
 // CHECK-NEXT:   (('r_offset', 0x0000012e)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000000f
+// CHECK-NEXT:   # Relocation 15
 // CHECK-NEXT:   (('r_offset', 0x00000144)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000006)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000010
+// CHECK-NEXT:   # Relocation 16
 // CHECK-NEXT:   (('r_offset', 0x00000162)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000c)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000011
+// CHECK-NEXT:   # Relocation 17
 // CHECK-NEXT:   (('r_offset', 0x00000174)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000007)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000012
+// CHECK-NEXT:   # Relocation 18
 // CHECK-NEXT:   (('r_offset', 0x00000192)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000013
+// CHECK-NEXT:   # Relocation 19
 // CHECK-NEXT:   (('r_offset', 0x000001a4)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000008)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000014
+// CHECK-NEXT:   # Relocation 20
 // CHECK-NEXT:   (('r_offset', 0x000001c2)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000015
+// CHECK-NEXT:   # Relocation 21
 // CHECK-NEXT:   (('r_offset', 0x000001d8)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000009)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000016
+// CHECK-NEXT:   # Relocation 22
 // CHECK-NEXT:   (('r_offset', 0x000001f6)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000017
+// CHECK-NEXT:   # Relocation 23
 // CHECK-NEXT:   (('r_offset', 0x0000020c)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000000a)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000018
+// CHECK-NEXT:   # Relocation 24
 // CHECK-NEXT:   (('r_offset', 0x0000022a)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000019
+// CHECK-NEXT:   # Relocation 25
 // CHECK-NEXT:   (('r_offset', 0x00000240)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000000b)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000001a
+// CHECK-NEXT:   # Relocation 26
 // CHECK-NEXT:   (('r_offset', 0x0000025e)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000d)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000001b
+// CHECK-NEXT:   # Relocation 27
 // CHECK-NEXT:   (('r_offset', 0x00000270)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000000c)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000001c
+// CHECK-NEXT:   # Relocation 28
 // CHECK-NEXT:   (('r_offset', 0x0000028e)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000001d
+// CHECK-NEXT:   # Relocation 29
 // CHECK-NEXT:   (('r_offset', 0x000002a0)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000000d)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000001e
+// CHECK-NEXT:   # Relocation 30
 // CHECK-NEXT:   (('r_offset', 0x000002be)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000001f
+// CHECK-NEXT:   # Relocation 31
 // CHECK-NEXT:   (('r_offset', 0x000002d4)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000000e)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000020
+// CHECK-NEXT:   # Relocation 32
 // CHECK-NEXT:   (('r_offset', 0x000002f2)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000d)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000021
+// CHECK-NEXT:   # Relocation 33
 // CHECK-NEXT:   (('r_offset', 0x00000304)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000000f)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000022
+// CHECK-NEXT:   # Relocation 34
 // CHECK-NEXT:   (('r_offset', 0x00000322)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000023
+// CHECK-NEXT:   # Relocation 35
 // CHECK-NEXT:   (('r_offset', 0x00000334)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000010)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000024
+// CHECK-NEXT:   # Relocation 36
 // CHECK-NEXT:   (('r_offset', 0x00000352)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000025
+// CHECK-NEXT:   # Relocation 37
 // CHECK-NEXT:   (('r_offset', 0x00000368)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000011)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000026
+// CHECK-NEXT:   # Relocation 38
 // CHECK-NEXT:   (('r_offset', 0x00000386)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000027
+// CHECK-NEXT:   # Relocation 39
 // CHECK-NEXT:   (('r_offset', 0x0000039c)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000012)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000028
+// CHECK-NEXT:   # Relocation 40
 // CHECK-NEXT:   (('r_offset', 0x000003ba)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000029
+// CHECK-NEXT:   # Relocation 41
 // CHECK-NEXT:   (('r_offset', 0x000003d0)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000013)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000002a
+// CHECK-NEXT:   # Relocation 42
 // CHECK-NEXT:   (('r_offset', 0x000003ee)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000c)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000002b
+// CHECK-NEXT:   # Relocation 43
 // CHECK-NEXT:   (('r_offset', 0x00000400)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000014)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000002c
+// CHECK-NEXT:   # Relocation 44
 // CHECK-NEXT:   (('r_offset', 0x0000041e)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000002d
+// CHECK-NEXT:   # Relocation 45
 // CHECK-NEXT:   (('r_offset', 0x00000430)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000015)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000002e
+// CHECK-NEXT:   # Relocation 46
 // CHECK-NEXT:   (('r_offset', 0x0000044e)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000002f
+// CHECK-NEXT:   # Relocation 47
 // CHECK-NEXT:   (('r_offset', 0x00000464)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000016)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000030
+// CHECK-NEXT:   # Relocation 48
 // CHECK-NEXT:   (('r_offset', 0x00000482)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000c)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000031
+// CHECK-NEXT:   # Relocation 49
 // CHECK-NEXT:   (('r_offset', 0x00000494)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000017)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000032
+// CHECK-NEXT:   # Relocation 50
 // CHECK-NEXT:   (('r_offset', 0x000004b2)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000a)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000033
+// CHECK-NEXT:   # Relocation 51
 // CHECK-NEXT:   (('r_offset', 0x000004c4)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000018)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000034
+// CHECK-NEXT:   # Relocation 52
 // CHECK-NEXT:   (('r_offset', 0x000004e2)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000035
+// CHECK-NEXT:   # Relocation 53
 // CHECK-NEXT:   (('r_offset', 0x000004f8)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000019)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000036
+// CHECK-NEXT:   # Relocation 54
 // CHECK-NEXT:   (('r_offset', 0x00000516)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000001)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000037
+// CHECK-NEXT:   # Relocation 55
 // CHECK-NEXT:   (('r_offset', 0x0000052c)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000001a)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000038
+// CHECK-NEXT:   # Relocation 56
 // CHECK-NEXT:   (('r_offset', 0x0000054a)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000039
+// CHECK-NEXT:   # Relocation 57
 // CHECK-NEXT:   (('r_offset', 0x00000560)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000001b)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000003a
+// CHECK-NEXT:   # Relocation 58
 // CHECK-NEXT:   (('r_offset', 0x0000057e)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000d)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000003b
+// CHECK-NEXT:   # Relocation 59
 // CHECK-NEXT:   (('r_offset', 0x00000590)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000001c)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000003c
+// CHECK-NEXT:   # Relocation 60
 // CHECK-NEXT:   (('r_offset', 0x000005ae)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000003d
+// CHECK-NEXT:   # Relocation 61
 // CHECK-NEXT:   (('r_offset', 0x000005c0)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000001d)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000003e
+// CHECK-NEXT:   # Relocation 62
 // CHECK-NEXT:   (('r_offset', 0x000005de)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x0000003f
+// CHECK-NEXT:   # Relocation 63
 // CHECK-NEXT:   (('r_offset', 0x000005f4)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000001e)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000040
+// CHECK-NEXT:   # Relocation 64
 // CHECK-NEXT:   (('r_offset', 0x00000612)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x0000000d)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000041
+// CHECK-NEXT:   # Relocation 65
 // CHECK-NEXT:   (('r_offset', 0x00000624)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x000000000000001f)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000042
+// CHECK-NEXT:   # Relocation 66
 // CHECK-NEXT:   (('r_offset', 0x00000642)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000043
+// CHECK-NEXT:   # Relocation 67
 // CHECK-NEXT:   (('r_offset', 0x00000654)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000020)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000044
+// CHECK-NEXT:   # Relocation 68
 // CHECK-NEXT:   (('r_offset', 0x00000672)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000045
+// CHECK-NEXT:   # Relocation 69
 // CHECK-NEXT:   (('r_offset', 0x00000688)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000021)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000046
+// CHECK-NEXT:   # Relocation 70
 // CHECK-NEXT:   (('r_offset', 0x000006a6)
 // CHECK-NEXT:    ('r_sym', 0x00000029)
 // CHECK-NEXT:    ('r_type', 0x00000018)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000047
+// CHECK-NEXT:   # Relocation 71
 // CHECK-NEXT:   (('r_offset', 0x000006bc)
 // CHECK-NEXT:    ('r_sym', 0x00000024)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/diff.s b/test/MC/ELF/diff.s
index 0736bca01d..92927b69d0 100644
--- a/test/MC/ELF/diff.s
+++ b/test/MC/ELF/diff.s
@@ -8,7 +8,7 @@ bar:
 zed:
         mov zed+(bar-foo), %eax
 
-// CHECK:       # Relocation 0x00000000
+// CHECK:       # Relocation 0
 // CHECK-NEXT:  (('r_offset', 0x00000005)
 // CHECK-NEXT:   ('r_sym', 0x00000006)
 // CHECK-NEXT:   ('r_type', 0x0000000b)
diff --git a/test/MC/ELF/got.s b/test/MC/ELF/got.s
index a3abef536a..ad1cd36772 100644
--- a/test/MC/ELF/got.s
+++ b/test/MC/ELF/got.s
@@ -7,13 +7,13 @@
         movl	foo@GOTPCREL(%rip), %eax
 
 // CHECK:      ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:    (('r_offset',
 // CHECK-NEXT:     ('r_sym',
 // CHECK-NEXT:     ('r_type', 0x00000003)
 // CHECK-NEXT:     ('r_addend',
 // CHECK-NEXT:    ),
-// CHECK-NEXT:   # Relocation 0x00000001
+// CHECK-NEXT:   # Relocation 1
 // CHECK-NEXT:    (('r_offset',
 // CHECK-NEXT:     ('r_sym',
 // CHECK-NEXT:     ('r_type', 0x00000009)
diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s
index c1c9e52cb3..06c806edbe 100644
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -12,7 +12,7 @@ foo:
 
 // Relocation refers to symbol number 2
 // CHECK:      ('_relocations', [
-// CHECK-NEXT:  # Relocation 0x00000000
+// CHECK-NEXT:  # Relocation 0
 // CHECK-NEXT:   (('r_offset',
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type',
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index e6f5d745aa..0f615e998f 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -32,7 +32,7 @@ foo:
 // CHECK-NEXT:   ),
 
 // Relocation 1 refers to symbol 6
-// CHECK-NEXT:  # Relocation 0x00000001
+// CHECK-NEXT:  # Relocation 1
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
@@ -40,7 +40,7 @@ foo:
 // CHECK-NEXT: ),
 
 // Relocation 2 refers to symbol 1
-// CHECK-NEXT:   # Relocation 0x00000002
+// CHECK-NEXT:   # Relocation 2
 // CHECK-NEXT:   (('r_offset',
 // CHECK-NEXT:    ('r_sym', 0x00000001)
 // CHECK-NEXT:    ('r_type', 0x0000000a
@@ -48,7 +48,7 @@ foo:
 // CHECK-NEXT:   ),
 
 // Relocation 3 refers to symbol 2
-// CHECK-NEXT:   # Relocation 0x00000003
+// CHECK-NEXT:   # Relocation 3
 // CHECK-NEXT:   (('r_offset',
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000004
@@ -56,7 +56,7 @@ foo:
 // CHECK-NEXT:   ),
 
 // Relocation 4 refers to symbol 2
-// CHECK-NEXT:   # Relocation 0x00000004
+// CHECK-NEXT:   # Relocation 4
 // CHECK-NEXT:   (('r_offset',
 // CHECK-NEXT:    ('r_sym', 0x00000002)
 // CHECK-NEXT:    ('r_type', 0x00000009
@@ -64,7 +64,7 @@ foo:
 // CHECK-NEXT:   ),
 
 // Relocation 5 refers to symbol 8
-// CHECK-NEXT:   # Relocation 0x00000005
+// CHECK-NEXT:   # Relocation 5
 // CHECK-NEXT:   (('r_offset', 0x00000023)
 // CHECK-NEXT:    ('r_sym', 0x00000008)
 // CHECK-NEXT:    ('r_type', 0x0000000b)
diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index a029515e9b..cbd3bccc40 100644
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  | FileCheck %s
 
 // CHECK:       ('_relocations', [
-// CHECK-NEXT:    # Relocation 0x00000000
+// CHECK-NEXT:    # Relocation 0
 // CHECK-NEXT:    (('r_offset', 0x0000000c)
 // CHECK-NEXT:     ('r_sym', 0x00000005)
 // CHECK-NEXT:     ('r_type', 0x00000002)
diff --git a/test/MC/ELF/plt.s b/test/MC/ELF/plt.s
index 7d0073c400..7d78e23443 100644
--- a/test/MC/ELF/plt.s
+++ b/test/MC/ELF/plt.s
@@ -5,7 +5,7 @@
 	jmp	foo@PLT
 
 // CHECK:      ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:    (('r_offset',
 // CHECK-NEXT:     ('r_sym',
 // CHECK-NEXT:     ('r_type', 0x00000004)
diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index af23ae6f2e..92b95aee9b 100644
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -3,159 +3,159 @@
 // Test that we produce the correct relocation types and that the relocations
 // correctly point to the section or the symbol.
 
-// CHECK:      # Relocation 0x00000000
+// CHECK:      # Relocation 0
 // CHECK-NEXT: (('r_offset', 0x00000002)
 // CHECK-NEXT:  ('r_sym', 0x00000001)
 // CHECK-NEXT:  ('r_type', 0x00000009)
 // CHECK-NEXT: ),
-// CHECK-NEXT:  # Relocation 0x00000001
+// CHECK-NEXT:  # Relocation 1
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym',
 // CHECK-NEXT:  ('r_type', 0x00000004)
 // CHECK-NEXT: ),
-// CHECK-NEXT:  # Relocation 0x00000002
+// CHECK-NEXT:  # Relocation 2
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym',
 // CHECK-NEXT:  ('r_type', 0x0000000a)
 // CHECK-NEXT: ),
 
 // Relocation 3 (bar3@GOTOFF) is done with symbol 7 (bss)
-// CHECK-NEXT:  # Relocation 0x00000003
+// CHECK-NEXT:  # Relocation 3
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym', 0x00000007
 // CHECK-NEXT:  ('r_type',
 // CHECK-NEXT: ),
 
 // Relocation 4 (bar2@GOT) is of type R_386_GOT32
-// CHECK-NEXT:  # Relocation 0x00000004
+// CHECK-NEXT:  # Relocation 4
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym',
 // CHECK-NEXT:  ('r_type', 0x00000003
 // CHECK-NEXT: ),
 
 // Relocation 5 (foo@TLSGD) is of type R_386_TLS_GD
-// CHECK-NEXT: # Relocation 0x00000005
+// CHECK-NEXT: # Relocation 5
 // CHECK-NEXT: (('r_offset', 0x00000020)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000012)
 // CHECK-NEXT: ),
 
 // Relocation 6 ($foo@TPOFF) is of type R_386_TLS_LE_32
-// CHECK-NEXT: # Relocation 0x00000006
+// CHECK-NEXT: # Relocation 6
 // CHECK-NEXT: (('r_offset', 0x00000025)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000022)
 // CHECK-NEXT: ),
 
 // Relocation 7 (foo@INDNTPOFF) is of type R_386_TLS_IE
-// CHECK-NEXT: # Relocation 0x00000007
+// CHECK-NEXT: # Relocation 7
 // CHECK-NEXT: (('r_offset', 0x0000002b)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x0000000f)
 // CHECK-NEXT: ),
 
 // Relocation 8 (foo@NTPOFF) is of type R_386_TLS_LE
-// CHECK-NEXT: # Relocation 0x00000008
+// CHECK-NEXT: # Relocation 8
 // CHECK-NEXT: (('r_offset', 0x00000031)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000011)
 // CHECK-NEXT: ),
 
 // Relocation 9 (foo@GOTNTPOFF) is of type R_386_TLS_GOTIE
-// CHECK-NEXT: # Relocation 0x00000009
+// CHECK-NEXT: # Relocation 9
 // CHECK-NEXT: (('r_offset', 0x00000037)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000010)
 // CHECK-NEXT: ),
 
 // Relocation 10 (foo@TLSLDM) is of type R_386_TLS_LDM
-// CHECK-NEXT: # Relocation 0x0000000a
+// CHECK-NEXT: # Relocation 10
 // CHECK-NEXT: (('r_offset', 0x0000003d)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000013)
 // CHECK-NEXT: ),
 
 // Relocation 11 (foo@DTPOFF) is of type R_386_TLS_LDO_32
-// CHECK-NEXT: # Relocation 0x0000000b
+// CHECK-NEXT: # Relocation 11
 // CHECK-NEXT: (('r_offset', 0x00000043)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000020)
 // CHECK-NEXT: ),
 // Relocation 12 (calll 4096) is of type R_386_PC32
-// CHECK-NEXT: # Relocation 0x0000000c
+// CHECK-NEXT: # Relocation 12
 // CHECK-NEXT: (('r_offset', 0x00000048)
 // CHECK-NEXT:  ('r_sym', 0x00000000)
 // CHECK-NEXT:  ('r_type', 0x00000002)
 // CHECK-NEXT: ),
 // Relocation 13 (zed@GOT) is of type R_386_GOT32 and uses the symbol
-// CHECK-NEXT: # Relocation 0x0000000d
+// CHECK-NEXT: # Relocation 13
 // CHECK-NEXT: (('r_offset', 0x0000004e)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000003)
 // CHECK-NEXT: ),
 // Relocation 14 (zed@GOTOFF) is of type R_386_GOTOFF and uses the symbol
-// CHECK-NEXT: # Relocation 0x0000000e
+// CHECK-NEXT: # Relocation 14
 // CHECK-NEXT: (('r_offset', 0x00000054)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000009)
 // CHECK-NEXT: ),
 // Relocation 15 (zed@INDNTPOFF) is of type R_386_TLS_IE and uses the symbol
-// CHECK-NEXT: # Relocation 0x0000000f
+// CHECK-NEXT: # Relocation 15
 // CHECK-NEXT: (('r_offset', 0x0000005a)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x0000000f)
 // CHECK-NEXT: ),
 // Relocation 16 (zed@NTPOFF) is of type R_386_TLS_LE and uses the symbol
-// CHECK-NEXT: # Relocation 0x00000010
+// CHECK-NEXT: # Relocation 16
 // CHECK-NEXT: (('r_offset', 0x00000060)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000011)
 // CHECK-NEXT: ),
 // Relocation 17 (zed@GOTNTPOFF) is of type R_386_TLS_GOTIE and uses the symbol
-// CHECK-NEXT: # Relocation 0x00000011
+// CHECK-NEXT: # Relocation 17
 // CHECK-NEXT: (('r_offset', 0x00000066)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000010)
 // CHECK-NEXT: ),
 // Relocation 18 (zed@PLT) is of type R_386_PLT32 and uses the symbol
-// CHECK-NEXT: # Relocation 0x00000012
+// CHECK-NEXT: # Relocation 18
 // CHECK-NEXT: (('r_offset', 0x0000006b)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000004)
 // CHECK-NEXT: ),
 // Relocation 19 (zed@TLSGD) is of type R_386_TLS_GD and uses the symbol
-// CHECK-NEXT: # Relocation 0x00000013
+// CHECK-NEXT: # Relocation 19
 // CHECK-NEXT: (('r_offset', 0x00000071)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000012)
 // CHECK-NEXT: ),
 // Relocation 20 (zed@TLSLDM) is of type R_386_TLS_LDM and uses the symbol
-// CHECK-NEXT: # Relocation 0x00000014
+// CHECK-NEXT: # Relocation 20
 // CHECK-NEXT: (('r_offset', 0x00000077)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000013)
 // CHECK-NEXT: ),
 // Relocation 21 (zed@TPOFF) is of type R_386_TLS_LE_32 and uses the symbol
-// CHECK-NEXT:# Relocation 0x00000015
+// CHECK-NEXT:# Relocation 21
 // CHECK-NEXT: (('r_offset', 0x0000007d)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000022)
 // CHECK-NEXT: ),
 // Relocation 22 (zed@DTPOFF) is of type R_386_TLS_LDO_32 and uses the symbol
-// CHECK-NEXT: Relocation 0x00000016
+// CHECK-NEXT: Relocation 22
 // CHECK-NEXT: (('r_offset', 0x00000083)
 // CHECK-NEXT:  ('r_sym', 0x00000004)
 // CHECK-NEXT:  ('r_type', 0x00000020)
 // CHECK-NEXT: ),
 // Relocation 23 ($bar) is of type R_386_32 and uses the section
-// CHECK-NEXT: Relocation 0x00000017
+// CHECK-NEXT: Relocation 23
 // CHECK-NEXT: (('r_offset',
 // CHECK-NEXT:  ('r_sym',
 // CHECK-NEXT:  ('r_type', 0x00000001)
 // CHECK-NEXT: ),
 // Relocation 24 (foo@GOTTPOFF(%edx)) is of type R_386_TLS_IE_32 and uses the
 // symbol
-// CHECK-NEXT: Relocation 0x00000018
+// CHECK-NEXT: Relocation 24
 // CHECK-NEXT: (('r_offset', 0x0000008e)
 // CHECK-NEXT:  ('r_sym', 0x0000000d)
 // CHECK-NEXT:  ('r_type', 0x00000021)
diff --git a/test/MC/ELF/relocation-pc.s b/test/MC/ELF/relocation-pc.s
index b3e87f706f..7a44da1785 100644
--- a/test/MC/ELF/relocation-pc.s
+++ b/test/MC/ELF/relocation-pc.s
@@ -17,13 +17,13 @@
 // CHECK-NEXT:  ('sh_addralign', 0x00000008)
 // CHECK-NEXT:  ('sh_entsize', 0x00000018)
 // CHECK-NEXT:  ('_relocations', [
-// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   # Relocation 0
 // CHECK-NEXT:   (('r_offset', 0x00000001)
 // CHECK-NEXT:    ('r_sym', 0x00000000)
 // CHECK-NEXT:    ('r_type', 0x0000000f)
 // CHECK-NEXT:    ('r_addend', 0x0000000000000000)
 // CHECK-NEXT:   ),
-// CHECK-NEXT:   # Relocation 0x00000001
+// CHECK-NEXT:   # Relocation 1
 // CHECK-NEXT:   (('r_offset', 0x00000003)
 // CHECK-NEXT:    ('r_sym', 0x00000000)
 // CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index 3bc134b1f3..222336aad2 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -23,91 +23,91 @@ bar:
 // CHECK:  # Section 1
 // CHECK: (('sh_name', 0x00000006) # '.text'
 
-// CHECK: # Relocation 0x00000000
+// CHECK: # Relocation 0
 // CHECK-NEXT:  (('r_offset', 0x00000001)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000a)
 // CHECK-NEXT:   ('r_addend',
 
-// CHECK: # Relocation 0x00000001
+// CHECK: # Relocation 1
 // CHECK-NEXT:  (('r_offset', 0x00000008)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000b)
 // CHECK-NEXT:   ('r_addend',
 
-// CHECK: # Relocation 0x00000002
+// CHECK: # Relocation 2
 // CHECK-NEXT:  (('r_offset', 0x00000013)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000b)
 // CHECK-NEXT:   ('r_addend',
 
-// CHECK: # Relocation 0x00000003
+// CHECK: # Relocation 3
 // CHECK-NEXT:  (('r_offset', 0x0000001a)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000b)
 // CHECK-NEXT:   ('r_addend',
 
-// CHECK: # Relocation 0x00000004
+// CHECK: # Relocation 4
 // CHECK-NEXT:  (('r_offset', 0x00000022)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000b)
 // CHECK-NEXT:   ('r_addend',
 
-// CHECK: # Relocation 0x00000005
+// CHECK: # Relocation 5
 // CHECK-NEXT:  (('r_offset', 0x00000026)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000a)
 // CHECK-NEXT:   ('r_addend',
 
-// CHECK: # Relocation 0x00000006
+// CHECK: # Relocation 6
 // CHECK-NEXT:  (('r_offset', 0x0000002d)
 // CHECK-NEXT:   ('r_sym', 0x00000006)
 // CHECK-NEXT:   ('r_type', 0x00000016)
 // CHECK-NEXT:   ('r_addend', 0xfffffffffffffffc)
 
-// CHECK:  # Relocation 0x00000007
+// CHECK:  # Relocation 7
 // CHECK-NEXT:  (('r_offset', 0x00000034)
 // CHECK-NEXT:   ('r_sym', 0x00000006)
 // CHECK-NEXT:   ('r_type', 0x00000013)
 // CHECK-NEXT:   ('r_addend', 0xfffffffffffffffc)
 
-// CHECK:  # Relocation 0x00000008
+// CHECK:  # Relocation 8
 // CHECK-NEXT:  (('r_offset', 0x0000003b)
 // CHECK-NEXT:   ('r_sym', 0x00000006)
 // CHECK-NEXT:   ('r_type', 0x00000017)
 // CHECK-NEXT:   ('r_addend', 0x0000000000000000)
 
-// CHECK:  # Relocation 0x00000009
+// CHECK:  # Relocation 9
 // CHECK-NEXT:  (('r_offset', 0x00000042)
 // CHECK-NEXT:   ('r_sym', 0x00000006)
 // CHECK-NEXT:   ('r_type', 0x00000014)
 // CHECK-NEXT:   ('r_addend', 0xfffffffffffffffc)
 
-// CHECK:  # Relocation 0x0000000a
+// CHECK:  # Relocation 10
 // CHECK-NEXT:  (('r_offset', 0x00000049)
 // CHECK-NEXT:   ('r_sym', 0x00000006)
 // CHECK-NEXT:   ('r_type', 0x00000015)
 // CHECK-NEXT:   ('r_addend', 0x0000000000000000)
 
-// CHECK: # Relocation 0x0000000b
+// CHECK: # Relocation 11
 // CHECK-NEXT:  (('r_offset', 0x0000004e)
 // CHECK-NEXT:   ('r_sym', 0x00000002)
 // CHECK-NEXT:   ('r_type', 0x0000000b)
 // CHECK-NEXT:   ('r_addend', 0x0000000000000000)
 
-// CHECK: # Relocation 0x0000000c
+// CHECK: # Relocation 12
 // CHECK-NEXT: (('r_offset', 0x00000055)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x00000002)
 // CHECK-NEXT:  ('r_addend', 0xfffffffffffffffc)
 
-// CHECK: # Relocation 0x0000000d
+// CHECK: # Relocation 13
 // CHECK-NEXT: (('r_offset', 0x0000005c)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x00000002)
 // CHECK-NEXT:  ('r_addend', 0x000000000000005c)
 
-// CHECK: # Relocation 0x0000000e
+// CHECK: # Relocation 14
 // CHECK-NEXT: (('r_offset', 0x00000063)
 // CHECK-NEXT:  ('r_sym', 0x00000002)
 // CHECK-NEXT:  ('r_type', 0x0000000b)
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index 2bfece0eef..c07aa9c80e 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -29,7 +29,7 @@ defined3:
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 
 // The relocation uses symbol 2
-// CHECK:      # Relocation 0x00000000
+// CHECK:      # Relocation 0
 // CHECK-NEXT: (('r_offset', 0x00000000)
 // CHECK-NEXT:  ('r_sym', 0x00000002)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
diff --git a/test/MC/ELF/symref.s b/test/MC/ELF/symref.s
index b1e07191bb..341c2680c8 100644
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -22,31 +22,31 @@ defined3:
 global1:
 
 
-// CHECK:      # Relocation 0x00000000
+// CHECK:      # Relocation 0
 // CHECK-NEXT: (('r_offset', 0x00000000)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Relocation 0x00000001
+// CHECK-NEXT: # Relocation 1
 // CHECK-NEXT: (('r_offset', 0x00000004)
 // CHECK-NEXT:  ('r_sym', 0x0000000b)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Relocation 0x00000002
+// CHECK-NEXT: # Relocation 2
 // CHECK-NEXT: (('r_offset', 0x00000008)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Relocation 0x00000003
+// CHECK-NEXT: # Relocation 3
 // CHECK-NEXT: (('r_offset', 0x0000000c)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
 // CHECK-NEXT:  ('r_addend', 0x0000000000000000)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Relocation 0x00000004
+// CHECK-NEXT: # Relocation 4
 // CHECK-NEXT: (('r_offset', 0x00000010)
 // CHECK-NEXT:  ('r_sym', 0x0000000c)
 // CHECK-NEXT:  ('r_type', 0x0000000a)
diff --git a/test/MC/ELF/weak-relocation.s b/test/MC/ELF/weak-relocation.s
index e4fc914905..57714a1ec2 100644
--- a/test/MC/ELF/weak-relocation.s
+++ b/test/MC/ELF/weak-relocation.s
@@ -7,7 +7,7 @@ foo:
 bar:
         call    foo
 
-//CHECK:        # Relocation 0x00000000
+//CHECK:        # Relocation 0
 //CHECK-NEXT:   (('r_offset', 0x00000001)
 //CHECK-NEXT:    ('r_sym', 0x00000005)
 //CHECK-NEXT:    ('r_type', 0x00000002)
diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s
index fd17d1d309..273d27ed4f 100644
--- a/test/MC/ELF/weakref-reloc.s
+++ b/test/MC/ELF/weakref-reloc.s
@@ -7,13 +7,13 @@
         call    zed@PLT
 	call	bar
 
-// CHECK:      # Relocation 0x00000000
+// CHECK:      # Relocation 0
 // CHECK-NEXT: (('r_offset', 0x00000001)
 // CHECK-NEXT:  ('r_sym', 0x00000006)
 // CHECK-NEXT:  ('r_type', 0x00000004)
 // CHECK-NEXT:  ('r_addend', 0xfffffffffffffffc)
 // CHECK-NEXT: ),
-// CHECK-NEXT: # Relocation 0x00000001
+// CHECK-NEXT: # Relocation 1
 // CHECK-NEXT: (('r_offset', 0x00000006)
 // CHECK-NEXT:  ('r_sym', 0x00000005)
 // CHECK-NEXT:  ('r_type', 0x00000002)
diff --git a/test/MC/ELF/x86_64-reloc-sizetest.s b/test/MC/ELF/x86_64-reloc-sizetest.s
index 3225a4c0ff..1e327f8188 100644
--- a/test/MC/ELF/x86_64-reloc-sizetest.s
+++ b/test/MC/ELF/x86_64-reloc-sizetest.s
@@ -6,7 +6,7 @@
 L: movq $(L + 2147483648),%rax
 
 
-// CHECK:          Relocation 0x00000000
+// CHECK:          Relocation 0
 // CHECK-NEXT:     'r_offset', 0x00000003
 // CHECK-NEXT:     'r_sym'
 // CHECK-NEXT:     'r_type', 0x0000000b
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index 9794bfd9d8..d3fad34772 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -118,7 +118,7 @@ def dumpRel(f, section, dumprela = False):
 
     for index in range(entries):
         f.seek(section.sh_offset + index * section.sh_entsize)
-        print "    # Relocation %s" % common_dump.HexDump(index)
+        print "    # Relocation %s" % index
         print "    (('r_offset', %s)" % common_dump.HexDump(f.readWord())
         r_info = f.readWord()
         if f.is64Bit: