This reverts commit r248845 and r248848.

They broke elf2/basic-mips.s.

Revert "[elf2] Sort output sections."
Revert "[elf2] Fix build."

llvm-svn: 248851

22 files changed, 201 insertions, 249 deletions

diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
index f7886aae603..13754ad0bf2 100644
--- a/lld/ELF/OutputSections.cpp
+++ b/lld/ELF/OutputSections.cpp
@@ -183,9 +183,6 @@ DynamicSection<ELFT>::DynamicSection(SymbolTable &SymTab,
 }
 
 template <class ELFT> void DynamicSection<ELFT>::finalize() {
-  if (this->Header.sh_size)
-    return; // Already finalized.
-
   typename Base::HeaderT &Header = this->Header;
   Header.sh_link = DynStrSec.getSectionIndex();
 
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 48ca5b070a5..f1dfd6644c9 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -389,42 +389,12 @@ template <class ELFT> void Writer<ELFT>::createSections() {
       OutputSections.begin(), OutputSections.end(),
       [](OutputSectionBase<ELFT::Is64Bits> *A,
          OutputSectionBase<ELFT::Is64Bits> *B) {
-        // Sort by ALLOC < (ALLOC & NOBITS) < (ALLOC & EXECUTE) <
-        // (ALLOC & WRITE) < (ALLOC & WRITE & NOBITS)
-        uintX_t AFlags =
-            A->getFlags() & (SHF_ALLOC | SHF_EXECINSTR | SHF_WRITE);
-        uintX_t BFlags =
-            B->getFlags() & (SHF_ALLOC | SHF_EXECINSTR | SHF_WRITE);
-
-        auto rank = [](OutputSectionBase<ELFT::Is64Bits> *Sec) {
-          switch (Sec->getFlags() & (SHF_ALLOC | SHF_EXECINSTR | SHF_WRITE)) {
-          case SHF_ALLOC:
-            return 0;
-          case SHF_ALLOC | SHF_EXECINSTR:
-            return 1;
-          case SHF_ALLOC | SHF_EXECINSTR | SHF_WRITE:
-            return 2;
-          case SHF_ALLOC | SHF_WRITE:
-            return 3;
-          case 0:
-            return 4;
-          default:
-            error("Unexpected section flags");
-          }
-        };
-
-        // Ignore SHT_NOBITS for non-allocated sections.
-        if (AFlags && AFlags == BFlags)
-          return A->getType() != SHT_NOBITS && B->getType() == SHT_NOBITS;
-
-        return rank(A) < rank(B);
+        // Place SHF_ALLOC sections first.
+        return (A->getFlags() & SHF_ALLOC) && !(B->getFlags() & SHF_ALLOC);
       });
 
   for (unsigned I = 0, N = OutputSections.size(); I < N; ++I)
     OutputSections[I]->setSectionIndex(I + 1);
-
-  // Fill the DynStrSec early.
-  DynamicSec.finalize();
 }
 
 template <class ELFT>
diff --git a/lld/test/elf2/basic-aarch64.s b/lld/test/elf2/basic-aarch64.s
index 64e43363b7e..9eb2b5b5a19 100644
--- a/lld/test/elf2/basic-aarch64.s
+++ b/lld/test/elf2/basic-aarch64.s
@@ -53,15 +53,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1
-# CHECK-NEXT:     Name: .text
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x6)
+# CHECK-NEXT:     Name: .bss
+# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-NEXT:       SHF_WRITE (0x1)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Address: 0x11000
 # CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     Size: 12
+# CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -69,15 +69,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 2
-# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Name: .text
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x3)
+# CHECK-NEXT:     Flags [ (0x6)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_WRITE (0x1)
+# CHECK-NEXT:       SHF_EXECINSTR (0x4)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x1100C
-# CHECK-NEXT:     Offset: 0x100C
-# CHECK-NEXT:     Size: 0
+# CHECK-NEXT:     Address: 0x11000
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     Size: 12
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -85,8 +85,8 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 3
-# CHECK-NEXT:     Name: .bss
-# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:       SHF_WRITE (0x1)
@@ -145,7 +145,7 @@ _start:
 # CHECK-NEXT:     Binding: Local (0x0)
 # CHECK-NEXT:     Type: None (0x0)
 # CHECK-NEXT:     Other: 0
-# CHECK-NEXT:     Section: .text
+# CHECK-NEXT:     Section: .text (0x2)
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Name: _start (7)
diff --git a/lld/test/elf2/basic.s b/lld/test/elf2/basic.s
index 736d547a137..6ab95996df1 100644
--- a/lld/test/elf2/basic.s
+++ b/lld/test/elf2/basic.s
@@ -54,15 +54,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1
-# CHECK-NEXT:     Name: .text
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x6)
+# CHECK-NEXT:     Name: .bss
+# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-NEXT:       SHF_WRITE (0x1)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Address: 0x11000
 # CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     Size: 16
+# CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -70,15 +70,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 2
-# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Name: .text
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x3)
+# CHECK-NEXT:     Flags [ (0x6)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_WRITE (0x1)
+# CHECK-NEXT:       SHF_EXECINSTR (0x4)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x11010
-# CHECK-NEXT:     Offset: 0x1010
-# CHECK-NEXT:     Size: 0
+# CHECK-NEXT:     Address: 0x11000
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     Size: 16
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -86,8 +86,8 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 3
-# CHECK-NEXT:     Name: .bss
-# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:       SHF_WRITE (0x1)
diff --git a/lld/test/elf2/basic32.s b/lld/test/elf2/basic32.s
index bad5750ed1c..edafbe41d1a 100644
--- a/lld/test/elf2/basic32.s
+++ b/lld/test/elf2/basic32.s
@@ -52,15 +52,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1
-# CHECK-NEXT:     Name: .text
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x6)
+# CHECK-NEXT:     Name: .bss
+# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-NEXT:       SHF_WRITE (0x1)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Address: 0x11000
 # CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     Size: 12
+# CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -68,15 +68,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 2
-# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Name: .text
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x3)
+# CHECK-NEXT:     Flags [ (0x6)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_WRITE (0x1)
+# CHECK-NEXT:       SHF_EXECINSTR (0x4)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x1100C
-# CHECK-NEXT:     Offset: 0x100C
-# CHECK-NEXT:     Size: 0
+# CHECK-NEXT:     Address: 0x11000
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     Size: 12
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -84,8 +84,8 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 3
-# CHECK-NEXT:     Name: .bss
-# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:       SHF_WRITE (0x1)
diff --git a/lld/test/elf2/basic32be.s b/lld/test/elf2/basic32be.s
index 5d1cfee9e43..1f5e46a586d 100644
--- a/lld/test/elf2/basic32be.s
+++ b/lld/test/elf2/basic32be.s
@@ -52,15 +52,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1
-# CHECK-NEXT:     Name: .text
-# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x6)
+# CHECK-NEXT:     Name: .bss
+# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_EXECINSTR (0x4)
+# CHECK-NEXT:       SHF_WRITE (0x1)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Address: 0x11000
 # CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     Size: 12
+# CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -68,15 +68,15 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 2
-# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Name: .text
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT:     Flags [ (0x3)
+# CHECK-NEXT:     Flags [ (0x6)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_WRITE (0x1)
+# CHECK-NEXT:       SHF_EXECINSTR (0x4)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x1100C
-# CHECK-NEXT:     Offset: 0x100C
-# CHECK-NEXT:     Size: 0
+# CHECK-NEXT:     Address: 0x11000
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     Size: 12
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
@@ -84,8 +84,8 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 3
-# CHECK-NEXT:     Name: .bss
-# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Name: .data
+# CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x3)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:       SHF_WRITE (0x1)
diff --git a/lld/test/elf2/basic64be.s b/lld/test/elf2/basic64be.s
index 01b85f673ae..842312a0726 100644
--- a/lld/test/elf2/basic64be.s
+++ b/lld/test/elf2/basic64be.s
@@ -59,6 +59,22 @@ _start:
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1
+# CHECK-NEXT:     Name: .bss
+# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
+# CHECK-NEXT:     Flags [ (0x3)
+# CHECK-NEXT:       SHF_ALLOC (0x2)
+# CHECK-NEXT:       SHF_WRITE (0x1)
+# CHECK-NEXT:     ]
+# CHECK-NEXT:     Address: 0x11000
+# CHECK-NEXT:     Offset: 0x1000
+# CHECK-NEXT:     Size: 0
+# CHECK-NEXT:     Link: 0
+# CHECK-NEXT:     Info: 0
+# CHECK-NEXT:     AddressAlignment: 4
+# CHECK-NEXT:     EntrySize: 0
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Section {
+# CHECK-NEXT:     Index: 2
 # CHECK-NEXT:     Name: .text
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x6)
@@ -76,7 +92,7 @@ _start:
 # CHECK:          )
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 2
+# CHECK-NEXT:     Index: 3
 # CHECK-NEXT:     Name: .data
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x3)
@@ -94,7 +110,7 @@ _start:
 # CHECK:          )
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 3
+# CHECK-NEXT:     Index: 4
 # CHECK-NEXT:     Name: .opd
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x3)
@@ -114,22 +130,6 @@ _start:
 # CHECK-NEXT:     )
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {
-# CHECK-NEXT:     Index: 4
-# CHECK-NEXT:     Name: .bss
-# CHECK-NEXT:     Type: SHT_NOBITS (0x8)
-# CHECK-NEXT:     Flags [ (0x3)
-# CHECK-NEXT:       SHF_ALLOC (0x2)
-# CHECK-NEXT:       SHF_WRITE (0x1)
-# CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x12018
-# CHECK-NEXT:     Offset: 0x2018
-# CHECK-NEXT:     Size: 0
-# CHECK-NEXT:     Link: 0
-# CHECK-NEXT:     Info: 0
-# CHECK-NEXT:     AddressAlignment: 4
-# CHECK-NEXT:     EntrySize: 0
-# CHECK-NEXT:   }
-# CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 5
 # CHECK-NEXT:     Name: .symtab
 # CHECK-NEXT:     Type: SHT_SYMTAB
diff --git a/lld/test/elf2/bss.s b/lld/test/elf2/bss.s
index 0fa8fe4b095..e8ca6be4b34 100644
--- a/lld/test/elf2/bss.s
+++ b/lld/test/elf2/bss.s
@@ -19,6 +19,17 @@
 // CHECK-NEXT:   AddressAlignment: 4
 // CHECK-NEXT:   EntrySize: 0
 // CHECK-NEXT: }
+// CHECK-NEXT: Section {
+// CHECK-NEXT:   Index:
+// CHECK-NEXT:   Name:
+// CHECK-NEXT:   Type:
+// CHECK-NEXT:   Flags [
+// CHECK-NEXT:     SHF_ALLOC
+// CHECK-NEXT:     SHF_EXECINSTR
+// CHECK-NEXT:   ]
+// CHECK-NEXT:   Address:
+// CHECK-NEXT:   Offset: 0x1000
+
 
         .global _start
 _start:
diff --git a/lld/test/elf2/discard-none.s b/lld/test/elf2/discard-none.s
index 77005348f96..2c3d798dec7 100644
--- a/lld/test/elf2/discard-none.s
+++ b/lld/test/elf2/discard-none.s
@@ -40,7 +40,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: .Lmyothervar
-// CHECK-NEXT:     Value: 0x102C
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
@@ -49,7 +49,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: .Lmyvar
-// CHECK-NEXT:     Value: 0x102C
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
diff --git a/lld/test/elf2/dynamic-reloc-index.s b/lld/test/elf2/dynamic-reloc-index.s
index da4df34395c..294595b9fb9 100644
--- a/lld/test/elf2/dynamic-reloc-index.s
+++ b/lld/test/elf2/dynamic-reloc-index.s
@@ -8,7 +8,7 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x12000 R_X86_64_64 bar 0x0
+// CHECK-NEXT:     0x11000 R_X86_64_64 bar 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
diff --git a/lld/test/elf2/dynamic-reloc.s b/lld/test/elf2/dynamic-reloc.s
index aa9e28d8dba..4aac5c0cd61 100644
--- a/lld/test/elf2/dynamic-reloc.s
+++ b/lld/test/elf2/dynamic-reloc.s
@@ -6,7 +6,15 @@
 // RUN: llvm-readobj -dynamic-table -r --expand-relocs -s %t | FileCheck %s
 // REQUIRES: x86
 
-// CHECK:      Index: 1
+// CHECK:      Name: .text
+// CHECK-NEXT: Type: SHT_PROGBITS
+// CHECK-NEXT: Flags [
+// CHECK-NEXT:   SHF_ALLOC
+// CHECK-NEXT:   SHF_EXECINSTR
+// CHECK-NEXT: ]
+// CHECK-NEXT: Address: [[ADDR:.*]]
+
+// CHECK:      Index: 4
 // CHECK-NEXT: Name: .dynsym
 
 // CHECK:      Name: .rela.dyn
@@ -17,19 +25,11 @@
 // CHECK-NEXT: Address: [[RELAADDR:.*]]
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: [[RELASIZE:.*]]
-// CHECK-NEXT: Link: 1
+// CHECK-NEXT: Link: 4
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 24
 
-// CHECK:      Name: .text
-// CHECK-NEXT: Type: SHT_PROGBITS
-// CHECK-NEXT: Flags [
-// CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_EXECINSTR
-// CHECK-NEXT: ]
-// CHECK-NEXT: Address: [[ADDR:.*]]
-
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
 // CHECK-NEXT:     Relocation {
diff --git a/lld/test/elf2/got.s b/lld/test/elf2/got.s
index 9dee972c21d..aaff3a1df54 100644
--- a/lld/test/elf2/got.s
+++ b/lld/test/elf2/got.s
@@ -12,7 +12,7 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x13080
+// CHECK-NEXT: Address: 0x15000
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
@@ -21,22 +21,22 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x13080 R_X86_64_GLOB_DAT bar 0x0
-// CHECK-NEXT:     0x13088 R_X86_64_GLOB_DAT zed 0x0
+// CHECK-NEXT:     0x15000 R_X86_64_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x15008 R_X86_64_GLOB_DAT zed 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 
 // Unfortunately FileCheck can't do math, so we have to check for explicit
 // values:
-//  0x13080 - (0x12000 + 2) - 4 = 4218
-//  0x13080 - (0x12006 + 2) - 4 = 4212
-//  0x13088 - (0x1200c + 2) - 4 = 4214
+//  0x15000 - (0x11000 + 2) - 4 = 16378
+//  0x15000 - (0x11006 + 2) - 4 = 16372
+//  0x15008 - (0x1100c + 2) - 4 = 16374
 
 // DISASM:      _start:
-// DISASM-NEXT:   12000:  {{.*}}  jmpq  *4218(%rip)
-// DISASM-NEXT:   12006:  {{.*}}  jmpq  *4212(%rip)
-// DISASM-NEXT:   1200c:  {{.*}}  jmpq  *4214(%rip)
+// DISASM-NEXT:   11000:  ff 25 fa 3f 00 00  jmpq  *16378(%rip)
+// DISASM-NEXT:   11006:  ff 25 f4 3f 00 00  jmpq  *16372(%rip)
+// DISASM-NEXT:   1100c:  ff 25 f6 3f 00 00  jmpq  *16374(%rip)
 
 .global _start
 _start:
diff --git a/lld/test/elf2/local-dynamic.s b/lld/test/elf2/local-dynamic.s
index 503f3aa3e81..d95909dcac4 100644
--- a/lld/test/elf2/local-dynamic.s
+++ b/lld/test/elf2/local-dynamic.s
@@ -16,7 +16,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: blah
-// CHECK-NEXT:     Value: 0x1050
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
@@ -25,7 +25,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: foo
-// CHECK-NEXT:     Value: 0x1050
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
@@ -34,7 +34,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: goo
-// CHECK-NEXT:     Value: 0x1050
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
@@ -43,7 +43,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start
-// CHECK-NEXT:     Value: 0x1050
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
@@ -64,7 +64,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start@
-// CHECK-NEXT:     Value: 0x1050
+// CHECK-NEXT:     Value: 0x1000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
diff --git a/lld/test/elf2/plt-i686.s b/lld/test/elf2/plt-i686.s
index a168024563d..8891f9e3542 100644
--- a/lld/test/elf2/plt-i686.s
+++ b/lld/test/elf2/plt-i686.s
@@ -12,7 +12,7 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x12010
+// CHECK-NEXT: Address: 0x16000
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
@@ -21,34 +21,34 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {
-// CHECK-NEXT:     0x13040 R_386_GLOB_DAT bar 0x0
-// CHECK-NEXT:     0x13044 R_386_GLOB_DAT zed 0x0
+// CHECK-NEXT:     0x15000 R_386_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x15004 R_386_GLOB_DAT zed 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // Unfortunately FileCheck can't do math, so we have to check for explicit
 // values:
 
-// 0x12010 - (0x12000 + 1) - 4 = 11
-// 0x12010 - (0x12005 + 1) - 4 = 2
-// 0x12018 - (0x1200a + 1) - 4 = 9
+// 0x16000 - (0x11000 + 1) - 4 = 20475
+// 0x16000 - (0x11005 + 1) - 4 = 20470
+// 0x16008 - (0x1100a + 1) - 4 = 20473
 
 // DISASM:      _start:
-// DISASM-NEXT:   12000:  e9 0b 00 00 00  jmp  11
-// DISASM-NEXT:   12005:  e9 06 00 00 00  jmp  6
-// DISASM-NEXT:   1200a:  e9 09 00 00 00  jmp  9
+// DISASM-NEXT:   11000:  e9 fb 4f 00 00  jmp  20475
+// DISASM-NEXT:   11005:  e9 f6 4f 00 00  jmp  20470
+// DISASM-NEXT:   1100a:  e9 f9 4f 00 00  jmp  20473
 
-// 0x13040 = 77888
-// 0x13044 = 77892
+// 0x15000 = 86016
+// 0x15004 = 86020
 
 // DISASM:      Disassembly of section .plt:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:   12010:  ff 25 {{.*}}       jmpl *77888
-// DISASM-NEXT:   12016:  90                 nop
-// DISASM-NEXT:   12017:  90                 nop
-// DISASM-NEXT:   12018:  ff 25 {{.*}}       jmpl *77892
-// DISASM-NEXT:   1201e:  90                 nop
-// DISASM-NEXT:   1201f:  90                 nop
+// DISASM-NEXT:   16000:  ff 25 00 50 01 00  jmpl *86016
+// DISASM-NEXT:   16006:  90                 nop
+// DISASM-NEXT:   16007:  90                 nop
+// DISASM-NEXT:   16008:  ff 25 04 50 01 00  jmpl *86020
+// DISASM-NEXT:   1600e:  90                 nop
+// DISASM-NEXT:   1600f:  90                 nop
 
 .global _start
 _start:
diff --git a/lld/test/elf2/plt.s b/lld/test/elf2/plt.s
index 7af5866ccb7..914b3e349df 100644
--- a/lld/test/elf2/plt.s
+++ b/lld/test/elf2/plt.s
@@ -12,7 +12,7 @@
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x12020
+// CHECK-NEXT: Address: 0x16000
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 24
 // CHECK-NEXT: Link: 0
@@ -21,35 +21,35 @@
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x13080 R_X86_64_GLOB_DAT bar 0x0
-// CHECK-NEXT:     0x13088 R_X86_64_GLOB_DAT zed 0x0
-// CHECK-NEXT:     0x13090 R_X86_64_GLOB_DAT _start 0x0
+// CHECK-NEXT:     0x15000 R_X86_64_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x15008 R_X86_64_GLOB_DAT zed 0x0
+// CHECK-NEXT:     0x15010 R_X86_64_GLOB_DAT _start 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // Unfortunately FileCheck can't do math, so we have to check for explicit
 // values:
 
-// 0x12020 - (0x12000 + 1) - 4 = 27
-// 0x12020 - (0x12005 + 1) - 4 = 22
-// 0x12028 - (0x1200a + 1) - 4 = 25
+// 0x16000 - (0x11000 + 1) - 4 = 20475
+// 0x16000 - (0x11005 + 1) - 4 = 20470
+// 0x16008 - (0x1100a + 1) - 4 = 20473
 
 // DISASM:      _start:
-// DISASM-NEXT:   12000:  e9 {{.*}}       jmp  27
-// DISASM-NEXT:   12005:  e9 {{.*}}       jmp  22
-// DISASM-NEXT:   1200a:  e9 {{.*}}       jmp  25
+// DISASM-NEXT:   11000:  e9 fb 4f 00 00  jmp  20475
+// DISASM-NEXT:   11005:  e9 f6 4f 00 00  jmp  20470
+// DISASM-NEXT:   1100a:  e9 f9 4f 00 00  jmp  20473
 
-// 0x13080 - 0x12026  = 4186
-// 0x13088 - 0x1202e  = 4186
+// 0x15000 - 0x16006  = -4102
+// 0x15008 - 0x1600e  = -4102
 
 // DISASM:      Disassembly of section .plt:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:   12020:  ff 25 {{.*}}       jmpq *4186(%rip)
-// DISASM-NEXT:   12026:  90                 nop
-// DISASM-NEXT:   12027:  90                 nop
-// DISASM-NEXT:   12028:  ff 25 {{.*}}       jmpq *4186(%rip)
-// DISASM-NEXT:   1202e:  90                 nop
-// DISASM-NEXT:   1202f:  90                 nop
+// DISASM-NEXT:   16000:  ff 25 fa ef ff ff  jmpq *-4102(%rip)
+// DISASM-NEXT:   16006:  90                 nop
+// DISASM-NEXT:   16007:  90                 nop
+// DISASM-NEXT:   16008:  ff 25 fa ef ff ff  jmpq *-4102(%rip)
+// DISASM-NEXT:   1600e:  90                 nop
+// DISASM-NEXT:   1600f:  90                 nop
 
 .global _start
 _start:
diff --git a/lld/test/elf2/relocation-common.s b/lld/test/elf2/relocation-common.s
index 8822ea7b721..68eca0195c1 100644
--- a/lld/test/elf2/relocation-common.s
+++ b/lld/test/elf2/relocation-common.s
@@ -10,5 +10,5 @@ _start:
 .global sym1
 .comm sym1,4,4
 
-// CHECK: 11000: {{.*}} movl    $1, 4086(%rip)
-// CHECK: 0000000000012000 g       .bss            00000004 sym1
+// CHECK: 12000: {{.*}} movl    $1, -4106(%rip)
+// CHECK: 0000000000011000 g       .bss            00000004 sym1
diff --git a/lld/test/elf2/relocation-i686.s b/lld/test/elf2/relocation-i686.s
index b9697d59512..d02821587e0 100644
--- a/lld/test/elf2/relocation-i686.s
+++ b/lld/test/elf2/relocation-i686.s
@@ -27,14 +27,14 @@ R_386_PC32_2:
 
 // CHECK: Disassembly of section .R_386_32:
 // CHECK-NEXT: R_386_32:
-// CHECK-NEXT:  12000: {{.*}} movl $73729, %edx
+// CHECK-NEXT:  11000: {{.*}} movl $69633, %edx
 
 // CHECK: Disassembly of section .R_386_PC32:
 // CHECK-NEXT: R_386_PC32:
-// CHECK-NEXT:   12005:  e8 04 00 00 00  calll 4
+// CHECK-NEXT:   11005:  e8 04 00 00 00  calll 4
 
 // CHECK:      R_386_PC32_2:
-// CHECK-NEXT:   1200e:  90  nop
+// CHECK-NEXT:   1100e:  90  nop
 
 // Create a .got
 movl bar@GOT, %eax
@@ -46,23 +46,23 @@ movl bar@GOT, %eax
 // ADDR-NEXT:   SHF_ALLOC
 // ADDR-NEXT:   SHF_WRITE
 // ADDR-NEXT: ]
-// ADDR-NEXT: Address: 0x13040
+// ADDR-NEXT: Address: 0x15000
 
 .section .R_386_GOTPC,"ax",@progbits
 R_386_GOTPC:
  movl $_GLOBAL_OFFSET_TABLE_, %eax
 
-// 0x13040 - 0x12014 = 4140
+// 0x15000 - 0x11014 = 16364
 
 // CHECK:      Disassembly of section .R_386_GOTPC:
 // CHECK-NEXT: R_386_GOTPC:
-// CHECK-NEXT:   12014:  {{.*}} movl  $4140, %eax
+// CHECK-NEXT:   11014:  {{.*}} movl  $16364, %eax
 
 .section .dynamic_reloc, "ax",@progbits
         call bar+4
 // CHECK:      Disassembly of section .dynamic_reloc:
 // CHECK-NEXT: .dynamic_reloc:
-// CHECK-NEXT:   12019:  e8 00 00 00 00  calll  0
+// CHECK-NEXT:   11019:  e8 00 00 00 00  calll  0
 
 .section .R_386_GOT32,"ax",@progbits
 .global R_386_GOT32
@@ -71,4 +71,4 @@ R_386_GOT32:
 // This is the second symbol in the got, so the offset is 4.
 // CHECK:      Disassembly of section .R_386_GOT32:
 // CHECK-NEXT: R_386_GOT32:
-// CHECK-NEXT:   1201e:  {{.*}} movl 4, %eax
+// CHECK-NEXT:   1101e:  {{.*}} movl 4, %eax
diff --git a/lld/test/elf2/relocation-local.s b/lld/test/elf2/relocation-local.s
index 3adba3d73d5..5042c79a86b 100644
--- a/lld/test/elf2/relocation-local.s
+++ b/lld/test/elf2/relocation-local.s
@@ -20,7 +20,7 @@ R_X86_64_32:
 // constants in hex.
 // CHECK: Disassembly of section .text2:
 // CHECK-NEXT: R_X86_64_32:
-// CHECK-NEXT:  12009: {{.*}} movl $73737, %edx
+// CHECK-NEXT:  1100c: {{.*}} movl $69644, %edx
 
 .section .R_X86_64_32S,"ax",@progbits
 R_X86_64_32S:
@@ -28,11 +28,11 @@ R_X86_64_32S:
 
 // CHECK: Disassembly of section .R_X86_64_32S:
 // CHECK-NEXT: R_X86_64_32S:
-// CHECK-NEXT:  {{.*}}: {{.*}} movq -974839, %rdx
+// CHECK-NEXT:  {{.*}}: {{.*}} movq -978935, %rdx
 
 .section .R_X86_64_64,"a",@progbits
 R_X86_64_64:
  .quad R_X86_64_64
 
 // CHECK:      Contents of section .R_X86_64_64:
-// CHECK-NEXT:   11000 00100100 00000000
+// CHECK-NEXT:   12000 00200100 00000000
diff --git a/lld/test/elf2/relocation.s b/lld/test/elf2/relocation.s
index 196ef0e155e..5c60fa257ff 100644
--- a/lld/test/elf2/relocation.s
+++ b/lld/test/elf2/relocation.s
@@ -32,11 +32,11 @@ lulz:
 
 // CHECK: Disassembly of section .text:
 // CHECK-NEXT: _start:
-// CHECK-NEXT:   12000:  e8 04 00 00 00   callq 4
-// CHECK-NEXT:   12005:
+// CHECK-NEXT:   11000:  e8 04 00 00 00   callq 4
+// CHECK-NEXT:   11005:
 
 // CHECK:      lulz:
-// CHECK-NEXT:   12009:  90  nop
+// CHECK-NEXT:   11009:  90  nop
 
 
 .section       .text2,"ax",@progbits
@@ -48,7 +48,7 @@ R_X86_64_32:
 // constants in hex.
 // CHECK: Disassembly of section .text2:
 // CHECK-NEXT: R_X86_64_32:
-// CHECK-NEXT:  1200a: {{.*}} movl $73738, %edx
+// CHECK-NEXT:  1100c: {{.*}} movl $69644, %edx
 
 .section .R_X86_64_32S,"ax",@progbits
 .global R_X86_64_32S
@@ -57,7 +57,7 @@ R_X86_64_32S:
 
 // CHECK: Disassembly of section .R_X86_64_32S:
 // CHECK-NEXT: R_X86_64_32S:
-// CHECK-NEXT:  {{.*}}: {{.*}} movq -974839, %rdx
+// CHECK-NEXT:  {{.*}}: {{.*}} movq -978935, %rdx
 
 .section .R_X86_64_64,"a",@progbits
 .global R_X86_64_64
@@ -65,7 +65,7 @@ R_X86_64_64:
  .quad R_X86_64_64
 
 // CHECK:      Contents of section .R_X86_64_64:
-// CHECK-NEXT:   11000 00100100 00000000
+// CHECK-NEXT:   12000 00200100 00000000
 
 .section .R_X86_64_GOTPCREL,"a",@progbits
 .global R_X86_64_GOTPCREL
@@ -75,4 +75,4 @@ R_X86_64_GOTPCREL:
 // 0x13000 - 0x12008 = 4088
 // 4088 = 0xf80f0000 in little endian
 // CHECK:      Contents of section .R_X86_64_GOTPCREL
-// CHECK-NEXT:   11008 f81f0000
+// CHECK-NEXT:   12008 f80f0000
diff --git a/lld/test/elf2/section-layout.s b/lld/test/elf2/section-layout.s
deleted file mode 100644
index 24cb94807f0..00000000000
--- a/lld/test/elf2/section-layout.s
+++ /dev/null
@@ -1,28 +0,0 @@
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: lld -flavor gnu2 %t -o %tout
-# RUN: llvm-readobj -sections %tout | FileCheck %s
-# REQUIRES: x86
-
-# Check that sections are laid out in the correct order.
-
-.global _start
-.text
-_start:
-
-.section h,""
-.section g,"",@nobits
-.section f,"aw",@nobits
-.section e,"aw"
-.section d,"ax",@nobits
-.section c,"ax"
-.section b,"a",@nobits
-.section a,"a"
-
-// CHECK: Name: a
-// CHECK: Name: b
-// CHECK: Name: c
-// CHECK: Name: d
-// CHECK: Name: e
-// CHECK: Name: f
-// CHECK: Name: h
-// CHECK: Name: g
diff --git a/lld/test/elf2/shared.s b/lld/test/elf2/shared.s
index 2c0f23992b4..8304e7f24a9 100644
--- a/lld/test/elf2/shared.s
+++ b/lld/test/elf2/shared.s
@@ -14,7 +14,7 @@
 // SO-NEXT: Flags [
 // SO-NEXT: ]
 // SO-NEXT: Address:
-// SO-NEXT: Offset: 0x2028
+// SO-NEXT: Offset: 0x300C
 // SO-NEXT: Size:
 // SO-NEXT: Link:
 // SO-NEXT: Info:
@@ -39,14 +39,14 @@
 // CHECK-NEXT: }
 
 // test that .hash is linked to .dynsym
-// CHECK:        Index: 2
+// CHECK:        Index: 5
 // CHECK-NEXT:   Name: .dynsym
 // CHECK-NEXT:   Type: SHT_DYNSYM
 // CHECK-NEXT:   Flags [
 // CHECK-NEXT:     SHF_ALLOC
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Address: [[DYNSYMADDR:.*]]
-// CHECK-NEXT:   Offset: 0x101C
+// CHECK-NEXT:   Offset: 0x201C
 // CHECK-NEXT:   Size:
 // CHECK-NEXT:   Link: [[DYNSTR:.*]]
 // CHECK-NEXT:   Info: 1
@@ -60,7 +60,7 @@
 // CHECK-NEXT:   )
 // CHECK-NEXT: }
 // CHECK-NEXT: Section {
-// CHECK-NEXT:   Index: 3
+// CHECK-NEXT:   Index: 6
 // CHECK-NEXT:    Name: .hash
 // CHECK-NEXT:    Type: SHT_HASH
 // CHECK-NEXT:    Flags [
@@ -69,11 +69,29 @@
 // CHECK-NEXT:    Address: [[HASHADDR:.*]]
 // CHECK-NEXT:    Offset:
 // CHECK-NEXT:    Size:
-// CHECK-NEXT:    Link: 2
+// CHECK-NEXT:    Link: 5
 // CHECK-NEXT:    Info: 0
 // CHECK-NEXT:    AddressAlignment: 4
 // CHECK-NEXT:    EntrySize: 4
 
+
+// CHECK:        Name: .dynamic
+// CHECK-NEXT:   Type: SHT_DYNAMIC
+// CHECK-NEXT:   Flags [
+// CHECK-NEXT:     SHF_ALLOC
+// CHECK-NEXT:     SHF_WRITE
+// CHECK-NEXT:   ]
+// CHECK-NEXT:   Address: [[ADDR:.*]]
+// CHECK-NEXT:   Offset: [[OFFSET:.*]]
+// CHECK-NEXT:   Size: [[SIZE:.*]]
+// CHECK-NEXT:   Link: [[DYNSTR]]
+// CHECK-NEXT:   Info: 0
+// CHECK-NEXT:   AddressAlignment: [[ALIGN:.*]]
+// CHECK-NEXT:   EntrySize: 8
+// CHECK-NEXT:   SectionData (
+// CHECK:        )
+// CHECK-NEXT: }
+
 // CHECK:        Index: [[DYNSTR]]
 // CHECK-NEXT:   Name: .dynstr
 // CHECK-NEXT:   Type: SHT_STRTAB
@@ -100,22 +118,6 @@
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: [[RELSIZE:.*]]
 
-// CHECK:        Name: .dynamic
-// CHECK-NEXT:   Type: SHT_DYNAMIC
-// CHECK-NEXT:   Flags [
-// CHECK-NEXT:     SHF_ALLOC
-// CHECK-NEXT:     SHF_WRITE
-// CHECK-NEXT:   ]
-// CHECK-NEXT:   Address: [[ADDR:.*]]
-// CHECK-NEXT:   Offset: [[OFFSET:.*]]
-// CHECK-NEXT:   Size: [[SIZE:.*]]
-// CHECK-NEXT:   Link: [[DYNSTR]]
-// CHECK-NEXT:   Info: 0
-// CHECK-NEXT:   AddressAlignment: [[ALIGN:.*]]
-// CHECK-NEXT:   EntrySize: 8
-// CHECK-NEXT:   SectionData (
-// CHECK:        )
-// CHECK-NEXT: }
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
@@ -129,7 +131,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start
-// CHECK-NEXT:     Value: 0x12000
+// CHECK-NEXT:     Value: 0x11000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
@@ -168,7 +170,7 @@
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start@
-// CHECK-NEXT:     Value: 0x12000
+// CHECK-NEXT:     Value: 0x11000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: Non
diff --git a/lld/test/elf2/symbols.s b/lld/test/elf2/symbols.s
index 27e6fb7d16b..607048d0407 100644
--- a/lld/test/elf2/symbols.s
+++ b/lld/test/elf2/symbols.s
@@ -45,12 +45,15 @@ hidden:
 .internal internal
 internal:
 
-// CHECK:      Name: foobar
+// CHECK:      Name: .bss
 // CHECK-NEXT: Type: SHT_NOBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
+// CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x11000
+// CHECK-NEXT: Offset: 0x1000
+// CHECK-NEXT: Size: 4
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS
@@ -60,15 +63,12 @@ internal:
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x12000
 
-// CHECK:      Name: .bss
+// CHECK:      Name: foobar
 // CHECK-NEXT: Type: SHT_NOBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
-// CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x13000
-// CHECK-NEXT: Offset: 0x2000
-// CHECK-NEXT: Size: 4
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
@@ -109,7 +109,7 @@ internal:
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: common
-// CHECK-NEXT:     Value: 0x13000
+// CHECK-NEXT:     Value: 0x11000
 // CHECK-NEXT:     Size: 4
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: Object
@@ -127,7 +127,7 @@ internal:
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: protected
-// CHECK-NEXT:     Value: 0x11008
+// CHECK-NEXT:     Value: 0x13008
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
@@ -136,7 +136,7 @@ internal:
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: zed
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x13000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global (0x1)
 // CHECK-NEXT:     Type: None
@@ -145,7 +145,7 @@ internal:
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: zed2
-// CHECK-NEXT:     Value: 0x11004
+// CHECK-NEXT:     Value: 0x13004
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
@@ -154,7 +154,7 @@ internal:
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: zed3
-// CHECK-NEXT:     Value: 0x11008
+// CHECK-NEXT:     Value: 0x13008
 // CHECK-NEXT:     Size: 4
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None