summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2011-08-04 17:00:11 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2011-08-04 17:00:11 +0000
commit5c4e52e49648c196f629b8623b4aca7e4c0080e3 (patch)
tree9d7c370b45a13b39ee42b7a6b1722ff18eaf75c0
parent1203486d92bb1f9a82533ff0a4572d5a23fb5f9a (diff)
downloadllvm-5c4e52e49648c196f629b8623b4aca7e4c0080e3.tar.gz
llvm-5c4e52e49648c196f629b8623b4aca7e4c0080e3.tar.bz2
llvm-5c4e52e49648c196f629b8623b4aca7e4c0080e3.tar.xz
Fix the bitwidth of the remaining fields.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136884 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/MC/ELF/alias-reloc.s4
-rw-r--r--test/MC/ELF/align-bss.s12
-rw-r--r--test/MC/ELF/align-nops.s16
-rw-r--r--test/MC/ELF/align-size.s8
-rw-r--r--test/MC/ELF/align-text.s12
-rw-r--r--test/MC/ELF/align.s24
-rw-r--r--test/MC/ELF/basic-elf-32.s6
-rw-r--r--test/MC/ELF/basic-elf-64.s14
-rw-r--r--test/MC/ELF/cfi-adjust-cfa-offset.s26
-rw-r--r--test/MC/ELF/cfi-advance-loc2.s26
-rw-r--r--test/MC/ELF/cfi-def-cfa-offset.s26
-rw-r--r--test/MC/ELF/cfi-def-cfa-register.s26
-rw-r--r--test/MC/ELF/cfi-def-cfa.s26
-rw-r--r--test/MC/ELF/cfi-offset.s26
-rw-r--r--test/MC/ELF/cfi-rel-offset.s26
-rw-r--r--test/MC/ELF/cfi-rel-offset2.s26
-rw-r--r--test/MC/ELF/cfi-remember.s26
-rw-r--r--test/MC/ELF/cfi-same-value.s26
-rw-r--r--test/MC/ELF/cfi-sections.s12
-rw-r--r--test/MC/ELF/cfi-zero-addr-delta.s26
-rw-r--r--test/MC/ELF/cfi.s168
-rw-r--r--test/MC/ELF/comdat.s36
-rw-r--r--test/MC/ELF/common2.s2
-rw-r--r--test/MC/ELF/debug-line.s12
-rw-r--r--test/MC/ELF/debug-loc.s12
-rw-r--r--test/MC/ELF/diff.s2
-rw-r--r--test/MC/ELF/empty-dwarf-lines.s12
-rw-r--r--test/MC/ELF/empty.s68
-rw-r--r--test/MC/ELF/entsize.ll16
-rw-r--r--test/MC/ELF/entsize.s24
-rw-r--r--test/MC/ELF/ident.s12
-rw-r--r--test/MC/ELF/leb128.s12
-rw-r--r--test/MC/ELF/merge.s2
-rw-r--r--test/MC/ELF/n_bytes.s12
-rw-r--r--test/MC/ELF/noexec.s12
-rw-r--r--test/MC/ELF/norelocation.s12
-rw-r--r--test/MC/ELF/org.s2
-rw-r--r--test/MC/ELF/pic-diff.s2
-rw-r--r--test/MC/ELF/relax.s12
-rw-r--r--test/MC/ELF/relocation-pc.s16
-rw-r--r--test/MC/ELF/relocation.s30
-rw-r--r--test/MC/ELF/rename.s14
-rw-r--r--test/MC/ELF/section.s72
-rw-r--r--test/MC/ELF/symref.s10
-rw-r--r--test/MC/ELF/weak-relocation.s2
-rw-r--r--test/MC/ELF/weakref-reloc.s4
-rw-r--r--test/MC/ELF/x86_64-reloc-sizetest.s8
-rw-r--r--test/MC/ELF/zero.s12
-rw-r--r--test/Scripts/common_dump.py3
-rwxr-xr-xtest/Scripts/elf-dump81
50 files changed, 536 insertions, 540 deletions
diff --git a/test/MC/ELF/alias-reloc.s b/test/MC/ELF/alias-reloc.s
index bd68becf8c..f0db81592e 100644
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -18,14 +18,14 @@ foo2:
.quad bar2
// CHECK: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000001)
+// CHECK-NEXT: (('r_offset', 0x0000000000000001)
// CHECK-NEXT: ('r_sym', 0x00000001)
// CHECK-NEXT: ('r_type', 0x00000004)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
// CHECK-NEXT: ),
// CHECK: # Relocation 1
-// CHECK-NEXT: (('r_offset', 0x00000005)
+// CHECK-NEXT: (('r_offset', 0x0000000000000005)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/align-bss.s b/test/MC/ELF/align-bss.s
index ca6da9184e..a59232b812 100644
--- a/test/MC/ELF/align-bss.s
+++ b/test/MC/ELF/align-bss.s
@@ -7,11 +7,11 @@
// CHECK: ('sh_name', 0x00000007) # '.bss'
// CHECK-NEXT: ('sh_type', 0x00000008)
-// CHECK-NEXT: ('sh_flags', 0x00000003)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000800)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000003)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000800)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000010)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000010)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
diff --git a/test/MC/ELF/align-nops.s b/test/MC/ELF/align-nops.s
index d29cb5b5e3..3bf96e956a 100644
--- a/test/MC/ELF/align-nops.s
+++ b/test/MC/ELF/align-nops.s
@@ -17,24 +17,24 @@ f0:
// CHECK: (('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000010)
+// CHECK-NEXT: ('sh_size', 0x0000000000000010)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '00000000 0f1f4000 00000000 0f1f4000')
// CHECK: (('sh_name', 0x00000026) # '.data'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000003)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000003)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000010)
+// CHECK-NEXT: ('sh_size', 0x0000000000000010)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '00000000 90909090 00000000 00000000')
diff --git a/test/MC/ELF/align-size.s b/test/MC/ELF/align-size.s
index 85331d7ae9..f6282910db 100644
--- a/test/MC/ELF/align-size.s
+++ b/test/MC/ELF/align-size.s
@@ -7,7 +7,7 @@
// CHECK: (('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000008)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000008)
diff --git a/test/MC/ELF/align-text.s b/test/MC/ELF/align-text.s
index 1d2dacb3a0..2fd3cba502 100644
--- a/test/MC/ELF/align-text.s
+++ b/test/MC/ELF/align-text.s
@@ -8,12 +8,12 @@
// CHECK: (('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000002)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000002)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
diff --git a/test/MC/ELF/align.s b/test/MC/ELF/align.s
index ff183298cc..3142ffb553 100644
--- a/test/MC/ELF/align.s
+++ b/test/MC/ELF/align.s
@@ -10,23 +10,23 @@
// CHECK: # Section 3
// CHECK-NEXT: (('sh_name', 0x00000007) # '.bss'
// CHECK-NEXT: ('sh_type', 0x00000008)
-// CHECK-NEXT: ('sh_flags', 0x00000003)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000044)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000003)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000044)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000026) # '.rodata'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
diff --git a/test/MC/ELF/basic-elf-32.s b/test/MC/ELF/basic-elf-32.s
index b1e5b3d8cf..2c6a984195 100644
--- a/test/MC/ELF/basic-elf-32.s
+++ b/test/MC/ELF/basic-elf-32.s
@@ -30,9 +30,9 @@ main: # @main
.section .note.GNU-stack,"",@progbits
-// CHECK: ('e_indent[EI_CLASS]', 0x00000001)
-// CHECK: ('e_indent[EI_DATA]', 0x00000001)
-// CHECK: ('e_indent[EI_VERSION]', 0x00000001)
+// CHECK: ('e_indent[EI_CLASS]', 0x01)
+// CHECK: ('e_indent[EI_DATA]', 0x01)
+// CHECK: ('e_indent[EI_VERSION]', 0x01)
// CHECK: ('_sections', [
// CHECK: # Section 0
// CHECK: (('sh_name', 0x00000000) # ''
diff --git a/test/MC/ELF/basic-elf-64.s b/test/MC/ELF/basic-elf-64.s
index 3f65a302f0..38ffaa724a 100644
--- a/test/MC/ELF/basic-elf-64.s
+++ b/test/MC/ELF/basic-elf-64.s
@@ -30,9 +30,9 @@ main: # @main
.section .note.GNU-stack,"",@progbits
-// CHECK: ('e_indent[EI_CLASS]', 0x00000002)
-// CHECK: ('e_indent[EI_DATA]', 0x00000001)
-// CHECK: ('e_indent[EI_VERSION]', 0x00000001)
+// CHECK: ('e_indent[EI_CLASS]', 0x02)
+// CHECK: ('e_indent[EI_DATA]', 0x01)
+// CHECK: ('e_indent[EI_VERSION]', 0x01)
// CHECK: ('_sections', [
// CHECK: # Section 0
// CHECK: (('sh_name', 0x00000000) # ''
@@ -43,22 +43,22 @@ main: # @main
// CHECK: ('_relocations', [
// CHECK: # Relocation 0
-// CHECK: (('r_offset', 0x00000005)
+// CHECK: (('r_offset', 0x0000000000000005)
// CHECK: ('r_type', 0x0000000a)
// CHECK: ('r_addend', 0x0000000000000000)
// CHECK: ),
// CHECK: # Relocation 1
-// CHECK: (('r_offset', 0x0000000a)
+// CHECK: (('r_offset', 0x000000000000000a)
// CHECK: ('r_type', 0x00000002)
// CHECK: ('r_addend', 0xfffffffffffffffc)
// CHECK: ),
// CHECK: # Relocation 2
-// CHECK: (('r_offset', 0x0000000f)
+// CHECK: (('r_offset', 0x000000000000000f)
// CHECK: ('r_type', 0x0000000a)
// CHECK: ('r_addend', 0x0000000000000006)
// CHECK: ),
// CHECK: # Relocation 3
-// CHECK: (('r_offset', 0x00000014)
+// CHECK: (('r_offset', 0x0000000000000014)
// CHECK: ('r_type', 0x00000002)
// CHECK: ('r_addend', 0xfffffffffffffffc)
// CHECK: ),
diff --git a/test/MC/ELF/cfi-adjust-cfa-offset.s b/test/MC/ELF/cfi-adjust-cfa-offset.s
index 4bc2a888fa..f0d9c5fe23 100644
--- a/test/MC/ELF/cfi-adjust-cfa-offset.s
+++ b/test/MC/ELF/cfi-adjust-cfa-offset.s
@@ -14,30 +14,30 @@ f:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000038)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000038)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 1c000000 1c000000 00000000 0a000000 00440e10 410e1444 0e080000 00000000')
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x000003a0)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x00000000000003a0)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-advance-loc2.s b/test/MC/ELF/cfi-advance-loc2.s
index 2acfbd475f..b3c08e0a0e 100644
--- a/test/MC/ELF/cfi-advance-loc2.s
+++ b/test/MC/ELF/cfi-advance-loc2.s
@@ -12,31 +12,31 @@ f:
// CHECK: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000148)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000148)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 01010000 00030001 0e080000')
// CHECK-NEXT: ),
// CHECK: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000490)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000490)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-def-cfa-offset.s b/test/MC/ELF/cfi-def-cfa-offset.s
index 29e9a9fadb..0ed2be057e 100644
--- a/test/MC/ELF/cfi-def-cfa-offset.s
+++ b/test/MC/ELF/cfi-def-cfa-offset.s
@@ -13,31 +13,31 @@ f:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 0a000000 00440e10 450e0800')
// CHECK-NEXT: ),
// CHECK: # Section 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000398)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000398)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-def-cfa-register.s b/test/MC/ELF/cfi-def-cfa-register.s
index dcf95be8bc..e87b4f67d4 100644
--- a/test/MC/ELF/cfi-def-cfa-register.s
+++ b/test/MC/ELF/cfi-def-cfa-register.s
@@ -9,30 +9,30 @@ f:
// CHECK: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 02000000 00410d06 00000000')
// CHECK-NEXT: ),
// CHECK: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000390)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000390)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-def-cfa.s b/test/MC/ELF/cfi-def-cfa.s
index bc4b5cf8db..e25bf5c8e3 100644
--- a/test/MC/ELF/cfi-def-cfa.s
+++ b/test/MC/ELF/cfi-def-cfa.s
@@ -9,31 +9,31 @@ f:
// CHECK: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 02000000 00410c07 08000000')
// CHECK-NEXT: ),
// CHECK: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000390)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000390)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-offset.s b/test/MC/ELF/cfi-offset.s
index dc966f34e8..9acb76c24d 100644
--- a/test/MC/ELF/cfi-offset.s
+++ b/test/MC/ELF/cfi-offset.s
@@ -9,31 +9,31 @@ f:
// CHECK: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 02000000 00418602 00000000')
// CHECK-NEXT: ),
// CHECK: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000390)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000390)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-rel-offset.s b/test/MC/ELF/cfi-rel-offset.s
index a22672560e..82bbd8d6ce 100644
--- a/test/MC/ELF/cfi-rel-offset.s
+++ b/test/MC/ELF/cfi-rel-offset.s
@@ -17,30 +17,30 @@ f:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000040)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000040)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// 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 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x000003a0)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x00000000000003a0)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-rel-offset2.s b/test/MC/ELF/cfi-rel-offset2.s
index bb8e4497b2..7726adbe38 100644
--- a/test/MC/ELF/cfi-rel-offset2.s
+++ b/test/MC/ELF/cfi-rel-offset2.s
@@ -9,30 +9,30 @@ f:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 01000000 00411106 7f000000')
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000390)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000390)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-remember.s b/test/MC/ELF/cfi-remember.s
index 66ca412375..1717662c10 100644
--- a/test/MC/ELF/cfi-remember.s
+++ b/test/MC/ELF/cfi-remember.s
@@ -12,31 +12,31 @@ f:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 03000000 00410a41 0b000000')
// CHECK-NEXT: ),
// CHECK: # Section 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000390)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000390)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-same-value.s b/test/MC/ELF/cfi-same-value.s
index 8950d9c31c..4c80a0a066 100644
--- a/test/MC/ELF/cfi-same-value.s
+++ b/test/MC/ELF/cfi-same-value.s
@@ -10,30 +10,30 @@ f:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 02000000 00410806 00000000')
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000390)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000390)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi-sections.s b/test/MC/ELF/cfi-sections.s
index a73f3a9f58..b256bbf4cd 100644
--- a/test/MC/ELF/cfi-sections.s
+++ b/test/MC/ELF/cfi-sections.s
@@ -15,14 +15,14 @@ f2:
// ELF_64: (('sh_name', 0x00000011) # '.debug_frame'
// ELF_64-NEXT: ('sh_type', 0x00000001)
-// ELF_64-NEXT: ('sh_flags', 0x00000000)
-// ELF_64-NEXT: ('sh_addr', 0x00000000)
-// ELF_64-NEXT: ('sh_offset', 0x00000048)
-// ELF_64-NEXT: ('sh_size', 0x00000048)
+// ELF_64-NEXT: ('sh_flags', 0x0000000000000000)
+// ELF_64-NEXT: ('sh_addr', 0x0000000000000000)
+// ELF_64-NEXT: ('sh_offset', 0x0000000000000048)
+// ELF_64-NEXT: ('sh_size', 0x0000000000000048)
// ELF_64-NEXT: ('sh_link', 0x00000000)
// ELF_64-NEXT: ('sh_info', 0x00000000)
-// ELF_64-NEXT: ('sh_addralign', 0x00000008)
-// ELF_64-NEXT: ('sh_entsize', 0x00000000)
+// ELF_64-NEXT: ('sh_addralign', 0x0000000000000008)
+// ELF_64-NEXT: ('sh_entsize', 0x0000000000000000)
// ELF_64-NEXT: ('_section_data', '14000000 ffffffff 01000178 100c0708 90010000 00000000 14000000 00000000 00000000 00000000 01000000 00000000 14000000 00000000 00000000 00000000 01000000 00000000')
// ELF_32: (('sh_name', 0x00000010) # '.debug_frame'
diff --git a/test/MC/ELF/cfi-zero-addr-delta.s b/test/MC/ELF/cfi-zero-addr-delta.s
index 35a1bd4d29..9e818e6948 100644
--- a/test/MC/ELF/cfi-zero-addr-delta.s
+++ b/test/MC/ELF/cfi-zero-addr-delta.s
@@ -16,30 +16,30 @@ f:
// CHECK: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000048)
-// CHECK-NEXT: ('sh_size', 0x00000038)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000048)
+// CHECK-NEXT: ('sh_size', 0x0000000000000038)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 1c000000 1c000000 00000000 04000000 00410e10 410a0e08 410b0000 00000000')
// CHECK-NEXT: ),
// CHECK: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000398)
-// CHECK-NEXT: ('sh_size', 0x00000018)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000398)
+// CHECK-NEXT: ('sh_size', 0x0000000000000018)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/cfi.s b/test/MC/ELF/cfi.s
index cf4979376f..9320894226 100644
--- a/test/MC/ELF/cfi.s
+++ b/test/MC/ELF/cfi.s
@@ -215,457 +215,457 @@ f36:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000068)
-// CHECK-NEXT: ('sh_size', 0x000006c8)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000068)
+// CHECK-NEXT: ('sh_size', 0x00000000000006c8)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// 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 5
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.rela.eh_frame'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000e30)
-// CHECK-NEXT: ('sh_size', 0x000006c0)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000e30)
+// CHECK-NEXT: ('sh_size', 0x00000000000006c0)
// CHECK-NEXT: ('sh_link', 0x00000007)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000020)
+// CHECK-NEXT: (('r_offset', 0x0000000000000020)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 1
-// CHECK-NEXT: (('r_offset', 0x00000029)
+// CHECK-NEXT: (('r_offset', 0x0000000000000029)
// CHECK-NEXT: ('r_sym', 0x00000028)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 2
-// CHECK-NEXT: (('r_offset', 0x00000043)
+// CHECK-NEXT: (('r_offset', 0x0000000000000043)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 3
-// CHECK-NEXT: (('r_offset', 0x0000005c)
+// CHECK-NEXT: (('r_offset', 0x000000000000005c)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000001)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 4
-// CHECK-NEXT: (('r_offset', 0x00000065)
+// CHECK-NEXT: (('r_offset', 0x0000000000000065)
// CHECK-NEXT: ('r_sym', 0x00000028)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 5
-// CHECK-NEXT: (('r_offset', 0x00000074)
+// CHECK-NEXT: (('r_offset', 0x0000000000000074)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000002)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 6
-// CHECK-NEXT: (('r_offset', 0x0000007d)
+// CHECK-NEXT: (('r_offset', 0x000000000000007d)
// CHECK-NEXT: ('r_sym', 0x00000028)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 7
-// CHECK-NEXT: (('r_offset', 0x00000097)
+// CHECK-NEXT: (('r_offset', 0x0000000000000097)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 8
-// CHECK-NEXT: (('r_offset', 0x000000b0)
+// CHECK-NEXT: (('r_offset', 0x00000000000000b0)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000003)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 9
-// CHECK-NEXT: (('r_offset', 0x000000b9)
+// CHECK-NEXT: (('r_offset', 0x00000000000000b9)
// CHECK-NEXT: ('r_sym', 0x00000028)
// CHECK-NEXT: ('r_type', 0x0000000c)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 10
-// CHECK-NEXT: (('r_offset', 0x000000ce)
+// CHECK-NEXT: (('r_offset', 0x00000000000000ce)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000c)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 11
-// CHECK-NEXT: (('r_offset', 0x000000e0)
+// CHECK-NEXT: (('r_offset', 0x00000000000000e0)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000004)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 12
-// CHECK-NEXT: (('r_offset', 0x000000fe)
+// CHECK-NEXT: (('r_offset', 0x00000000000000fe)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 13
-// CHECK-NEXT: (('r_offset', 0x00000110)
+// CHECK-NEXT: (('r_offset', 0x0000000000000110)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000005)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 14
-// CHECK-NEXT: (('r_offset', 0x0000012e)
+// CHECK-NEXT: (('r_offset', 0x000000000000012e)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 15
-// CHECK-NEXT: (('r_offset', 0x00000144)
+// CHECK-NEXT: (('r_offset', 0x0000000000000144)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000006)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 16
-// CHECK-NEXT: (('r_offset', 0x00000162)
+// CHECK-NEXT: (('r_offset', 0x0000000000000162)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000c)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 17
-// CHECK-NEXT: (('r_offset', 0x00000174)
+// CHECK-NEXT: (('r_offset', 0x0000000000000174)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000007)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 18
-// CHECK-NEXT: (('r_offset', 0x00000192)
+// CHECK-NEXT: (('r_offset', 0x0000000000000192)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 19
-// CHECK-NEXT: (('r_offset', 0x000001a4)
+// CHECK-NEXT: (('r_offset', 0x00000000000001a4)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000008)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 20
-// CHECK-NEXT: (('r_offset', 0x000001c2)
+// CHECK-NEXT: (('r_offset', 0x00000000000001c2)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 21
-// CHECK-NEXT: (('r_offset', 0x000001d8)
+// CHECK-NEXT: (('r_offset', 0x00000000000001d8)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000009)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 22
-// CHECK-NEXT: (('r_offset', 0x000001f6)
+// CHECK-NEXT: (('r_offset', 0x00000000000001f6)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 23
-// CHECK-NEXT: (('r_offset', 0x0000020c)
+// CHECK-NEXT: (('r_offset', 0x000000000000020c)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000000a)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 24
-// CHECK-NEXT: (('r_offset', 0x0000022a)
+// CHECK-NEXT: (('r_offset', 0x000000000000022a)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 25
-// CHECK-NEXT: (('r_offset', 0x00000240)
+// CHECK-NEXT: (('r_offset', 0x0000000000000240)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000000b)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 26
-// CHECK-NEXT: (('r_offset', 0x0000025e)
+// CHECK-NEXT: (('r_offset', 0x000000000000025e)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000d)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 27
-// CHECK-NEXT: (('r_offset', 0x00000270)
+// CHECK-NEXT: (('r_offset', 0x0000000000000270)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000000c)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 28
-// CHECK-NEXT: (('r_offset', 0x0000028e)
+// CHECK-NEXT: (('r_offset', 0x000000000000028e)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 29
-// CHECK-NEXT: (('r_offset', 0x000002a0)
+// CHECK-NEXT: (('r_offset', 0x00000000000002a0)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000000d)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 30
-// CHECK-NEXT: (('r_offset', 0x000002be)
+// CHECK-NEXT: (('r_offset', 0x00000000000002be)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 31
-// CHECK-NEXT: (('r_offset', 0x000002d4)
+// CHECK-NEXT: (('r_offset', 0x00000000000002d4)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000000e)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 32
-// CHECK-NEXT: (('r_offset', 0x000002f2)
+// CHECK-NEXT: (('r_offset', 0x00000000000002f2)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000d)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 33
-// CHECK-NEXT: (('r_offset', 0x00000304)
+// CHECK-NEXT: (('r_offset', 0x0000000000000304)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000000f)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 34
-// CHECK-NEXT: (('r_offset', 0x00000322)
+// CHECK-NEXT: (('r_offset', 0x0000000000000322)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 35
-// CHECK-NEXT: (('r_offset', 0x00000334)
+// CHECK-NEXT: (('r_offset', 0x0000000000000334)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000010)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 36
-// CHECK-NEXT: (('r_offset', 0x00000352)
+// CHECK-NEXT: (('r_offset', 0x0000000000000352)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 37
-// CHECK-NEXT: (('r_offset', 0x00000368)
+// CHECK-NEXT: (('r_offset', 0x0000000000000368)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000011)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 38
-// CHECK-NEXT: (('r_offset', 0x00000386)
+// CHECK-NEXT: (('r_offset', 0x0000000000000386)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 39
-// CHECK-NEXT: (('r_offset', 0x0000039c)
+// CHECK-NEXT: (('r_offset', 0x000000000000039c)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000012)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 40
-// CHECK-NEXT: (('r_offset', 0x000003ba)
+// CHECK-NEXT: (('r_offset', 0x00000000000003ba)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 41
-// CHECK-NEXT: (('r_offset', 0x000003d0)
+// CHECK-NEXT: (('r_offset', 0x00000000000003d0)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000013)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 42
-// CHECK-NEXT: (('r_offset', 0x000003ee)
+// CHECK-NEXT: (('r_offset', 0x00000000000003ee)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000c)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 43
-// CHECK-NEXT: (('r_offset', 0x00000400)
+// CHECK-NEXT: (('r_offset', 0x0000000000000400)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000014)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 44
-// CHECK-NEXT: (('r_offset', 0x0000041e)
+// CHECK-NEXT: (('r_offset', 0x000000000000041e)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 45
-// CHECK-NEXT: (('r_offset', 0x00000430)
+// CHECK-NEXT: (('r_offset', 0x0000000000000430)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000015)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 46
-// CHECK-NEXT: (('r_offset', 0x0000044e)
+// CHECK-NEXT: (('r_offset', 0x000000000000044e)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 47
-// CHECK-NEXT: (('r_offset', 0x00000464)
+// CHECK-NEXT: (('r_offset', 0x0000000000000464)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000016)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 48
-// CHECK-NEXT: (('r_offset', 0x00000482)
+// CHECK-NEXT: (('r_offset', 0x0000000000000482)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000c)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 49
-// CHECK-NEXT: (('r_offset', 0x00000494)
+// CHECK-NEXT: (('r_offset', 0x0000000000000494)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000017)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 50
-// CHECK-NEXT: (('r_offset', 0x000004b2)
+// CHECK-NEXT: (('r_offset', 0x00000000000004b2)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 51
-// CHECK-NEXT: (('r_offset', 0x000004c4)
+// CHECK-NEXT: (('r_offset', 0x00000000000004c4)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000018)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 52
-// CHECK-NEXT: (('r_offset', 0x000004e2)
+// CHECK-NEXT: (('r_offset', 0x00000000000004e2)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 53
-// CHECK-NEXT: (('r_offset', 0x000004f8)
+// CHECK-NEXT: (('r_offset', 0x00000000000004f8)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000019)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 54
-// CHECK-NEXT: (('r_offset', 0x00000516)
+// CHECK-NEXT: (('r_offset', 0x0000000000000516)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000001)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 55
-// CHECK-NEXT: (('r_offset', 0x0000052c)
+// CHECK-NEXT: (('r_offset', 0x000000000000052c)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000001a)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 56
-// CHECK-NEXT: (('r_offset', 0x0000054a)
+// CHECK-NEXT: (('r_offset', 0x000000000000054a)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 57
-// CHECK-NEXT: (('r_offset', 0x00000560)
+// CHECK-NEXT: (('r_offset', 0x0000000000000560)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000001b)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 58
-// CHECK-NEXT: (('r_offset', 0x0000057e)
+// CHECK-NEXT: (('r_offset', 0x000000000000057e)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000d)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 59
-// CHECK-NEXT: (('r_offset', 0x00000590)
+// CHECK-NEXT: (('r_offset', 0x0000000000000590)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000001c)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 60
-// CHECK-NEXT: (('r_offset', 0x000005ae)
+// CHECK-NEXT: (('r_offset', 0x00000000000005ae)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 61
-// CHECK-NEXT: (('r_offset', 0x000005c0)
+// CHECK-NEXT: (('r_offset', 0x00000000000005c0)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000001d)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 62
-// CHECK-NEXT: (('r_offset', 0x000005de)
+// CHECK-NEXT: (('r_offset', 0x00000000000005de)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 63
-// CHECK-NEXT: (('r_offset', 0x000005f4)
+// CHECK-NEXT: (('r_offset', 0x00000000000005f4)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000001e)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 64
-// CHECK-NEXT: (('r_offset', 0x00000612)
+// CHECK-NEXT: (('r_offset', 0x0000000000000612)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x0000000d)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 65
-// CHECK-NEXT: (('r_offset', 0x00000624)
+// CHECK-NEXT: (('r_offset', 0x0000000000000624)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000001f)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 66
-// CHECK-NEXT: (('r_offset', 0x00000642)
+// CHECK-NEXT: (('r_offset', 0x0000000000000642)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 67
-// CHECK-NEXT: (('r_offset', 0x00000654)
+// CHECK-NEXT: (('r_offset', 0x0000000000000654)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000020)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 68
-// CHECK-NEXT: (('r_offset', 0x00000672)
+// CHECK-NEXT: (('r_offset', 0x0000000000000672)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 69
-// CHECK-NEXT: (('r_offset', 0x00000688)
+// CHECK-NEXT: (('r_offset', 0x0000000000000688)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000021)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 70
-// CHECK-NEXT: (('r_offset', 0x000006a6)
+// CHECK-NEXT: (('r_offset', 0x00000000000006a6)
// CHECK-NEXT: ('r_sym', 0x00000029)
// CHECK-NEXT: ('r_type', 0x00000018)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 71
-// CHECK-NEXT: (('r_offset', 0x000006bc)
+// CHECK-NEXT: (('r_offset', 0x00000000000006bc)
// CHECK-NEXT: ('r_sym', 0x00000024)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000022)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index 2a23f9574e..d7acea6778 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -6,38 +6,38 @@
// CHECK: # Section 1
// CHECK-NEXT: (('sh_name', 0x0000001b) # '.group'
// CHECK-NEXT: ('sh_type', 0x00000011)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x0000000c)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x000000000000000c)
// CHECK-NEXT: ('sh_link', 0x0000000d)
// CHECK-NEXT: ('sh_info', 0x00000001)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000004)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000004)
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 2
// CHECK-NEXT: (('sh_name', 0x0000001b) # '.group'
// CHECK-NEXT: ('sh_type', 0x00000011)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x0000004c)
-// CHECK-NEXT: ('sh_size', 0x00000008)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x000000000000004c)
+// CHECK-NEXT: ('sh_size', 0x0000000000000008)
// CHECK-NEXT: ('sh_link', 0x0000000d)
// CHECK-NEXT: ('sh_info', 0x00000002)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000004)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000004)
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 3
// CHECK-NEXT: (('sh_name', 0x0000001b) # '.group'
// CHECK-NEXT: ('sh_type', 0x00000011)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000054)
-// CHECK-NEXT: ('sh_size', 0x00000008)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000054)
+// CHECK-NEXT: ('sh_size', 0x0000000000000008)
// CHECK-NEXT: ('sh_link', 0x0000000d)
// CHECK-NEXT: ('sh_info', 0x0000000d)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000004)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000004)
// CHECK-NEXT: ),
// Test that g1 and g2 are local, but g3 is an undefined global.
diff --git a/test/MC/ELF/common2.s b/test/MC/ELF/common2.s
index b48ca66b91..b13577d4a0 100644
--- a/test/MC/ELF/common2.s
+++ b/test/MC/ELF/common2.s
@@ -14,7 +14,7 @@
// CHECK-NEXT: ('sh_flags'
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000009)
+// CHECK-NEXT: ('sh_size', 0x0000000000000009)
// CHECK-NEXT: ('sh_link',
// CHECK-NEXT: ('sh_info',
// CHECK-NEXT: ('sh_addralign',
diff --git a/test/MC/ELF/debug-line.s b/test/MC/ELF/debug-line.s
index aa0197d0ce..fed816afcc 100644
--- a/test/MC/ELF/debug-line.s
+++ b/test/MC/ELF/debug-line.s
@@ -4,14 +4,14 @@
// CHECK: (('sh_name', 0x00000011) # '.debug_line'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000044)
-// CHECK-NEXT: ('sh_size', 0x00000037)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000044)
+// CHECK-NEXT: ('sh_size', 0x0000000000000037)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '33000000 02001c00 00000101 fb0e0d00 01010101 00000001 00000100 666f6f2e 63000000 00000009 02000000 00000000 00150204 000101')
.section .debug_line,"",@progbits
diff --git a/test/MC/ELF/debug-loc.s b/test/MC/ELF/debug-loc.s
index 675765547c..3eb3797f44 100644
--- a/test/MC/ELF/debug-loc.s
+++ b/test/MC/ELF/debug-loc.s
@@ -10,14 +10,14 @@
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x00000011) # '.debug_line'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000044)
-// CHECK-NEXT: ('sh_size', 0x0000003d)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000044)
+// CHECK-NEXT: ('sh_size', 0x000000000000003d)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
.section .debug_line,"",@progbits
diff --git a/test/MC/ELF/diff.s b/test/MC/ELF/diff.s
index 92927b69d0..4214fc7c03 100644
--- a/test/MC/ELF/diff.s
+++ b/test/MC/ELF/diff.s
@@ -9,7 +9,7 @@ zed:
mov zed+(bar-foo), %eax
// CHECK: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000005)
+// CHECK-NEXT: (('r_offset', 0x0000000000000005)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend', 0x0000000000000001)
diff --git a/test/MC/ELF/empty-dwarf-lines.s b/test/MC/ELF/empty-dwarf-lines.s
index d840e5ee1a..7baedbcfb8 100644
--- a/test/MC/ELF/empty-dwarf-lines.s
+++ b/test/MC/ELF/empty-dwarf-lines.s
@@ -10,12 +10,12 @@ c:
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.debug_line'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000044)
-// CHECK-NEXT: ('sh_size', 0x00000027)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000044)
+// CHECK-NEXT: ('sh_size', 0x0000000000000027)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
diff --git a/test/MC/ELF/empty.s b/test/MC/ELF/empty.s
index d98f0c6a96..b38a621054 100644
--- a/test/MC/ELF/empty.s
+++ b/test/MC/ELF/empty.s
@@ -5,66 +5,66 @@
// CHECK: ('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK: ('sh_name', 0x00000026) # '.data'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000003)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000003)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK: ('sh_name', 0x00000007) # '.bss'
// CHECK-NEXT: ('sh_type', 0x00000008)
-// CHECK-NEXT: ('sh_flags', 0x00000003)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000003)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK: ('sh_name', 0x0000000c) # '.shstrtab'
// CHECK-NEXT: ('sh_type', 0x00000003)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x0000002c)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x000000000000002c)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK: ('sh_name', 0x0000001e) # '.symtab'
// CHECK-NEXT: ('sh_type', 0x00000002)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000060)
+// CHECK-NEXT: ('sh_size', 0x0000000000000060)
// CHECK-NEXT: ('sh_link', 0x00000006)
// CHECK-NEXT: ('sh_info', 0x00000004)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK: ('sh_name', 0x00000016) # '.strtab'
// CHECK-NEXT: ('sh_type', 0x00000003)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000001)
+// CHECK-NEXT: ('sh_size', 0x0000000000000001)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
diff --git a/test/MC/ELF/entsize.ll b/test/MC/ELF/entsize.ll
index 74f0413ecb..dce6dbaa2a 100644
--- a/test/MC/ELF/entsize.ll
+++ b/test/MC/ELF/entsize.ll
@@ -22,23 +22,23 @@ declare void @foo(i64* nocapture) nounwind
; 64: (('sh_name', 0x0000004e) # '.rodata.str1.1'
; 64-NEXT: ('sh_type', 0x00000001)
-; 64-NEXT: ('sh_flags', 0x00000032)
+; 64-NEXT: ('sh_flags', 0x0000000000000032)
; 64-NEXT: ('sh_addr',
; 64-NEXT: ('sh_offset',
-; 64-NEXT: ('sh_size', 0x0000000d)
+; 64-NEXT: ('sh_size', 0x000000000000000d)
; 64-NEXT: ('sh_link',
; 64-NEXT: ('sh_info',
-; 64-NEXT: ('sh_addralign', 0x00000001)
-; 64-NEXT: ('sh_entsize', 0x00000001)
+; 64-NEXT: ('sh_addralign', 0x0000000000000001)
+; 64-NEXT: ('sh_entsize', 0x0000000000000001)
; 64: (('sh_name', 0x00000041) # '.rodata.cst8'
; 64-NEXT: ('sh_type', 0x00000001)
-; 64-NEXT: ('sh_flags', 0x00000012)
+; 64-NEXT: ('sh_flags', 0x0000000000000012)
; 64-NEXT: ('sh_addr',
; 64-NEXT: ('sh_offset',
-; 64-NEXT: ('sh_size', 0x00000010)
+; 64-NEXT: ('sh_size', 0x0000000000000010)
; 64-NEXT: ('sh_link',
; 64-NEXT: ('sh_info',
-; 64-NEXT: ('sh_addralign', 0x00000008)
-; 64-NEXT: ('sh_entsize', 0x00000008)
+; 64-NEXT: ('sh_addralign', 0x0000000000000008)
+; 64-NEXT: ('sh_entsize', 0x0000000000000008)
diff --git a/test/MC/ELF/entsize.s b/test/MC/ELF/entsize.s
index 6b6a7d792a..4645686b6d 100644
--- a/test/MC/ELF/entsize.s
+++ b/test/MC/ELF/entsize.s
@@ -35,35 +35,35 @@
// CHECK: # Section 4
// CHECK-NEXT: ('sh_name', 0x00000048) # '.rodata.str1.1'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000032)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000032)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x0000000d)
+// CHECK-NEXT: ('sh_size', 0x000000000000000d)
// CHECK-NEXT: ('sh_link',
// CHECK-NEXT: ('sh_info',
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000001)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000001)
// CHECK: # Section 5
// CHECK-NEXT: ('sh_name', 0x00000039) # '.rodata.str2.1'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000032)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000032)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000010)
+// CHECK-NEXT: ('sh_size', 0x0000000000000010)
// CHECK-NEXT: ('sh_link',
// CHECK-NEXT: ('sh_info',
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000002)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000002)
// CHECK: # Section 6
// CHECK-NEXT: ('sh_name', 0x0000002c) # '.rodata.cst8
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000012)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000012)
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset',
-// CHECK-NEXT: ('sh_size', 0x00000010)
+// CHECK-NEXT: ('sh_size', 0x0000000000000010)
// CHECK-NEXT: ('sh_link',
// CHECK-NEXT: ('sh_info',
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000008)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000008)
diff --git a/test/MC/ELF/ident.s b/test/MC/ELF/ident.s
index b364d6007f..56af19a307 100644
--- a/test/MC/ELF/ident.s
+++ b/test/MC/ELF/ident.s
@@ -2,14 +2,14 @@
// CHECK: (('sh_name', 0x00000007) # '.comment'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000030)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x0000000d)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000030)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x000000000000000d)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000001)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000001)
// CHECK-NEXT: ('_section_data', '00666f6f 00626172 007a6564 00')
.ident "foo"
diff --git a/test/MC/ELF/leb128.s b/test/MC/ELF/leb128.s
index e5f31f4834..f6daac8ace 100644
--- a/test/MC/ELF/leb128.s
+++ b/test/MC/ELF/leb128.s
@@ -8,12 +8,12 @@
// CHECK: (('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000081)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000081)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '817f7f90 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90909090 90')
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index c5cf0697a3..11a80ad035 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -65,7 +65,7 @@ foo:
// Relocation 5 refers to symbol 8
// CHECK-NEXT: # Relocation 5
-// CHECK-NEXT: (('r_offset', 0x00000023)
+// CHECK-NEXT: (('r_offset', 0x0000000000000023)
// CHECK-NEXT: ('r_sym', 0x00000008)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/n_bytes.s b/test/MC/ELF/n_bytes.s
index ec5816ddcd..de6632232c 100644
--- a/test/MC/ELF/n_bytes.s
+++ b/test/MC/ELF/n_bytes.s
@@ -8,13 +8,13 @@
// CHECK: # Section 1
// CHECK-NEXT: (('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000048)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000048)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', '2a000100 02000300 2a000000 01000000 02000000 03000000 2a000000 00000000 01000000 00000000 02000000 00000000 03000000 00000000 2a000000 01000000 02000000 03000000')
// CHECK-NEXT: ),
diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s
index 1e57315b00..d8b7b32338 100644
--- a/test/MC/ELF/noexec.s
+++ b/test/MC/ELF/noexec.s
@@ -3,14 +3,14 @@
// CHECK: # Section 4
// CHECK-NEXT: (('sh_name', 0x0000000c) # '.note.GNU-stack'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK: # Symbol 4
diff --git a/test/MC/ELF/norelocation.s b/test/MC/ELF/norelocation.s
index 0a0efe1ed6..c6394791ad 100644
--- a/test/MC/ELF/norelocation.s
+++ b/test/MC/ELF/norelocation.s
@@ -5,14 +5,14 @@ bar:
// CHECK: ('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000005)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000005)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', 'e8000000 00')
// CHECK-NOT: .rela.text
// CHECK: shstrtab
diff --git a/test/MC/ELF/org.s b/test/MC/ELF/org.s
index c073fa5d80..3afc364b21 100644
--- a/test/MC/ELF/org.s
+++ b/test/MC/ELF/org.s
@@ -10,4 +10,4 @@ foo:
// CHECK-NEXT: ('sh_flags',
// CHECK-NEXT: ('sh_addr',
// CHECK-NEXT: ('sh_offset'
-// CHECK-NEXT: ('sh_size', 0x00000014)
+// CHECK-NEXT: ('sh_size', 0x0000000000000014)
diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index e5313af543..2c68f6cc71 100644
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -2,7 +2,7 @@
// CHECK: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x0000000c)
+// CHECK-NEXT: (('r_offset', 0x000000000000000c)
// CHECK-NEXT: ('r_sym', 0x00000005)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000008)
diff --git a/test/MC/ELF/relax.s b/test/MC/ELF/relax.s
index f86dc5c064..0b5d24f0f7 100644
--- a/test/MC/ELF/relax.s
+++ b/test/MC/ELF/relax.s
@@ -13,14 +13,14 @@ foo:
// CHECK: ('sh_name', 0x00000001) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000006)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000006)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ('_section_data', 'ebfeebfc ebfa')
// CHECK: # Symbol 6
diff --git a/test/MC/ELF/relocation-pc.s b/test/MC/ELF/relocation-pc.s
index 7a44da1785..b6279c3e55 100644
--- a/test/MC/ELF/relocation-pc.s
+++ b/test/MC/ELF/relocation-pc.s
@@ -8,23 +8,23 @@
// CHECK: # Section 2
// CHECK-NEXT: (('sh_name', 0x00000001) # '.rela.text'
// CHECK-NEXT: ('sh_type', 0x00000004)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x000002e8)
-// CHECK-NEXT: ('sh_size', 0x00000030)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x00000000000002e8)
+// CHECK-NEXT: ('sh_size', 0x0000000000000030)
// CHECK-NEXT: ('sh_link', 0x00000006)
// CHECK-NEXT: ('sh_info', 0x00000001)
-// CHECK-NEXT: ('sh_addralign', 0x00000008)
-// CHECK-NEXT: ('sh_entsize', 0x00000018)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000008)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000018)
// CHECK-NEXT: ('_relocations', [
// CHECK-NEXT: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000001)
+// CHECK-NEXT: (('r_offset', 0x0000000000000001)
// CHECK-NEXT: ('r_sym', 0x00000000)
// CHECK-NEXT: ('r_type', 0x0000000f)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 1
-// CHECK-NEXT: (('r_offset', 0x00000003)
+// CHECK-NEXT: (('r_offset', 0x0000000000000003)
// CHECK-NEXT: ('r_sym', 0x00000000)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index ff53599d41..5db213bc04 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -24,91 +24,91 @@ bar:
// CHECK: (('sh_name', 0x00000006) # '.text'
// CHECK: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000001)
+// CHECK-NEXT: (('r_offset', 0x0000000000000001)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend',
// CHECK: # Relocation 1
-// CHECK-NEXT: (('r_offset', 0x00000008)
+// CHECK-NEXT: (('r_offset', 0x0000000000000008)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend',
// CHECK: # Relocation 2
-// CHECK-NEXT: (('r_offset', 0x00000013)
+// CHECK-NEXT: (('r_offset', 0x0000000000000013)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend',
// CHECK: # Relocation 3
-// CHECK-NEXT: (('r_offset', 0x0000001a)
+// CHECK-NEXT: (('r_offset', 0x000000000000001a)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend',
// CHECK: # Relocation 4
-// CHECK-NEXT: (('r_offset', 0x00000022)
+// CHECK-NEXT: (('r_offset', 0x0000000000000022)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend',
// CHECK: # Relocation 5
-// CHECK-NEXT: (('r_offset', 0x00000026)
+// CHECK-NEXT: (('r_offset', 0x0000000000000026)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend',
// CHECK: # Relocation 6
-// CHECK-NEXT: (('r_offset', 0x0000002d)
+// CHECK-NEXT: (('r_offset', 0x000000000000002d)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000016)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
// CHECK: # Relocation 7
-// CHECK-NEXT: (('r_offset', 0x00000034)
+// CHECK-NEXT: (('r_offset', 0x0000000000000034)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000013)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
// CHECK: # Relocation 8
-// CHECK-NEXT: (('r_offset', 0x0000003b)
+// CHECK-NEXT: (('r_offset', 0x000000000000003b)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000017)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK: # Relocation 9
-// CHECK-NEXT: (('r_offset', 0x00000042)
+// CHECK-NEXT: (('r_offset', 0x0000000000000042)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000014)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
// CHECK: # Relocation 10
-// CHECK-NEXT: (('r_offset', 0x00000049)
+// CHECK-NEXT: (('r_offset', 0x0000000000000049)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000015)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK: # Relocation 11
-// CHECK-NEXT: (('r_offset', 0x0000004e)
+// CHECK-NEXT: (('r_offset', 0x000000000000004e)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK: # Relocation 12
-// CHECK-NEXT: (('r_offset', 0x00000055)
+// CHECK-NEXT: (('r_offset', 0x0000000000000055)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
// CHECK: # Relocation 13
-// CHECK-NEXT: (('r_offset', 0x0000005c)
+// CHECK-NEXT: (('r_offset', 0x000000000000005c)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0x000000000000005c)
// CHECK: # Relocation 14
-// CHECK-NEXT: (('r_offset', 0x00000063)
+// CHECK-NEXT: (('r_offset', 0x0000000000000063)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000b)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index b004f608cd..241aa05ecb 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -19,18 +19,18 @@ defined3:
// CHECK: # Section 1
// CHECK-NEXT: (('sh_name', 0x00000006) # '.text'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000040)
-// CHECK-NEXT: ('sh_size', 0x00000004)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000040)
+// CHECK-NEXT: ('sh_size', 0x0000000000000004)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000004)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000004)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// The relocation uses symbol 2
// CHECK: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000000)
+// CHECK-NEXT: (('r_offset', 0x0000000000000000)
// CHECK-NEXT: ('r_sym', 0x00000002)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/section.s b/test/MC/ELF/section.s
index f39da29681..c71e1a72c4 100644
--- a/test/MC/ELF/section.s
+++ b/test/MC/ELF/section.s
@@ -21,63 +21,63 @@
// CHECK: (('sh_name', 0x00000012) # '.init'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 11
// CHECK-NEXT: (('sh_name', 0x00000048) # '.fini'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000006)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000006)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 12
// CHECK-NEXT: (('sh_name', 0x00000076) # '.rodata'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Section 13
// CHECK-NEXT: (('sh_name', 0x00000058) # 'zed'
// CHECK-NEXT: ('sh_type', 0x00000001)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
.section .note.test,"",@note
// CHECK: (('sh_name', 0x00000007) # '.note.test'
// CHECK-NEXT: ('sh_type', 0x00000007)
-// CHECK-NEXT: ('sh_flags', 0x00000000)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000000)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// Test that we can parse these
@@ -92,14 +92,14 @@ bar:
// CHECK: (('sh_name', 0x0000004e) # '.eh_frame'
// CHECK-NEXT: ('sh_type', 0x70000001)
-// CHECK-NEXT: ('sh_flags', 0x00000002)
-// CHECK-NEXT: ('sh_addr', 0x00000000)
-// CHECK-NEXT: ('sh_offset', 0x00000050)
-// CHECK-NEXT: ('sh_size', 0x00000000)
+// CHECK-NEXT: ('sh_flags', 0x0000000000000002)
+// CHECK-NEXT: ('sh_addr', 0x0000000000000000)
+// CHECK-NEXT: ('sh_offset', 0x0000000000000050)
+// CHECK-NEXT: ('sh_size', 0x0000000000000000)
// CHECK-NEXT: ('sh_link', 0x00000000)
// CHECK-NEXT: ('sh_info', 0x00000000)
-// CHECK-NEXT: ('sh_addralign', 0x00000001)
-// CHECK-NEXT: ('sh_entsize', 0x00000000)
+// CHECK-NEXT: ('sh_addralign', 0x0000000000000001)
+// CHECK-NEXT: ('sh_entsize', 0x0000000000000000)
// CHECK-NEXT: ),
// Test that we handle the strings like gas
diff --git a/test/MC/ELF/symref.s b/test/MC/ELF/symref.s
index e890911305..2dfa058ab0 100644
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -23,31 +23,31 @@ global1:
// CHECK: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000000)
+// CHECK-NEXT: (('r_offset', 0x0000000000000000)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 1
-// CHECK-NEXT: (('r_offset', 0x00000004)
+// CHECK-NEXT: (('r_offset', 0x0000000000000004)
// CHECK-NEXT: ('r_sym', 0x0000000b)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 2
-// CHECK-NEXT: (('r_offset', 0x00000008)
+// CHECK-NEXT: (('r_offset', 0x0000000000000008)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 3
-// CHECK-NEXT: (('r_offset', 0x0000000c)
+// CHECK-NEXT: (('r_offset', 0x000000000000000c)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 4
-// CHECK-NEXT: (('r_offset', 0x00000010)
+// CHECK-NEXT: (('r_offset', 0x0000000000000010)
// CHECK-NEXT: ('r_sym', 0x0000000c)
// CHECK-NEXT: ('r_type', 0x0000000a)
// CHECK-NEXT: ('r_addend', 0x0000000000000000)
diff --git a/test/MC/ELF/weak-relocation.s b/test/MC/ELF/weak-relocation.s
index 57714a1ec2..88e841e65b 100644
--- a/test/MC/ELF/weak-relocation.s
+++ b/test/MC/ELF/weak-relocation.s
@@ -8,7 +8,7 @@ bar:
call foo
//CHECK: # Relocation 0
-//CHECK-NEXT: (('r_offset', 0x00000001)
+//CHECK-NEXT: (('r_offset', 0x0000000000000001)
//CHECK-NEXT: ('r_sym', 0x00000005)
//CHECK-NEXT: ('r_type', 0x00000002)
//CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s
index a01c72a487..4bbf2645a8 100644
--- a/test/MC/ELF/weakref-reloc.s
+++ b/test/MC/ELF/weakref-reloc.s
@@ -8,13 +8,13 @@
call bar
// CHECK: # Relocation 0
-// CHECK-NEXT: (('r_offset', 0x00000001)
+// CHECK-NEXT: (('r_offset', 0x0000000000000001)
// CHECK-NEXT: ('r_sym', 0x00000006)
// CHECK-NEXT: ('r_type', 0x00000004)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
// CHECK-NEXT: ),
// CHECK-NEXT: # Relocation 1
-// CHECK-NEXT: (('r_offset', 0x00000006)
+// CHECK-NEXT: (('r_offset', 0x0000000000000006)
// CHECK-NEXT: ('r_sym', 0x00000005)
// CHECK-NEXT: ('r_type', 0x00000002)
// CHECK-NEXT: ('r_addend', 0xfffffffffffffffc)
diff --git a/test/MC/ELF/x86_64-reloc-sizetest.s b/test/MC/ELF/x86_64-reloc-sizetest.s
index 1e327f8188..acca2f5076 100644
--- a/test/MC/ELF/x86_64-reloc-sizetest.s
+++ b/test/MC/ELF/x86_64-reloc-sizetest.s
@@ -7,7 +7,7 @@ L: movq $(L + 2147483648),%rax
// CHECK: Relocation 0
-// CHECK-NEXT: 'r_offset', 0x00000003
-// CHECK-NEXT: 'r_sym'
-// CHECK-NEXT: 'r_type', 0x0000000b
-// CHECK-NEXT: 'r_addend', 0x0000000080000000
+// CHECK-NEXT: ('r_offset', 0x0000000000000003)
+// CHECK-NEXT: ('r_sym'
+// CHECK-NEXT: ('r_type', 0x0000000b)
+// CHECK-NEXT: ('r_addend', 0x0000000080000000
diff --git a/test/MC/ELF/zero.s b/test/MC/ELF/zero.s
index adf21f8a6b..46ffe17cfb 100644
--- a/test/MC/ELF/zero.s
+++ b/test/MC/ELF/zero.s
@@ -5,12 +5,12 @@
// CHECK: ('sh_name', 0x00000001) # '.text'
// CHECK: ('sh_type', 0x00000001)
-// CHECK: ('sh_flags', 0x00000006)
-// CHECK: ('sh_addr', 0x00000000)
-// CHECK: ('sh_offset', 0x00000040)
-// CHECK: ('sh_size', 0x00000005)
+// CHECK: ('sh_flags', 0x0000000000000006)
+// CHECK: ('sh_addr', 0x0000000000000000)
+// CHECK: ('sh_offset', 0x0000000000000040)
+// CHECK: ('sh_size', 0x0000000000000005)
// CHECK: ('sh_link', 0x00000000)
// CHECK: ('sh_info', 0x00000000)
-// CHECK: ('sh_addralign', 0x00000004)
-// CHECK: ('sh_entsize', 0x00000000)
+// CHECK: ('sh_addralign', 0x0000000000000004)
+// CHECK: ('sh_entsize', 0x0000000000000000)
// CHECK: ('_section_data', '00000000 2a')
diff --git a/test/Scripts/common_dump.py b/test/Scripts/common_dump.py
index cd0c493451..fd58993c05 100644
--- a/test/Scripts/common_dump.py
+++ b/test/Scripts/common_dump.py
@@ -31,7 +31,7 @@ def dataToHexUnified(d):
return ''.join(bytes).strip()
-def HexDump(val, numBits=32):
+def HexDump(valPair):
"""
1. do not print 'L'
2. Handle negatives and large numbers by mod (2^numBits)
@@ -40,6 +40,7 @@ def HexDump(val, numBits=32):
4. Do print 0x Why?
so that they can be easily distinguished using sed/rx
"""
+ val, numBits = valPair
assert 0 <= val < (1 << numBits)
val = val & (( 1 << numBits) - 1)
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index bc6ed80592..58ca177328 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -26,16 +26,16 @@ class Reader:
return data
def read8(self):
- return ord(self.read(1))
+ return (ord(self.read(1)), 8)
def read16(self):
- return struct.unpack('><'[self.isLSB] + 'H', self.read(2))[0]
+ return (struct.unpack('><'[self.isLSB] + 'H', self.read(2))[0], 16)
def read32(self):
- return struct.unpack('><'[self.isLSB] + 'I', self.read(4))[0]
+ return (struct.unpack('><'[self.isLSB] + 'I', self.read(4))[0], 32)
def read64(self):
- return struct.unpack('><'[self.isLSB] + 'Q', self.read(8))[0]
+ return (struct.unpack('><'[self.isLSB] + 'Q', self.read(8))[0], 64)
def readWord(self):
if self.is64Bit:
@@ -65,7 +65,7 @@ class Section:
self.sh_entsize = f.readWord()
def dump(self, shstrtab, f, strtab, dumpdata):
- print " (('sh_name', %s)" % common_dump.HexDump(self.sh_name), "# %r" % shstrtab[self.sh_name]
+ print " (('sh_name', %s)" % common_dump.HexDump(self.sh_name), "# %r" % shstrtab[self.sh_name[0]]
print " ('sh_type', %s)" % common_dump.HexDump(self.sh_type)
print " ('sh_flags', %s)" % common_dump.HexDump(self.sh_flags)
print " ('sh_addr', %s)" % common_dump.HexDump(self.sh_addr)
@@ -75,69 +75,64 @@ class Section:
print " ('sh_info', %s)" % common_dump.HexDump(self.sh_info)
print " ('sh_addralign', %s)" % common_dump.HexDump(self.sh_addralign)
print " ('sh_entsize', %s)" % common_dump.HexDump(self.sh_entsize)
- if self.sh_type == 2: # SHT_SYMTAB
+ if self.sh_type[0] == 2: # SHT_SYMTAB
print " ('_symbols', ["
dumpSymtab(f, self, strtab)
print " ])"
- elif self.sh_type == 4 or self.sh_type == 9: # SHT_RELA / SHT_REL
+ elif self.sh_type[0] == 4 or self.sh_type[0] == 9: # SHT_RELA / SHT_REL
print " ('_relocations', ["
- dumpRel(f, self, self.sh_type == 4)
+ dumpRel(f, self, self.sh_type[0] == 4)
print " ])"
elif dumpdata:
- f.seek(self.sh_offset)
+ f.seek(self.sh_offset[0])
if self.sh_type != 8: # != SHT_NOBITS
- data = f.read(self.sh_size)
+ data = f.read(self.sh_size[0])
print " ('_section_data', '%s')" % common_dump.dataToHex(data)
else:
print " ('_section_data', '')"
print " ),"
def dumpSymtab(f, section, strtab):
- entries = section.sh_size // section.sh_entsize
+ entries = section.sh_size[0] // section.sh_entsize[0]
for index in range(entries):
- f.seek(section.sh_offset + index * section.sh_entsize)
+ f.seek(section.sh_offset[0] + index * section.sh_entsize[0])
print " # Symbol %s" % index
name = f.read32()
- print " (('st_name', %s)" % common_dump.HexDump(name), "# %r" % strtab[name]
+ print " (('st_name', %s)" % common_dump.HexDump(name), "# %r" % strtab[name[0]]
if not f.is64Bit:
print " ('st_value', %s)" % common_dump.HexDump(f.read32())
print " ('st_size', %s)" % common_dump.HexDump(f.read32())
- st_info = f.read8()
+ st_info = f.read8()[0]
st_bind = (st_info >> 4, 4)
st_type = (st_info & 0xf, 4)
- print " ('st_bind', %s)" % common_dump.HexDump(st_bind[0], st_bind[1])
- print " ('st_type', %s)" % common_dump.HexDump(st_type[0], st_type[1])
- print " ('st_other', %s)" % common_dump.HexDump(f.read8(), 8)
- print " ('st_shndx', %s)" % common_dump.HexDump(f.read16(), 16)
+ print " ('st_bind', %s)" % common_dump.HexDump(st_bind)
+ print " ('st_type', %s)" % common_dump.HexDump(st_type)
+ print " ('st_other', %s)" % common_dump.HexDump(f.read8())
+ print " ('st_shndx', %s)" % common_dump.HexDump(f.read16())
if f.is64Bit:
- print " ('st_value', %s)" % common_dump.HexDump(f.read64(), 64)
- print " ('st_size', %s)" % common_dump.HexDump(f.read64(), 64)
+ print " ('st_value', %s)" % common_dump.HexDump(f.read64())
+ print " ('st_size', %s)" % common_dump.HexDump(f.read64())
print " ),"
def dumpRel(f, section, dumprela = False):
- entries = section.sh_size // section.sh_entsize
+ entries = section.sh_size[0] // section.sh_entsize[0]
for index in range(entries):
- f.seek(section.sh_offset + index * section.sh_entsize)
+ f.seek(section.sh_offset[0] + index * section.sh_entsize[0])
print " # Relocation %s" % index
print " (('r_offset', %s)" % common_dump.HexDump(f.readWord())
- r_info = f.readWord()
+ r_info = f.readWord()[0]
if f.is64Bit:
r_sym = (r_info >> 32, 32)
r_type = (r_info & 0xffffffff, 32)
else:
r_sym = (r_info >> 8, 24)
r_type = (r_info & 0xff, 8)
- print " ('r_sym', %s)" % common_dump.HexDump(r_sym[0], r_sym[1])
- print " ('r_type', %s)" % common_dump.HexDump(r_type[0], r_type[1])
+ print " ('r_sym', %s)" % common_dump.HexDump(r_sym)
+ print " ('r_type', %s)" % common_dump.HexDump(r_type)
if dumprela:
- val = f.readWord()
- if f.is64Bit:
- numBits = 64
- else:
- numBits = 32
- print " ('r_addend', %s)" % common_dump.HexDump(val, numBits)
+ print " ('r_addend', %s)" % common_dump.HexDump(f.readWord())
print " ),"
def dumpELF(path, opts):
@@ -147,18 +142,18 @@ def dumpELF(path, opts):
assert magic == '\x7FELF'
fileclass = f.read8()
- if fileclass == 1: # ELFCLASS32
+ if fileclass[0] == 1: # ELFCLASS32
f.is64Bit = False
- elif fileclass == 2: # ELFCLASS64
+ elif fileclass[0] == 2: # ELFCLASS64
f.is64Bit = True
else:
raise ValueError, "Unknown file class %s" % common_dump.HexDump(fileclass)
print "('e_indent[EI_CLASS]', %s)" % common_dump.HexDump(fileclass)
byteordering = f.read8()
- if byteordering == 1: # ELFDATA2LSB
+ if byteordering[0] == 1: # ELFDATA2LSB
f.isLSB = True
- elif byteordering == 2: # ELFDATA2MSB
+ elif byteordering[0] == 2: # ELFDATA2MSB
f.isLSB = False
else:
raise ValueError, "Unknown byte ordering %s" % common_dump.HexDump(byteordering)
@@ -190,25 +185,25 @@ def dumpELF(path, opts):
# Read all section headers
sections = []
- for index in range(e_shnum):
- f.seek(e_shoff + index * e_shentsize)
+ for index in range(e_shnum[0]):
+ f.seek(e_shoff[0] + index * e_shentsize[0])
s = Section(f)
sections.append(s)
# Read .shstrtab so we can resolve section names
- f.seek(sections[e_shstrndx].sh_offset)
- shstrtab = StringTable(f.read(sections[e_shstrndx].sh_size))
+ f.seek(sections[e_shstrndx[0]].sh_offset[0])
+ shstrtab = StringTable(f.read(sections[e_shstrndx[0]].sh_size[0]))
# Get the symbol string table
strtab = None
for section in sections:
- if shstrtab[section.sh_name] == ".strtab":
- f.seek(section.sh_offset)
- strtab = StringTable(f.read(section.sh_size))
+ if shstrtab[section.sh_name[0]] == ".strtab":
+ f.seek(section.sh_offset[0])
+ strtab = StringTable(f.read(section.sh_size[0]))
break
print "('_sections', ["
- for index in range(e_shnum):
+ for index in range(e_shnum[0]):
print " # Section %s" % index
sections[index].dump(shstrtab, f, strtab, opts.dumpSectionData)
print "])"