From 9974b8b3cb49eb937cb148c4199e0d456186c3ca Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 7 Apr 2011 23:51:25 +0000
Subject: [PATCH] Update tests

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129116 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/MC/AsmParser/section.s        | 10 +++++-----
 test/MC/ELF/align-bss.s            |  2 +-
 test/MC/ELF/align-nops.s           |  2 +-
 test/MC/ELF/align.s                |  4 ++--
 test/MC/ELF/cfi-advance-loc2.s     |  6 +++---
 test/MC/ELF/cfi-def-cfa-offset.s   |  6 +++---
 test/MC/ELF/cfi-def-cfa-register.s |  6 +++---
 test/MC/ELF/cfi-def-cfa.s          |  6 +++---
 test/MC/ELF/cfi-offset.s           |  6 +++---
 test/MC/ELF/cfi-remember.s         |  6 +++---
 test/MC/ELF/cfi-zero-addr-delta.s  |  6 +++---
 test/MC/ELF/cfi.s                  |  6 +++---
 test/MC/ELF/comdat.s               |  6 +++---
 test/MC/ELF/common2.s              |  2 +-
 test/MC/ELF/debug-line.s           |  2 +-
 test/MC/ELF/debug-loc.s            |  2 +-
 test/MC/ELF/empty-dwarf-lines.s    |  2 +-
 test/MC/ELF/empty.s                | 10 +++++-----
 test/MC/ELF/entsize.ll             |  4 ++--
 test/MC/ELF/entsize.s              |  6 +++---
 test/MC/ELF/global-offset.s        |  2 +-
 test/MC/ELF/ident.s                |  2 +-
 test/MC/ELF/merge.s                |  2 +-
 test/MC/ELF/noexec.s               |  2 +-
 test/MC/ELF/relocation-386.s       |  2 +-
 test/MC/ELF/relocation-pc.s        |  2 +-
 test/MC/ELF/relocation.s           |  2 +-
 test/MC/ELF/rename.s               |  2 +-
 test/MC/ELF/section.s              | 24 ++++++++++++------------
 test/MC/ELF/undef2.s               |  2 +-
 30 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/test/MC/AsmParser/section.s b/test/MC/AsmParser/section.s
index 414fc6d5397..5abacc70135 100644
--- a/test/MC/AsmParser/section.s
+++ b/test/MC/AsmParser/section.s
@@ -45,7 +45,7 @@
 .previous
 .byte 1
 .previous
-# CHECK:       (('sh_name', 0x00000012) # 'test1'
+# CHECK:       (('sh_name', 0x00000044) # 'test1'
 # CHECK-NEXT:   ('sh_type', 0x00000001)
 # CHECK-NEXT:   ('sh_flags', 0x00000000)
 # CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -57,7 +57,7 @@
 # CHECK-NEXT:   ('sh_entsize', 0x00000000)
 # CHECK-NEXT:   ('_section_data', '01010101 010101')
 # CHECK-NEXT:  ),
-# CHECK:       (('sh_name', 0x00000018) # 'test2'
+# CHECK:       (('sh_name', 0x0000003e) # 'test2'
 # CHECK-NEXT:   ('sh_type', 0x00000001)
 # CHECK-NEXT:   ('sh_flags', 0x00000000)
 # CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -69,7 +69,7 @@
 # CHECK-NEXT:   ('sh_entsize', 0x00000000)
 # CHECK-NEXT:   ('_section_data', '02020202 0202')
 # CHECK-NEXT:  ),
-# CHECK:       (('sh_name', 0x0000001e) # 'test3'
+# CHECK:       (('sh_name', 0x00000038) # 'test3'
 # CHECK-NEXT:   ('sh_type', 0x00000001)
 # CHECK-NEXT:   ('sh_flags', 0x00000000)
 # CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -81,7 +81,7 @@
 # CHECK-NEXT:   ('sh_entsize', 0x00000000)
 # CHECK-NEXT:   ('_section_data', '03030303 03')
 # CHECK-NEXT:  ),
-# CHECK:       (('sh_name', 0x00000024) # 'test4'
+# CHECK:       (('sh_name', 0x00000032) # 'test4'
 # CHECK-NEXT:   ('sh_type', 0x00000001)
 # CHECK-NEXT:   ('sh_flags', 0x00000000)
 # CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -93,7 +93,7 @@
 # CHECK-NEXT:   ('sh_entsize', 0x00000000)
 # CHECK-NEXT:   ('_section_data', '040404')
 # CHECK-NEXT:  ),
-# CHECK:       (('sh_name', 0x0000002a) # 'test5'
+# CHECK:       (('sh_name', 0x0000002c) # 'test5'
 # CHECK-NEXT:   ('sh_type', 0x00000001)
 # CHECK-NEXT:   ('sh_flags', 0x00000000)
 # CHECK-NEXT:   ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/align-bss.s b/test/MC/ELF/align-bss.s
index 4f73a29f8e2..ca6da9184e8 100644
--- a/test/MC/ELF/align-bss.s
+++ b/test/MC/ELF/align-bss.s
@@ -5,7 +5,7 @@
 	.local	foo
 	.comm	foo,2048,16
 
-// CHECK:        ('sh_name', 0x0000000d) # '.bss'
+// CHECK:        ('sh_name', 0x00000007) # '.bss'
 // CHECK-NEXT:   ('sh_type', 0x00000008)
 // CHECK-NEXT:   ('sh_flags', 0x00000003)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/align-nops.s b/test/MC/ELF/align-nops.s
index 28d4b895f5d..d29cb5b5e31 100644
--- a/test/MC/ELF/align-nops.s
+++ b/test/MC/ELF/align-nops.s
@@ -27,7 +27,7 @@ f0:
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT:  ('_section_data', '00000000 0f1f4000 00000000 0f1f4000')
 
-// CHECK: (('sh_name', 0x00000007) # '.data'
+// CHECK: (('sh_name', 0x00000026) # '.data'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000003)
 // CHECK-NEXT:  ('sh_addr',
diff --git a/test/MC/ELF/align.s b/test/MC/ELF/align.s
index c3912a7c67b..c1e7086b8e6 100644
--- a/test/MC/ELF/align.s
+++ b/test/MC/ELF/align.s
@@ -8,7 +8,7 @@
 	.align	8
 
 // CHECK: # Section 0x00000003
-// CHECK-NEXT:  (('sh_name', 0x0000000d) # '.bss'
+// CHECK-NEXT:  (('sh_name', 0x00000007) # '.bss'
 // CHECK-NEXT:   ('sh_type', 0x00000008)
 // CHECK-NEXT:   ('sh_flags', 0x00000003)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -20,7 +20,7 @@
 // CHECK-NEXT:   ('sh_entsize', 0x00000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Section 0x00000004
-// CHECK-NEXT:  (('sh_name', 0x00000012) # '.rodata'
+// CHECK-NEXT:  (('sh_name', 0x00000026) # '.rodata'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/cfi-advance-loc2.s b/test/MC/ELF/cfi-advance-loc2.s
index 0b5f5b1adb9..163e81022dd 100644
--- a/test/MC/ELF/cfi-advance-loc2.s
+++ b/test/MC/ELF/cfi-advance-loc2.s
@@ -10,7 +10,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:      (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK:      (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -24,11 +24,11 @@ f:
 // CHECK-NEXT: ),
 
 
-// CHECK:      (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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', 0x00000498)
+// CHECK-NEXT:  ('sh_offset', 0x00000490)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi-def-cfa-offset.s b/test/MC/ELF/cfi-def-cfa-offset.s
index 38e35945e53..124d02e95df 100644
--- a/test/MC/ELF/cfi-def-cfa-offset.s
+++ b/test/MC/ELF/cfi-def-cfa-offset.s
@@ -11,7 +11,7 @@ f:
 	.cfi_endproc
 
 // CHECK:      # Section 0x00000004
-// CHECK-NEXT: (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -25,11 +25,11 @@ f:
 // CHECK-NEXT: ),
 
 // CHECK:       # Section 0x00000005
-// CHECK-NEXT: (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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_offset', 0x00000398)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi-def-cfa-register.s b/test/MC/ELF/cfi-def-cfa-register.s
index 0122eba42fe..75311e2e844 100644
--- a/test/MC/ELF/cfi-def-cfa-register.s
+++ b/test/MC/ELF/cfi-def-cfa-register.s
@@ -7,7 +7,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:      (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK:      (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -20,11 +20,11 @@ f:
 // CHECK-NEXT:  ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 14000000 1c000000 00000000 02000000 00410d06 00000000')
 // CHECK-NEXT: ),
 
-// CHECK:      (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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_offset', 0x00000390)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi-def-cfa.s b/test/MC/ELF/cfi-def-cfa.s
index acc0b4fad9c..53a169c09dd 100644
--- a/test/MC/ELF/cfi-def-cfa.s
+++ b/test/MC/ELF/cfi-def-cfa.s
@@ -7,7 +7,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:      (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK:      (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -21,11 +21,11 @@ f:
 // CHECK-NEXT: ),
 
 
-// CHECK:      (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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_offset', 0x00000390)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi-offset.s b/test/MC/ELF/cfi-offset.s
index 4152a71e0d2..963a76c1fca 100644
--- a/test/MC/ELF/cfi-offset.s
+++ b/test/MC/ELF/cfi-offset.s
@@ -7,7 +7,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:      (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK:      (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -21,11 +21,11 @@ f:
 // CHECK-NEXT: ),
 
 
-// CHECK:      (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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_offset', 0x00000390)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi-remember.s b/test/MC/ELF/cfi-remember.s
index c282e6f0b8a..814812e2aaa 100644
--- a/test/MC/ELF/cfi-remember.s
+++ b/test/MC/ELF/cfi-remember.s
@@ -10,7 +10,7 @@ f:
 	.cfi_endproc
 
 // CHECK:      # Section 0x00000004
-// CHECK-NEXT: (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -24,11 +24,11 @@ f:
 // CHECK-NEXT: ),
 
 // CHECK:      # Section 0x00000005
-// CHECK-NEXT: (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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_offset', 0x00000390)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi-zero-addr-delta.s b/test/MC/ELF/cfi-zero-addr-delta.s
index e4c342e4e91..3ddf69ec50c 100644
--- a/test/MC/ELF/cfi-zero-addr-delta.s
+++ b/test/MC/ELF/cfi-zero-addr-delta.s
@@ -14,7 +14,7 @@ f:
         nop
 	.cfi_endproc
 
-// CHECK:      (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK:      (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -27,11 +27,11 @@ f:
 // CHECK-NEXT:  ('_section_data', '14000000 00000000 017a5200 01781001 1b0c0708 90010000 1c000000 1c000000 00000000 04000000 00410e10 410a0e08 410b0000 00000000')
 // CHECK-NEXT: ),
 
-// CHECK:      (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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', 0x000003a0)
+// CHECK-NEXT:  ('sh_offset', 0x00000398)
 // CHECK-NEXT:  ('sh_size', 0x00000018)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/cfi.s b/test/MC/ELF/cfi.s
index f73240e94dd..133b85809aa 100644
--- a/test/MC/ELF/cfi.s
+++ b/test/MC/ELF/cfi.s
@@ -213,7 +213,7 @@ f36:
         .cfi_endproc
 
 // CHECK:      # Section 0x00000004
-// CHECK-NEXT: (('sh_name', 0x00000012) # '.eh_frame'
+// CHECK-NEXT: (('sh_name', 0x00000011) # '.eh_frame'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -227,11 +227,11 @@ f36:
 // CHECK-NEXT: ),
 
 // CHECK:        # Section 0x00000005
-// CHECK-NEXT: (('sh_name', 0x0000001c) # '.rela.eh_frame'
+// 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', 0x00000e38)
+// CHECK-NEXT:  ('sh_offset', 0x00000e30)
 // CHECK-NEXT:  ('sh_size', 0x000006c0)
 // CHECK-NEXT:  ('sh_link', 0x00000007)
 // CHECK-NEXT:  ('sh_info', 0x00000004)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index 8d747a264eb..be7128baf4e 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -4,7 +4,7 @@
 // of the file.
 
 // CHECK:       # Section 0x00000001
-// CHECK-NEXT:  (('sh_name', 0x00000030) # '.group'
+// CHECK-NEXT:  (('sh_name', 0x0000001b) # '.group'
 // CHECK-NEXT:   ('sh_type', 0x00000011)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -16,7 +16,7 @@
 // CHECK-NEXT:   ('sh_entsize', 0x00000004)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Section 0x00000002
-// CHECK-NEXT:  (('sh_name', 0x00000030) # '.group'
+// CHECK-NEXT:  (('sh_name', 0x0000001b) # '.group'
 // CHECK-NEXT:   ('sh_type', 0x00000011)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -28,7 +28,7 @@
 // CHECK-NEXT:   ('sh_entsize', 0x00000004)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Section 0x00000003
-// CHECK-NEXT:  (('sh_name', 0x00000030) # '.group'
+// CHECK-NEXT:  (('sh_name', 0x0000001b) # '.group'
 // CHECK-NEXT:   ('sh_type', 0x00000011)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/common2.s b/test/MC/ELF/common2.s
index b54cdfe143f..b48ca66b91e 100644
--- a/test/MC/ELF/common2.s
+++ b/test/MC/ELF/common2.s
@@ -9,7 +9,7 @@
         .zero 1
 	.align	8
 
-// CHECK:      (('sh_name', 0x0000000d) # '.bss'
+// CHECK:      (('sh_name', 0x00000007) # '.bss'
 // CHECK-NEXT:  ('sh_type',
 // CHECK-NEXT:  ('sh_flags'
 // CHECK-NEXT:  ('sh_addr',
diff --git a/test/MC/ELF/debug-line.s b/test/MC/ELF/debug-line.s
index 2979ca28f1e..aa0197d0ce2 100644
--- a/test/MC/ELF/debug-line.s
+++ b/test/MC/ELF/debug-line.s
@@ -2,7 +2,7 @@
 
 // Test that .debug_line is populated.
 
-// CHECK:     (('sh_name', 0x00000012) # '.debug_line'
+// CHECK:     (('sh_name', 0x00000011) # '.debug_line'
 // CHECK-NEXT: ('sh_type', 0x00000001)
 // CHECK-NEXT: ('sh_flags', 0x00000000)
 // CHECK-NEXT: ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/debug-loc.s b/test/MC/ELF/debug-loc.s
index 36ae485ef06..68e36a55c71 100644
--- a/test/MC/ELF/debug-loc.s
+++ b/test/MC/ELF/debug-loc.s
@@ -8,7 +8,7 @@
 // FIXME2: We need a debug_line dumper so that we can test the actual contents.
 
 // CHECK:      # Section 0x00000004
-// CHECK-NEXT: (('sh_name', 0x00000012) # '.debug_line'
+// CHECK-NEXT: (('sh_name', 0x00000011) # '.debug_line'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/empty-dwarf-lines.s b/test/MC/ELF/empty-dwarf-lines.s
index 0f791ae2aa3..1b135a677dd 100644
--- a/test/MC/ELF/empty-dwarf-lines.s
+++ b/test/MC/ELF/empty-dwarf-lines.s
@@ -8,7 +8,7 @@ c:
         .asciz   "hi\n"
 
 // CHECK:      # Section 0x00000004
-// CHECK-NEXT: (('sh_name', 0x00000012) # '.debug_line'
+// CHECK-NEXT: (('sh_name', 0x0000000c) # '.debug_line'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/empty.s b/test/MC/ELF/empty.s
index e351936b901..d98f0c6a969 100644
--- a/test/MC/ELF/empty.s
+++ b/test/MC/ELF/empty.s
@@ -14,7 +14,7 @@
 // CHECK-NEXT: ('sh_addralign', 0x00000004)
 // CHECK-NEXT: ('sh_entsize', 0x00000000)
 
-// CHECK:      ('sh_name', 0x00000007) # '.data'
+// CHECK:      ('sh_name', 0x00000026) # '.data'
 // CHECK-NEXT: ('sh_type', 0x00000001)
 // CHECK-NEXT: ('sh_flags', 0x00000003)
 // CHECK-NEXT: ('sh_addr', 0x00000000)
@@ -25,7 +25,7 @@
 // CHECK-NEXT: ('sh_addralign', 0x00000004)
 // CHECK-NEXT: ('sh_entsize', 0x00000000)
 
-// CHECK:      ('sh_name', 0x0000000d) # '.bss'
+// CHECK:      ('sh_name', 0x00000007) # '.bss'
 // CHECK-NEXT: ('sh_type', 0x00000008)
 // CHECK-NEXT: ('sh_flags', 0x00000003)
 // CHECK-NEXT: ('sh_addr', 0x00000000)
@@ -36,7 +36,7 @@
 // CHECK-NEXT: ('sh_addralign', 0x00000004)
 // CHECK-NEXT: ('sh_entsize', 0x00000000)
 
-// CHECK:      ('sh_name', 0x00000012) # '.shstrtab'
+// CHECK:      ('sh_name', 0x0000000c) # '.shstrtab'
 // CHECK-NEXT: ('sh_type', 0x00000003)
 // CHECK-NEXT:    ('sh_flags', 0x00000000)
 // CHECK-NEXT:    ('sh_addr', 0x00000000)
@@ -47,7 +47,7 @@
 // CHECK-NEXT:    ('sh_addralign', 0x00000001)
 // CHECK-NEXT:    ('sh_entsize', 0x00000000)
 
-// CHECK: ('sh_name', 0x0000001c) # '.symtab'
+// CHECK: ('sh_name', 0x0000001e) # '.symtab'
 // CHECK-NEXT:    ('sh_type', 0x00000002)
 // CHECK-NEXT:    ('sh_flags', 0x00000000)
 // CHECK-NEXT:    ('sh_addr', 0x00000000)
@@ -58,7 +58,7 @@
 // CHECK-NEXT:    ('sh_addralign', 0x00000008)
 // CHECK-NEXT:    ('sh_entsize', 0x00000018)
 
-// CHECK: ('sh_name', 0x00000024) # '.strtab'
+// CHECK: ('sh_name', 0x00000016) # '.strtab'
 // CHECK-NEXT:    ('sh_type', 0x00000003)
 // CHECK-NEXT:    ('sh_flags', 0x00000000)
 // CHECK-NEXT:    ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/entsize.ll b/test/MC/ELF/entsize.ll
index 21179dfda9a..74f0413ecbe 100644
--- a/test/MC/ELF/entsize.ll
+++ b/test/MC/ELF/entsize.ll
@@ -20,7 +20,7 @@ declare void @foo(i64* nocapture) nounwind
 
 ;;;;;
 
-; 64: (('sh_name', 0x00000012) # '.rodata.str1.1'
+; 64: (('sh_name', 0x0000004e) # '.rodata.str1.1'
 ; 64-NEXT:   ('sh_type', 0x00000001)
 ; 64-NEXT:   ('sh_flags', 0x00000032)
 ; 64-NEXT:   ('sh_addr',
@@ -31,7 +31,7 @@ declare void @foo(i64* nocapture) nounwind
 ; 64-NEXT:   ('sh_addralign', 0x00000001)
 ; 64-NEXT:   ('sh_entsize', 0x00000001)
 
-; 64: (('sh_name', 0x00000021) # '.rodata.cst8'
+; 64: (('sh_name', 0x00000041) # '.rodata.cst8'
 ; 64-NEXT:   ('sh_type', 0x00000001)
 ; 64-NEXT:   ('sh_flags', 0x00000012)
 ; 64-NEXT:   ('sh_addr',
diff --git a/test/MC/ELF/entsize.s b/test/MC/ELF/entsize.s
index e8eb62eb2ea..415eaefe466 100644
--- a/test/MC/ELF/entsize.s
+++ b/test/MC/ELF/entsize.s
@@ -33,7 +33,7 @@
     .quad 42
 
 // CHECK: # Section 0x00000004
-// CHECK-NEXT:   ('sh_name', 0x00000012) # '.rodata.str1.1'
+// CHECK-NEXT:   ('sh_name', 0x00000048) # '.rodata.str1.1'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000032)
 // CHECK-NEXT:   ('sh_addr',
@@ -45,7 +45,7 @@
 // CHECK-NEXT:   ('sh_entsize', 0x00000001)
 
 // CHECK: # Section 0x00000005
-// CHECK-NEXT:   ('sh_name', 0x00000021) # '.rodata.str2.1'
+// CHECK-NEXT:   ('sh_name', 0x00000039) # '.rodata.str2.1'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000032)
 // CHECK-NEXT:   ('sh_addr',
@@ -57,7 +57,7 @@
 // CHECK-NEXT:   ('sh_entsize', 0x00000002)
 
 // CHECK: # Section 0x00000006
-// CHECK-NEXT:   ('sh_name', 0x00000030) # '.rodata.cst8
+// CHECK-NEXT:   ('sh_name', 0x0000002c) # '.rodata.cst8
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000012)
 // CHECK-NEXT:   ('sh_addr',
diff --git a/test/MC/ELF/global-offset.s b/test/MC/ELF/global-offset.s
index aa6328760d4..77f72677108 100644
--- a/test/MC/ELF/global-offset.s
+++ b/test/MC/ELF/global-offset.s
@@ -5,7 +5,7 @@
 
         addl    $_GLOBAL_OFFSET_TABLE_, %ebx
 
-// CHECK:      ('sh_name', 0x00000001) # '.text'
+// CHECK:      ('sh_name', 0x00000005) # '.text'
 // CHECK-NEXT: ('sh_type',
 // CHECK-NEXT: ('sh_flags',
 // CHECK-NEXT: ('sh_addr',
diff --git a/test/MC/ELF/ident.s b/test/MC/ELF/ident.s
index f79458f3450..b364d6007fe 100644
--- a/test/MC/ELF/ident.s
+++ b/test/MC/ELF/ident.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  --dump-section-data | FileCheck %s
 
-// CHECK:       (('sh_name', 0x00000012) # '.comment'
+// CHECK:       (('sh_name', 0x00000007) # '.comment'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000030)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/merge.s b/test/MC/ELF/merge.s
index 2bf81435489..befc2bfc0b5 100644
--- a/test/MC/ELF/merge.s
+++ b/test/MC/ELF/merge.s
@@ -74,7 +74,7 @@ foo:
 
 // Section 5 is "sec1"
 // CHECK: # Section 0x00000005
-// CHECK-NEXT:  (('sh_name', 0x00000012) # '.sec1'
+// CHECK-NEXT:  (('sh_name', 0x00000035) # '.sec1'
 
 // Symbol number 1 is .Lfoo
 // CHECK:      # Symbol 0x00000001
diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s
index 87b6f3aa85b..c4b7d9851b9 100644
--- a/test/MC/ELF/noexec.s
+++ b/test/MC/ELF/noexec.s
@@ -1,7 +1,7 @@
 // RUN: llvm-mc -mc-no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  | FileCheck  %s
 
 // CHECK:       # Section 0x00000004
-// CHECK-NEXT:  (('sh_name', 0x00000012) # '.note.GNU-stack'
+// CHECK-NEXT:  (('sh_name', 0x0000000c) # '.note.GNU-stack'
 // CHECK-NEXT:   ('sh_type', 0x00000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/relocation-386.s b/test/MC/ELF/relocation-386.s
index 8be2d9ca0c6..f7b20b56ba5 100644
--- a/test/MC/ELF/relocation-386.s
+++ b/test/MC/ELF/relocation-386.s
@@ -156,7 +156,7 @@
 
 // Section 4 is bss
 // CHECK:      # Section 0x00000004
-// CHECK-NEXT: (('sh_name', 0x0000000d) # '.bss'
+// CHECK-NEXT: (('sh_name', 0x0000000b) # '.bss'
 
 // CHECK:      # Symbol 0x00000001
 // CHECK-NEXT: (('st_name', 0x00000005) # '.Lfoo'
diff --git a/test/MC/ELF/relocation-pc.s b/test/MC/ELF/relocation-pc.s
index 75841c6f700..36212cb7232 100644
--- a/test/MC/ELF/relocation-pc.s
+++ b/test/MC/ELF/relocation-pc.s
@@ -6,7 +6,7 @@
 	jmp	-256              # R_X86_64_PC32
 
 // CHECK:      # Section 0x00000002
-// CHECK-NEXT: (('sh_name', 0x00000012) # '.rela.text'
+// CHECK-NEXT: (('sh_name', 0x00000001) # '.rela.text'
 // CHECK-NEXT:  ('sh_type', 0x00000004)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/relocation.s b/test/MC/ELF/relocation.s
index 640ed813239..4df09e13fce 100644
--- a/test/MC/ELF/relocation.s
+++ b/test/MC/ELF/relocation.s
@@ -20,7 +20,7 @@ bar:
 
 
 // CHECK:  # Section 0x00000001
-// CHECK: (('sh_name', 0x00000001) # '.text'
+// CHECK: (('sh_name', 0x00000006) # '.text'
 
 // CHECK: # Relocation 0x00000000
 // CHECK-NEXT:  (('r_offset', 0x00000001)
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index 6260387fb6e..e7cedd0afb4 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -17,7 +17,7 @@ defined3:
 
 // Section 1 is .text
 // CHECK:      # Section 0x00000001
-// CHECK-NEXT: (('sh_name', 0x00000001) # '.text'
+// CHECK-NEXT: (('sh_name', 0x00000006) # '.text'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000006)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
diff --git a/test/MC/ELF/section.s b/test/MC/ELF/section.s
index 861dc4f057f..5fb5525cba6 100644
--- a/test/MC/ELF/section.s
+++ b/test/MC/ELF/section.s
@@ -7,10 +7,10 @@
 .section	.note.GNU-,"",@progbits
 .section	-.note.GNU,"",@progbits
 
-// CHECK: ('sh_name', 0x00000012) # '.note.GNU-stack'
-// CHECK: ('sh_name', 0x00000022) # '.note.GNU-stack2'
-// CHECK: ('sh_name', 0x00000033) # '.note.GNU-'
-// CHECK: ('sh_name', 0x0000003e) # '-.note.GNU'
+// CHECK: ('sh_name', 0x00000038) # '.note.GNU-stack'
+// CHECK: ('sh_name', 0x0000008f) # '.note.GNU-stack2'
+// CHECK: ('sh_name', 0x000000a0) # '.note.GNU-'
+// CHECK: ('sh_name', 0x00000084) # '-.note.GNU'
 
 // Test that the defaults are used
 
@@ -19,7 +19,7 @@
 .section	.rodata
 .section	zed, ""
 
-// CHECK:      (('sh_name', 0x00000049) # '.init'
+// CHECK:      (('sh_name', 0x00000012) # '.init'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000006)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -31,7 +31,7 @@
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Section 0x0000000b
-// CHECK-NEXT: (('sh_name', 0x0000004f) # '.fini'
+// CHECK-NEXT: (('sh_name', 0x00000048) # '.fini'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000006)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -43,7 +43,7 @@
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Section 0x0000000c
-// CHECK-NEXT: (('sh_name', 0x00000055) # '.rodata'
+// CHECK-NEXT: (('sh_name', 0x00000076) # '.rodata'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000002)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -55,7 +55,7 @@
 // CHECK-NEXT:  ('sh_entsize', 0x00000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Section 0x0000000d
-// CHECK-NEXT: (('sh_name', 0x0000005d) # 'zed'
+// CHECK-NEXT: (('sh_name', 0x00000058) # 'zed'
 // CHECK-NEXT:  ('sh_type', 0x00000001)
 // CHECK-NEXT:  ('sh_flags', 0x00000000)
 // CHECK-NEXT:  ('sh_addr', 0x00000000)
@@ -68,7 +68,7 @@
 // CHECK-NEXT: ),
 
 .section	.note.test,"",@note
-// CHECK:       (('sh_name', 0x00000061) # '.note.test'
+// CHECK:       (('sh_name', 0x00000007) # '.note.test'
 // CHECK-NEXT:   ('sh_type', 0x00000007)
 // CHECK-NEXT:   ('sh_flags', 0x00000000)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -90,7 +90,7 @@ bar:
 
 .section .eh_frame,"a",@unwind
 
-// CHECK:       (('sh_name', 0x00000080) # '.eh_frame'
+// CHECK:       (('sh_name', 0x0000004e) # '.eh_frame'
 // CHECK-NEXT:   ('sh_type', 0x70000001)
 // CHECK-NEXT:   ('sh_flags', 0x00000002)
 // CHECK-NEXT:   ('sh_addr', 0x00000000)
@@ -106,5 +106,5 @@ bar:
 .section bar-"foo"
 .section "foo"
 
-// CHECK: ('sh_name', 0x0000008a) # 'bar-"foo"'
-// CHECK: ('sh_name', 0x00000094) # 'foo'
+// CHECK: ('sh_name', 0x000000ab) # 'bar-"foo"'
+// CHECK: ('sh_name', 0x00000034) # 'foo'
diff --git a/test/MC/ELF/undef2.s b/test/MC/ELF/undef2.s
index 67010132abd..6ce269bec2e 100644
--- a/test/MC/ELF/undef2.s
+++ b/test/MC/ELF/undef2.s
@@ -7,4 +7,4 @@
 // CHECK: ('_symbols', [
 // CHECK:      (('st_name', 0x00000001) # '.Lfoo'
 // CHECK-NEXT:  ('st_bind', 0x00000001)
-// CHECK: (('sh_name', 0x0000002f) # '.strtab'
+// CHECK: (('sh_name', 0x0000001b) # '.strtab'