<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Oct 12, 2015 at 8:23 PM, Sean Silva <span dir="ltr"><<a href="mailto:chisophugis@gmail.com" target="_blank">chisophugis@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span class=""><span style="font-size:12.8px">-//  0x130A0 - (0x12000 + 2) - 4 = 4250</span><br style="font-size:12.8px"><span style="font-size:12.8px">-//  0x130A0 - (0x12006 + 2) - 4 = 4244</span><br style="font-size:12.8px"><span style="font-size:12.8px">-//  0x130A8 - (0x1200c + 2) - 4 = 4246</span><br style="font-size:12.8px"><span style="font-size:12.8px">+//  0x110A0 - (0x11000 + 2) - 4 = 4250</span><br style="font-size:12.8px"><span style="font-size:12.8px">+//  0x110A0 - (0x11006 + 2) - 4 = 4244</span><br style="font-size:12.8px"><span style="font-size:12.8px">+//  0x110A8 - (0x1100c + 2) - 4 = 4246</span><br><div><br></div></span><div><span style="font-size:12.8px">This math is not correct.</span></div></div></blockquote><div><br></div><div>Fixed in r250171.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span class="HOEnZb"><font color="#888888"><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px">-- Sean Silva</span></div><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px"><br></span></div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Oct 10, 2015 at 4:25 PM, Rui Ueyama via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Sat Oct 10 18:25:39 2015<br>
New Revision: 249957<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249957&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249957&view=rev</a><br>
Log:<br>
ELF2: Write .interp section on the first page in the exectuable.<br>
<br>
Previously, we reserved the first page for the program header, so no<br>
sections would be written to very beginning of the output file.<br>
FreeBSD requires .interp section be exist on the first page, so that<br>
was not good.<br>
<br>
This patch calculates the size of the program header and then assign<br>
addresses to the sections. Now the first section is located next to<br>
the program header. Because the first section is .interp, it's very<br>
likely to be on the first page.<br>
<br>
Modified:<br>
    lld/trunk/ELF/Writer.cpp<br>
    lld/trunk/test/elf2/aarch64-data-relocs.s<br>
    lld/trunk/test/elf2/basic-mips.s<br>
    lld/trunk/test/elf2/comdat.s<br>
    lld/trunk/test/elf2/discard-locals.s<br>
    lld/trunk/test/elf2/discard-none.s<br>
    lld/trunk/test/elf2/dynamic-reloc-index.s<br>
    lld/trunk/test/elf2/emulation.s<br>
    lld/trunk/test/elf2/got.s<br>
    lld/trunk/test/elf2/local-dynamic.s<br>
    lld/trunk/test/elf2/local-got-shared.s<br>
    lld/trunk/test/elf2/local-got.s<br>
    lld/trunk/test/elf2/local.s<br>
    lld/trunk/test/elf2/plt-i686.s<br>
    lld/trunk/test/elf2/plt.s<br>
    lld/trunk/test/elf2/pre_init_fini_array.s<br>
    lld/trunk/test/elf2/program-header-layout.s<br>
    lld/trunk/test/elf2/relative-dynamic-reloc.s<br>
    lld/trunk/test/elf2/relocation-i686.s<br>
    lld/trunk/test/elf2/relocation-local.s<br>
    lld/trunk/test/elf2/relocation.s<br>
    lld/trunk/test/elf2/shared.s<br>
    lld/trunk/test/elf2/string-table.s<br>
    lld/trunk/test/elf2/symbols.s<br>
<br>
Modified: lld/trunk/ELF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.cpp (original)<br>
+++ lld/trunk/ELF/Writer.cpp Sat Oct 10 18:25:39 2015<br>
@@ -329,6 +329,10 @@ static void addCommonSymbols(std::vector<br>
<br>
 // Create output section objects and add them to OutputSections.<br>
 template <class ELFT> void Writer<ELFT>::createSections() {<br>
+  // .interp needs to be on the first page in the output file.<br>
+  if (needsInterpSection())<br>
+    OutputSections.push_back(Out<ELFT>::Interp);<br>
+<br>
   SmallDenseMap<SectionKey<ELFT::Is64Bits>, OutputSection<ELFT> *> Map;<br>
<br>
   OutputSections.push_back(Out<ELFT>::Bss);<br>
@@ -414,8 +418,6 @@ template <class ELFT> void Writer<ELFT>:<br>
<br>
   OutputSections.push_back(Out<ELFT>::SymTab);<br>
   if (needsDynamicSections()) {<br>
-    if (needsInterpSection())<br>
-      OutputSections.push_back(Out<ELFT>::Interp);<br>
     OutputSections.push_back(Out<ELFT>::DynSymTab);<br>
     OutputSections.push_back(Out<ELFT>::HashTab);<br>
     OutputSections.push_back(Out<ELFT>::Dynamic);<br>
@@ -465,8 +467,23 @@ template <class ELFT> void Writer<ELFT>:<br>
   phdrSet(&PhdrPhdr, PT_PHDR, PF_R, FileOff, VA, /*Align=*/8);<br>
<br>
   // Reserve space for Phdrs.<br>
-  FileOff = RoundUpToAlignment(FileOff, Target->getPageSize());<br>
-  VA = RoundUpToAlignment(VA, Target->getPageSize());<br>
+  int NumPhdrs = 2;   // 2 for PhdrPhdr and FileHeaderPhdr<br>
+  if (needsInterpSection())<br>
+    ++NumPhdrs;<br>
+  if (needsDynamicSections())<br>
+    ++NumPhdrs;<br>
+  uintX_t Last = PF_R;<br>
+  for (OutputSectionBase<ELFT::Is64Bits> *Sec : OutputSections) {<br>
+    if (!Sec->getSize() || !needsPhdr<ELFT>(Sec))<br>
+      continue;<br>
+    uintX_t Flags = toPhdrFlags(Sec->getFlags());<br>
+    if (Last != Flags) {<br>
+      Last = Flags;<br>
+      ++NumPhdrs;<br>
+    }<br>
+  }<br>
+  FileOff += sizeof(Elf_Phdr) * NumPhdrs;<br>
+  VA += sizeof(Elf_Phdr) * NumPhdrs;<br>
<br>
   if (needsInterpSection())<br>
     Phdrs.push_back(&InterpPhdr);<br>
@@ -525,6 +542,13 @@ template <class ELFT> void Writer<ELFT>:<br>
   PhdrPhdr.p_filesz = sizeof(Elf_Phdr) * Phdrs.size();<br>
   PhdrPhdr.p_memsz = sizeof(Elf_Phdr) * Phdrs.size();<br>
<br>
+  // If nothing was merged into the file header PT_LOAD, set the size correctly.<br>
+  if (FileHeaderPhdr.p_filesz == Target->getPageSize()) {<br>
+    uint64_t Size = sizeof(Elf_Ehdr) + sizeof(Elf_Phdr) * Phdrs.size();<br>
+    FileHeaderPhdr.p_filesz = Size;<br>
+    FileHeaderPhdr.p_memsz = Size;<br>
+  }<br>
+<br>
   // Add space for section headers.<br>
   FileOff = RoundUpToAlignment(FileOff, ELFT::Is64Bits ? 8 : 4);<br>
   SectionHeaderOff = FileOff;<br>
@@ -566,13 +590,6 @@ template <class ELFT> void Writer<ELFT>:<br>
   EHdr->e_shnum = getNumSections();<br>
   EHdr->e_shstrndx = Out<ELFT>::StrTab->getSectionIndex();<br>
<br>
-  // If nothing was merged into the file header PT_LOAD, set the size correctly.<br>
-  if (FileHeaderPhdr.p_filesz == Target->getPageSize()) {<br>
-    uint64_t Size = sizeof(Elf_Ehdr) + sizeof(Elf_Phdr) * Phdrs.size();<br>
-    FileHeaderPhdr.p_filesz = Size;<br>
-    FileHeaderPhdr.p_memsz = Size;<br>
-  }<br>
-<br>
   auto PHdrs = reinterpret_cast<Elf_Phdr *>(Buf + EHdr->e_phoff);<br>
   for (Elf_Phdr *PH : Phdrs)<br>
     *PHdrs++ = *PH;<br>
<br>
Modified: lld/trunk/test/elf2/aarch64-data-relocs.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/aarch64-data-relocs.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/aarch64-data-relocs.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/aarch64-data-relocs.s (original)<br>
+++ lld/trunk/test/elf2/aarch64-data-relocs.s Sat Oct 10 18:25:39 2015<br>
@@ -14,16 +14,16 @@<br>
<br>
 // CHECK: Disassembly of section .R_AARCH64_ABS16:<br>
 // CHECK-NEXT: $d.0:<br>
-// CHECK-NEXT:     2000:       0c 00   .short<br>
+// CHECK-NEXT:     1000:       0c 00   .short<br>
 //                             ^-- A = 0xc<br>
<br>
 // CHECK-NEXT: Disassembly of section .R_AARCH64_ABS32:<br>
 // CHECK-NEXT: $d.1:<br>
-// CHECK-NEXT:     2002:       18 00 00 00     .word<br>
+// CHECK-NEXT:     1002:       18 00 00 00     .word<br>
 //                             ^-- A = 0x18<br>
<br>
 // CHECK-NEXT: Disassembly of section .R_AARCH64_ABS64:<br>
 // CHECK-NEXT: $d.2:<br>
-// CHECK-NEXT:     2006:       24 00 00 00     .word<br>
+// CHECK-NEXT:     1006:       24 00 00 00     .word<br>
 //                             ^-- A = 0x24<br>
-// CHECK-NEXT:     200a:       00 00 00 00     .word<br>
+// CHECK-NEXT:     100a:       00 00 00 00     .word<br>
<br>
Modified: lld/trunk/test/elf2/basic-mips.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic-mips.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic-mips.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/basic-mips.s (original)<br>
+++ lld/trunk/test/elf2/basic-mips.s Sat Oct 10 18:25:39 2015<br>
@@ -25,9 +25,9 @@ __start:<br>
 # CHECK-NEXT:   Type: Executable (0x2)<br>
 # CHECK-NEXT:   Machine: EM_MIPS (0x8)<br>
 # CHECK-NEXT:   Version: 1<br>
-# CHECK-NEXT:   Entry: 0x420000<br>
+# CHECK-NEXT:   Entry: 0x410000<br>
 # CHECK-NEXT:   ProgramHeaderOffset: 0x34<br>
-# CHECK-NEXT:   SectionHeaderOffset: 0x20074<br>
+# CHECK-NEXT:   SectionHeaderOffset: 0x10074<br>
 # CHECK-NEXT:   Flags [ (0x0)<br>
 # CHECK-NEXT:   ]<br>
 # CHECK-NEXT:   HeaderSize: 52<br>
@@ -59,8 +59,8 @@ __start:<br>
 # CHECK-NEXT:     Flags [ (0x2)<br>
 # CHECK-NEXT:       SHF_ALLOC (0x2)<br>
 # CHECK-NEXT:     ]<br>
-# CHECK-NEXT:     Address: 0x410000<br>
-# CHECK-NEXT:     Offset: 0x1000<br>
+# CHECK-NEXT:     Address: 0x400094<br>
+# CHECK-NEXT:     Offset: 0x94<br>
 # CHECK-NEXT:     Size: 24<br>
 # CHECK-NEXT:     Link: 0<br>
 # CHECK-NEXT:     Info: 0<br>
@@ -74,8 +74,8 @@ __start:<br>
 # CHECK-NEXT:     Flags [ (0x2)<br>
 # CHECK-NEXT:       SHF_ALLOC (0x2)<br>
 # CHECK-NEXT:     ]<br>
-# CHECK-NEXT:     Address: 0x410018<br>
-# CHECK-NEXT:     Offset: 0x10018<br>
+# CHECK-NEXT:     Address: 0x4000B0<br>
+# CHECK-NEXT:     Offset: 0xB0<br>
 # CHECK-NEXT:     Size: 24<br>
 # CHECK-NEXT:     Link: 0<br>
 # CHECK-NEXT:     Info: 0<br>
@@ -90,8 +90,8 @@ __start:<br>
 # CHECK-NEXT:       SHF_ALLOC (0x2)<br>
 # CHECK-NEXT:       SHF_EXECINSTR (0x4)<br>
 # CHECK-NEXT:     ]<br>
-# CHECK-NEXT:     Address: 0x420000<br>
-# CHECK-NEXT:     Offset: 0x2000<br>
+# CHECK-NEXT:     Address: 0x410000<br>
+# CHECK-NEXT:     Offset: 0x10000<br>
 # CHECK-NEXT:     Size: 12<br>
 # CHECK-NEXT:     Link: 0<br>
 # CHECK-NEXT:     Info: 0<br>
@@ -106,8 +106,8 @@ __start:<br>
 # CHECK-NEXT:       SHF_ALLOC (0x2)<br>
 # CHECK-NEXT:       SHF_WRITE (0x1)<br>
 # CHECK-NEXT:     ]<br>
-# CHECK-NEXT:     Address: 0x420010<br>
-# CHECK-NEXT:     Offset: 0x20010<br>
+# CHECK-NEXT:     Address: 0x410010<br>
+# CHECK-NEXT:     Offset: 0x10010<br>
 # CHECK-NEXT:     Size: 0<br>
 # CHECK-NEXT:     Link: 0<br>
 # CHECK-NEXT:     Info: 0<br>
@@ -122,8 +122,8 @@ __start:<br>
 # CHECK-NEXT:       SHF_ALLOC (0x2)<br>
 # CHECK-NEXT:       SHF_WRITE (0x1)<br>
 # CHECK-NEXT:     ]<br>
-# CHECK-NEXT:     Address: 0x420010<br>
-# CHECK-NEXT:     Offset: 0x20010<br>
+# CHECK-NEXT:     Address: 0x410010<br>
+# CHECK-NEXT:     Offset: 0x10010<br>
 # CHECK-NEXT:     Size: 0<br>
 # CHECK-NEXT:     Link: 0<br>
 # CHECK-NEXT:     Info: 0<br>
@@ -137,7 +137,7 @@ __start:<br>
 # CHECK-NEXT:     Flags [ (0x0)<br>
 # CHECK-NEXT:     ]<br>
 # CHECK-NEXT:     Address: 0x0<br>
-# CHECK-NEXT:     Offset: 0x20010<br>
+# CHECK-NEXT:     Offset: 0x10010<br>
 # CHECK-NEXT:     Size: 32<br>
 # CHECK-NEXT:     Link: 7<br>
 # CHECK-NEXT:     Info: 1<br>
@@ -151,7 +151,7 @@ __start:<br>
 # CHECK-NEXT:     Flags [ (0x0)<br>
 # CHECK-NEXT:     ]<br>
 # CHECK-NEXT:     Address: 0x0<br>
-# CHECK-NEXT:     Offset: 0x20030<br>
+# CHECK-NEXT:     Offset: 0x10030<br>
 # CHECK-NEXT:     Size: 66<br>
 # CHECK-NEXT:     Link: 0<br>
 # CHECK-NEXT:     Info: 0<br>
@@ -171,7 +171,7 @@ __start:<br>
 # CHECK-NEXT:   }<br>
 # CHECK-NEXT:   Symbol {<br>
 # CHECK-NEXT:     Name: __start (7)<br>
-# CHECK-NEXT:     Value: 0x420000<br>
+# CHECK-NEXT:     Value: 0x410000<br>
 # CHECK-NEXT:     Size: 0<br>
 # CHECK-NEXT:     Binding: Global (0x1)<br>
 # CHECK-NEXT:     Type: None (0x0)<br>
@@ -197,8 +197,8 @@ __start:<br>
 # CHECK-NEXT:     Offset: 0x0<br>
 # CHECK-NEXT:     VirtualAddress: 0x400000<br>
 # CHECK-NEXT:     PhysicalAddress: 0x400000<br>
-# CHECK-NEXT:     FileSize: 65584<br>
-# CHECK-NEXT:     MemSize: 65584<br>
+# CHECK-NEXT:     FileSize: 200<br>
+# CHECK-NEXT:     MemSize: 200<br>
 # CHECK-NEXT:     Flags [ (0x4)<br>
 # CHECK-NEXT:       PF_R (0x4)<br>
 # CHECK-NEXT:     ]<br>
@@ -206,9 +206,9 @@ __start:<br>
 # CHECK-NEXT:   }<br>
 # CHECK-NEXT:   ProgramHeader {<br>
 # CHECK-NEXT:     Type: PT_LOAD (0x1)<br>
-# CHECK-NEXT:     Offset: 0x2000<br>
-# CHECK-NEXT:     VirtualAddress: 0x420000<br>
-# CHECK-NEXT:     PhysicalAddress: 0x420000<br>
+# CHECK-NEXT:     Offset: 0x10000<br>
+# CHECK-NEXT:     VirtualAddress: 0x410000<br>
+# CHECK-NEXT:     PhysicalAddress: 0x410000<br>
 # CHECK-NEXT:     FileSize: 16<br>
 # CHECK-NEXT:     MemSize: 16<br>
 # CHECK-NEXT:     Flags [ (0x5)<br>
<br>
Modified: lld/trunk/test/elf2/comdat.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/comdat.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/comdat.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/comdat.s (original)<br>
+++ lld/trunk/test/elf2/comdat.s Sat Oct 10 18:25:39 2015<br>
@@ -11,7 +11,7 @@ foo:<br>
<br>
 // CHECK: Disassembly of section .text2:<br>
 // CHECK-NEXT: foo:<br>
-// CHECK-NEXT:   2000: {{.*}}  nop<br>
+// CHECK-NEXT:   1000: {{.*}}  nop<br>
 // CHECK-NOT: nop<br>
<br>
         .section bar, "ax"<br>
@@ -19,10 +19,10 @@ foo:<br>
<br>
 // CHECK: Disassembly of section bar:<br>
 // CHECK-NEXT: bar:<br>
-// 0x2000 - 0x2001 - 5 = -6<br>
-// 0      - 0x2006 - 5 = -8203<br>
-// CHECK-NEXT:   2001: {{.*}}  callq  -6<br>
-// CHECK-NEXT:   2006: {{.*}}  callq  -8203<br>
+// 0x1000 - 0x1001 - 5 = -6<br>
+// 0      - 0x1006 - 5 = -8203<br>
+// CHECK-NEXT:   1001: {{.*}}  callq  -6<br>
+// CHECK-NEXT:   1006: {{.*}}  callq  -4107<br>
<br>
         .section .text3,"axG",@progbits,zed,comdat,unique,0<br>
<br>
<br>
Modified: lld/trunk/test/elf2/discard-locals.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/discard-locals.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/discard-locals.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/discard-locals.s (original)<br>
+++ lld/trunk/test/elf2/discard-locals.s Sat Oct 10 18:25:39 2015<br>
@@ -42,7 +42,7 @@ _start:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start<br>
-// CHECK-NEXT:     Value: 0x11000<br>
+// CHECK-NEXT:     Value: 0x100B0<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
<br>
Modified: lld/trunk/test/elf2/discard-none.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/discard-none.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/discard-none.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/discard-none.s (original)<br>
+++ lld/trunk/test/elf2/discard-none.s Sat Oct 10 18:25:39 2015<br>
@@ -40,7 +40,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: .Lmyothervar<br>
-// CHECK-NEXT:     Value: 0x102C<br>
+// CHECK-NEXT:     Value: 0x14C<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -49,7 +49,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: .Lmyvar<br>
-// CHECK-NEXT:     Value: 0x102C<br>
+// CHECK-NEXT:     Value: 0x14C<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
<br>
Modified: lld/trunk/test/elf2/dynamic-reloc-index.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/dynamic-reloc-index.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/dynamic-reloc-index.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/dynamic-reloc-index.s (original)<br>
+++ lld/trunk/test/elf2/dynamic-reloc-index.s Sat Oct 10 18:25:39 2015<br>
@@ -8,7 +8,7 @@<br>
<br>
 // CHECK:      Relocations [<br>
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
-// CHECK-NEXT:     0x12000 R_X86_64_64 bar 0x0<br>
+// CHECK-NEXT:     0x11000 R_X86_64_64 bar 0x0<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
<br>
Modified: lld/trunk/test/elf2/emulation.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/emulation.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/emulation.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/emulation.s (original)<br>
+++ lld/trunk/test/elf2/emulation.s Sat Oct 10 18:25:39 2015<br>
@@ -16,9 +16,9 @@<br>
 # X86-64-NEXT:   Type: Executable (0x2)<br>
 # X86-64-NEXT:   Machine: EM_X86_64 (0x3E)<br>
 # X86-64-NEXT:   Version: 1<br>
-# X86-64-NEXT:   Entry: 0x11000<br>
+# X86-64-NEXT:   Entry: 0x100B0<br>
 # X86-64-NEXT:   ProgramHeaderOffset: 0x40<br>
-# X86-64-NEXT:   SectionHeaderOffset: 0x1060<br>
+# X86-64-NEXT:   SectionHeaderOffset: 0x110<br>
 # X86-64-NEXT:   Flags [ (0x0)<br>
 # X86-64-NEXT:   ]<br>
 # X86-64-NEXT:   HeaderSize: 64<br>
@@ -47,9 +47,9 @@<br>
 # X86-NEXT:   Type: Executable (0x2)<br>
 # X86-NEXT:   Machine: EM_386 (0x3)<br>
 # X86-NEXT:   Version: 1<br>
-# X86-NEXT:   Entry: 0x11000<br>
+# X86-NEXT:   Entry: 0x10074<br>
 # X86-NEXT:   ProgramHeaderOffset: 0x34<br>
-# X86-NEXT:   SectionHeaderOffset: 0x104C<br>
+# X86-NEXT:   SectionHeaderOffset: 0xC0<br>
 # X86-NEXT:   Flags [ (0x0)<br>
 # X86-NEXT:   ]<br>
 # X86-NEXT:   HeaderSize: 52<br>
@@ -78,9 +78,9 @@<br>
 # PPC64-NEXT:   Type: Executable (0x2)<br>
 # PPC64-NEXT:   Machine: EM_PPC64 (0x15)<br>
 # PPC64-NEXT:   Version: 1<br>
-# PPC64-NEXT:   Entry: 0x10010000<br>
+# PPC64-NEXT:   Entry: 0x100000B0<br>
 # PPC64-NEXT:   ProgramHeaderOffset: 0x40<br>
-# PPC64-NEXT:   SectionHeaderOffset: 0x10060<br>
+# PPC64-NEXT:   SectionHeaderOffset: 0x110<br>
 # PPC64-NEXT:   Flags [ (0x0)<br>
 # PPC64-NEXT:   ]<br>
 # PPC64-NEXT:   HeaderSize: 64<br>
@@ -109,9 +109,9 @@<br>
 # PPC-NEXT:   Type: Executable (0x2)<br>
 # PPC-NEXT:   Machine: EM_PPC (0x14)<br>
 # PPC-NEXT:   Version: 1<br>
-# PPC-NEXT:   Entry: 0x10010000<br>
+# PPC-NEXT:   Entry: 0x10000074<br>
 # PPC-NEXT:   ProgramHeaderOffset: 0x34<br>
-# PPC-NEXT:   SectionHeaderOffset: 0x1004C<br>
+# PPC-NEXT:   SectionHeaderOffset: 0xC0<br>
 # PPC-NEXT:   Flags [ (0x0)<br>
 # PPC-NEXT:   ]<br>
 # PPC-NEXT:   HeaderSize: 52<br>
@@ -140,9 +140,9 @@<br>
 # MIPS-NEXT:   Type: Executable (0x2)<br>
 # MIPS-NEXT:   Machine: EM_MIPS (0x8)<br>
 # MIPS-NEXT:   Version: 1<br>
-# MIPS-NEXT:   Entry: 0x410030<br>
+# MIPS-NEXT:   Entry: 0x4000B0<br>
 # MIPS-NEXT:   ProgramHeaderOffset: 0x34<br>
-# MIPS-NEXT:   SectionHeaderOffset: 0x10094<br>
+# MIPS-NEXT:   SectionHeaderOffset: 0x114<br>
 # MIPS-NEXT:   Flags [ (0x0)<br>
 # MIPS-NEXT:   ]<br>
<br>
@@ -164,9 +164,9 @@<br>
 # MIPSEL-NEXT:   Type: Executable (0x2)<br>
 # MIPSEL-NEXT:   Machine: EM_MIPS (0x8)<br>
 # MIPSEL-NEXT:   Version: 1<br>
-# MIPSEL-NEXT:   Entry: 0x410030<br>
+# MIPSEL-NEXT:   Entry: 0x4000B0<br>
 # MIPSEL-NEXT:   ProgramHeaderOffset: 0x34<br>
-# MIPSEL-NEXT:   SectionHeaderOffset: 0x10094<br>
+# MIPSEL-NEXT:   SectionHeaderOffset: 0x114<br>
 # MIPSEL-NEXT:   Flags [ (0x0)<br>
 # MIPSEL-NEXT:   ]<br>
<br>
<br>
Modified: lld/trunk/test/elf2/got.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/got.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/got.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/got.s (original)<br>
+++ lld/trunk/test/elf2/got.s Sat Oct 10 18:25:39 2015<br>
@@ -12,7 +12,7 @@<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_WRITE<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x130A0<br>
+// CHECK-NEXT: Address: 0x120A0<br>
 // CHECK-NEXT: Offset:<br>
 // CHECK-NEXT: Size: 16<br>
 // CHECK-NEXT: Link: 0<br>
@@ -21,22 +21,22 @@<br>
<br>
 // CHECK:      Relocations [<br>
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
-// CHECK-NEXT:     0x130A0 R_X86_64_GLOB_DAT bar 0x0<br>
-// CHECK-NEXT:     0x130A8 R_X86_64_GLOB_DAT zed 0x0<br>
+// CHECK-NEXT:     0x120A0 R_X86_64_GLOB_DAT bar 0x0<br>
+// CHECK-NEXT:     0x120A8 R_X86_64_GLOB_DAT zed 0x0<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
<br>
 // Unfortunately FileCheck can't do math, so we have to check for explicit<br>
 // values:<br>
-//  0x130A0 - (0x12000 + 2) - 4 = 4250<br>
-//  0x130A0 - (0x12006 + 2) - 4 = 4244<br>
-//  0x130A8 - (0x1200c + 2) - 4 = 4246<br>
+//  0x110A0 - (0x11000 + 2) - 4 = 4250<br>
+//  0x110A0 - (0x11006 + 2) - 4 = 4244<br>
+//  0x110A8 - (0x1100c + 2) - 4 = 4246<br>
<br>
 // DISASM:      _start:<br>
-// DISASM-NEXT:   12000:  {{.*}}  jmpq  *4250(%rip)<br>
-// DISASM-NEXT:   12006:  {{.*}}  jmpq  *4244(%rip)<br>
-// DISASM-NEXT:   1200c:  {{.*}}  jmpq  *4246(%rip)<br>
+// DISASM-NEXT:   11000:  {{.*}}  jmpq  *4250(%rip)<br>
+// DISASM-NEXT:   11006:  {{.*}}  jmpq  *4244(%rip)<br>
+// DISASM-NEXT:   1100c:  {{.*}}  jmpq  *4246(%rip)<br>
<br>
 .global _start<br>
 _start:<br>
<br>
Modified: lld/trunk/test/elf2/local-dynamic.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local-dynamic.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local-dynamic.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/local-dynamic.s (original)<br>
+++ lld/trunk/test/elf2/local-dynamic.s Sat Oct 10 18:25:39 2015<br>
@@ -16,7 +16,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: blah<br>
-// CHECK-NEXT:     Value: 0x1050<br>
+// CHECK-NEXT:     Value: 0x170<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -25,7 +25,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: foo<br>
-// CHECK-NEXT:     Value: 0x1050<br>
+// CHECK-NEXT:     Value: 0x170<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -34,7 +34,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: goo<br>
-// CHECK-NEXT:     Value: 0x1050<br>
+// CHECK-NEXT:     Value: 0x170<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -43,7 +43,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start<br>
-// CHECK-NEXT:     Value: 0x1050<br>
+// CHECK-NEXT:     Value: 0x170<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
@@ -64,7 +64,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start@<br>
-// CHECK-NEXT:     Value: 0x1050<br>
+// CHECK-NEXT:     Value: 0x170<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
<br>
Modified: lld/trunk/test/elf2/local-got-shared.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local-got-shared.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local-got-shared.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/local-got-shared.s (original)<br>
+++ lld/trunk/test/elf2/local-got-shared.s Sat Oct 10 18:25:39 2015<br>
@@ -11,12 +11,12 @@ bar:<br>
 foo:<br>
         nop<br>
<br>
-// 0x3090 - 0x2000 - 5 = 4235<br>
+// 0x2090 - 0x1000 - 5 = 4235<br>
 // DISASM:      bar:<br>
-// DISASM-NEXT:   2000: {{.*}} callq 4235<br>
+// DISASM-NEXT:   1000: {{.*}} callq 4235<br>
<br>
 // DISASM:      foo:<br>
-// DISASM-NEXT:   2005: {{.*}} nop<br>
+// DISASM-NEXT:   1005: {{.*}} nop<br>
<br>
 // CHECK:      Name: .got<br>
 // CHECK-NEXT: Type: SHT_PROGBITS<br>
@@ -24,12 +24,12 @@ foo:<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_WRITE<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x3090<br>
+// CHECK-NEXT: Address: 0x2090<br>
 // CHECK-NEXT: Offset:<br>
 // CHECK-NEXT: Size: 8<br>
<br>
 // CHECK:      Relocations [<br>
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
-// CHECK-NEXT:     0x3090 R_X86_64_RELATIVE - 0x2005<br>
+// CHECK-NEXT:     0x2090 R_X86_64_RELATIVE - 0x1005<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
Modified: lld/trunk/test/elf2/local-got.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local-got.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local-got.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/local-got.s (original)<br>
+++ lld/trunk/test/elf2/local-got.s Sat Oct 10 18:25:39 2015<br>
@@ -14,14 +14,14 @@ _start:<br>
 foo:<br>
         nop<br>
<br>
-// 0x130A0 - 0x12000 - 5 =  4251<br>
-// 0x130A8 - 0x12005 - 5 =  4254<br>
+// 0x120A0 - 0x11000 - 5 =  4251<br>
+// 0x120A8 - 0x11005 - 5 =  4254<br>
 // DISASM:      _start:<br>
-// DISASM-NEXT:   12000: {{.*}} callq 4251<br>
-// DISASM-NEXT:   12005: {{.*}} callq 4254<br>
+// DISASM-NEXT:   11000: {{.*}} callq 4251<br>
+// DISASM-NEXT:   11005: {{.*}} callq 4254<br>
<br>
 // DISASM:      foo:<br>
-// DISASM-NEXT:   1200a: {{.*}} nop<br>
+// DISASM-NEXT:   1100a: {{.*}} nop<br>
<br>
 // CHECK:      Name: .got<br>
 // CHECK-NEXT: Type: SHT_PROGBITS<br>
@@ -29,7 +29,7 @@ foo:<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_WRITE<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x130A0<br>
+// CHECK-NEXT: Address: 0x120A0<br>
 // CHECK-NEXT: Offset:<br>
 // CHECK-NEXT: Size: 16<br>
 // CHECK-NEXT: Link: 0<br>
@@ -38,11 +38,11 @@ foo:<br>
 // CHECK-NEXT: EntrySize: 0<br>
 // CHECK-NEXT: SectionData (<br>
 // 0x1200a in little endian<br>
-// CHECK-NEXT:   0000:  00000000 00000000 0A200100 00000000<br>
+// CHECK-NEXT:   0000:  00000000 00000000 0A100100 00000000<br>
 // CHECK-NEXT: )<br>
<br>
 // CHECK:      Relocations [<br>
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
-// CHECK-NEXT:     0x130A0 R_X86_64_GLOB_DAT bar 0x0<br>
+// CHECK-NEXT:     0x120A0 R_X86_64_GLOB_DAT bar 0x0<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
Modified: lld/trunk/test/elf2/local.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/local.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/local.s (original)<br>
+++ lld/trunk/test/elf2/local.s Sat Oct 10 18:25:39 2015<br>
@@ -37,7 +37,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: blah<br>
-// CHECK-NEXT:     Value: 0x11000<br>
+// CHECK-NEXT:     Value: 0x100B0<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -46,7 +46,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: foo<br>
-// CHECK-NEXT:     Value: 0x11000<br>
+// CHECK-NEXT:     Value: 0x100B0<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -55,7 +55,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: goo<br>
-// CHECK-NEXT:     Value: 0x11000<br>
+// CHECK-NEXT:     Value: 0x100B0<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -64,7 +64,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start<br>
-// CHECK-NEXT:     Value: 0x11000<br>
+// CHECK-NEXT:     Value: 0x100B0<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
<br>
Modified: lld/trunk/test/elf2/plt-i686.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/plt-i686.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/plt-i686.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/plt-i686.s (original)<br>
+++ lld/trunk/test/elf2/plt-i686.s Sat Oct 10 18:25:39 2015<br>
@@ -12,7 +12,7 @@<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_EXECINSTR<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x12010<br>
+// CHECK-NEXT: Address: 0x11010<br>
 // CHECK-NEXT: Offset:<br>
 // CHECK-NEXT: Size: 16<br>
 // CHECK-NEXT: Link: 0<br>
@@ -21,34 +21,34 @@<br>
<br>
 // CHECK:      Relocations [<br>
 // CHECK-NEXT:   Section ({{.*}}) .rel.dyn {<br>
-// CHECK-NEXT:     0x13050 R_386_GLOB_DAT bar 0x0<br>
-// CHECK-NEXT:     0x13054 R_386_GLOB_DAT zed 0x0<br>
+// CHECK-NEXT:     0x12050 R_386_GLOB_DAT bar 0x0<br>
+// CHECK-NEXT:     0x12054 R_386_GLOB_DAT zed 0x0<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
 // Unfortunately FileCheck can't do math, so we have to check for explicit<br>
 // values:<br>
<br>
-// 0x12010 - (0x12000 + 1) - 4 = 11<br>
-// 0x12010 - (0x12005 + 1) - 4 = 2<br>
-// 0x12018 - (0x1200a + 1) - 4 = 9<br>
+// 0x11010 - (0x11000 + 1) - 4 = 11<br>
+// 0x11010 - (0x11005 + 1) - 4 = 2<br>
+// 0x11018 - (0x1100a + 1) - 4 = 9<br>
<br>
 // DISASM:      _start:<br>
-// DISASM-NEXT:   12000:  e9 0b 00 00 00  jmp  11<br>
-// DISASM-NEXT:   12005:  e9 06 00 00 00  jmp  6<br>
-// DISASM-NEXT:   1200a:  e9 09 00 00 00  jmp  9<br>
+// DISASM-NEXT:   11000:  e9 0b 00 00 00  jmp  11<br>
+// DISASM-NEXT:   11005:  e9 06 00 00 00  jmp  6<br>
+// DISASM-NEXT:   1100a:  e9 09 00 00 00  jmp  9<br>
<br>
-// 0x13050 = 77904<br>
-// 0x13054 = 77908<br>
+// 0x12050 = 73808<br>
+// 0x12054 = 73812<br>
<br>
 // DISASM:      Disassembly of section .plt:<br>
 // DISASM-NEXT: .plt:<br>
-// DISASM-NEXT:   12010:  ff 25 {{.*}}       jmpl *77904<br>
-// DISASM-NEXT:   12016:  90                 nop<br>
-// DISASM-NEXT:   12017:  90                 nop<br>
-// DISASM-NEXT:   12018:  ff 25 {{.*}}       jmpl *77908<br>
-// DISASM-NEXT:   1201e:  90                 nop<br>
-// DISASM-NEXT:   1201f:  90                 nop<br>
+// DISASM-NEXT:   11010:  ff 25 {{.*}}       jmpl *73808<br>
+// DISASM-NEXT:   11016:  90                 nop<br>
+// DISASM-NEXT:   11017:  90                 nop<br>
+// DISASM-NEXT:   11018:  ff 25 {{.*}}       jmpl *73812<br>
+// DISASM-NEXT:   1101e:  90                 nop<br>
+// DISASM-NEXT:   1101f:  90                 nop<br>
<br>
 .global _start<br>
 _start:<br>
<br>
Modified: lld/trunk/test/elf2/plt.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/plt.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/plt.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/plt.s (original)<br>
+++ lld/trunk/test/elf2/plt.s Sat Oct 10 18:25:39 2015<br>
@@ -12,7 +12,7 @@<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_EXECINSTR<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x2020<br>
+// CHECK-NEXT: Address: 0x1020<br>
 // CHECK-NEXT: Offset:<br>
 // CHECK-NEXT: Size: 24<br>
 // CHECK-NEXT: Link: 0<br>
@@ -21,35 +21,35 @@<br>
<br>
 // CHECK:      Relocations [<br>
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
-// CHECK-NEXT:     0x30A0 R_X86_64_GLOB_DAT bar 0x0<br>
-// CHECK-NEXT:     0x30A8 R_X86_64_GLOB_DAT zed 0x0<br>
-// CHECK-NEXT:     0x30B0 R_X86_64_GLOB_DAT _start 0x0<br>
+// CHECK-NEXT:     0x20A0 R_X86_64_GLOB_DAT bar 0x0<br>
+// CHECK-NEXT:     0x20A8 R_X86_64_GLOB_DAT zed 0x0<br>
+// CHECK-NEXT:     0x20B0 R_X86_64_GLOB_DAT _start 0x0<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
 // Unfortunately FileCheck can't do math, so we have to check for explicit<br>
 // values:<br>
<br>
-// 0x12020 - (0x12000 + 1) - 4 = 27<br>
-// 0x12020 - (0x12005 + 1) - 4 = 22<br>
-// 0x12028 - (0x1200a + 1) - 4 = 25<br>
+// 0x11020 - (0x11000 + 1) - 4 = 27<br>
+// 0x11020 - (0x11005 + 1) - 4 = 22<br>
+// 0x11028 - (0x1100a + 1) - 4 = 25<br>
<br>
 // DISASM:      _start:<br>
-// DISASM-NEXT:   2000:  e9 {{.*}}       jmp  27<br>
-// DISASM-NEXT:   2005:  e9 {{.*}}       jmp  22<br>
-// DISASM-NEXT:   200a:  e9 {{.*}}       jmp  25<br>
+// DISASM-NEXT:   1000:  e9 {{.*}}       jmp  27<br>
+// DISASM-NEXT:   1005:  e9 {{.*}}       jmp  22<br>
+// DISASM-NEXT:   100a:  e9 {{.*}}       jmp  25<br>
<br>
-// 0x130A0 - 0x12026  = 4218<br>
-// 0x130A8 - 0x1202e  = 4218<br>
+// 0x120A0 - 0x11026  = 4218<br>
+// 0x120A8 - 0x1102e  = 4218<br>
<br>
 // DISASM:      Disassembly of section .plt:<br>
 // DISASM-NEXT: .plt:<br>
-// DISASM-NEXT:   2020:  ff 25 {{.*}}       jmpq *4218(%rip)<br>
-// DISASM-NEXT:   2026:  90                 nop<br>
-// DISASM-NEXT:   2027:  90                 nop<br>
-// DISASM-NEXT:   2028:  ff 25 {{.*}}       jmpq *4218(%rip)<br>
-// DISASM-NEXT:   202e:  90                 nop<br>
-// DISASM-NEXT:   202f:  90                 nop<br>
+// DISASM-NEXT:   1020:  ff 25 {{.*}}       jmpq *4218(%rip)<br>
+// DISASM-NEXT:   1026:  90                 nop<br>
+// DISASM-NEXT:   1027:  90                 nop<br>
+// DISASM-NEXT:   1028:  ff 25 {{.*}}       jmpq *4218(%rip)<br>
+// DISASM-NEXT:   102e:  90                 nop<br>
+// DISASM-NEXT:   102f:  90                 nop<br>
<br>
 .global _start<br>
 _start:<br>
<br>
Modified: lld/trunk/test/elf2/pre_init_fini_array.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/pre_init_fini_array.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/pre_init_fini_array.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/pre_init_fini_array.s (original)<br>
+++ lld/trunk/test/elf2/pre_init_fini_array.s Sat Oct 10 18:25:39 2015<br>
@@ -63,7 +63,7 @@ _start:<br>
 // CHECK-NEXT: ]<br>
<br>
 // CHECK:        Name: __fini_array_end<br>
-// CHECK-NEXT:   Value: 0x1301B<br>
+// CHECK-NEXT:   Value: 0x1201B<br>
 // CHECK-NEXT:   Size: 0<br>
 // CHECK-NEXT:   Binding: Local<br>
 // CHECK-NEXT:   Type: None<br>
@@ -81,7 +81,7 @@ _start:<br>
 // CHECK-NEXT: }<br>
 // CHECK-NEXT: Symbol {<br>
 // CHECK-NEXT:   Name: __init_array_end<br>
-// CHECK-NEXT:   Value: 0x13008<br>
+// CHECK-NEXT:   Value: 0x12008<br>
 // CHECK-NEXT:   Size: 0<br>
 // CHECK-NEXT:   Binding: Local<br>
 // CHECK-NEXT:   Type: None<br>
@@ -99,7 +99,7 @@ _start:<br>
 // CHECK-NEXT: }<br>
 // CHECK-NEXT: Symbol {<br>
 // CHECK-NEXT:   Name: __preinit_array_end<br>
-// CHECK-NEXT:   Value: 0x13011<br>
+// CHECK-NEXT:   Value: 0x12011<br>
 // CHECK-NEXT:   Size: 0<br>
 // CHECK-NEXT:   Binding: Local<br>
 // CHECK-NEXT:   Type: None<br>
@@ -125,16 +125,16 @@ _start:<br>
 // CHECK: FINI_ARRAYSZ         [[FINI_SIZE]] (bytes)<br>
<br>
<br>
-// 0x13008 - (0x12000 + 5) = 4099<br>
-// 0x13011 - (0x12005 + 5) = 4103<br>
-// 0x13000 - (0x1200a + 5) = 4081<br>
-// 0x13008 - (0x1200f + 5) = 4084<br>
-// 0x13011 - (0x12014 + 5) = 4088<br>
-// 0x1301B - (0x12019 + 5) = 4093<br>
+// 0x12008 - (0x11000 + 5) = 4099<br>
+// 0x12011 - (0x11005 + 5) = 4103<br>
+// 0x12000 - (0x1100a + 5) = 4081<br>
+// 0x12008 - (0x1100f + 5) = 4084<br>
+// 0x12011 - (0x11014 + 5) = 4088<br>
+// 0x1201B - (0x11019 + 5) = 4093<br>
 // DISASM:      _start:<br>
-// DISASM-NEXT:   12000:  e8 {{.*}}  callq  4099<br>
-// DISASM-NEXT:   12005:  e8 {{.*}}  callq  4103<br>
-// DISASM-NEXT:   1200a:  e8 {{.*}}  callq  4081<br>
-// DISASM-NEXT:   1200f:  e8 {{.*}}  callq  4084<br>
-// DISASM-NEXT:   12014:  e8 {{.*}}  callq  4088<br>
-// DISASM-NEXT:   12019:  e8 {{.*}}  callq  4093<br>
+// DISASM-NEXT:   11000:  e8 {{.*}}  callq  4099<br>
+// DISASM-NEXT:   11005:  e8 {{.*}}  callq  4103<br>
+// DISASM-NEXT:   1100a:  e8 {{.*}}  callq  4081<br>
+// DISASM-NEXT:   1100f:  e8 {{.*}}  callq  4084<br>
+// DISASM-NEXT:   11014:  e8 {{.*}}  callq  4088<br>
+// DISASM-NEXT:   11019:  e8 {{.*}}  callq  4093<br>
<br>
Modified: lld/trunk/test/elf2/program-header-layout.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/program-header-layout.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/program-header-layout.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/program-header-layout.s (original)<br>
+++ lld/trunk/test/elf2/program-header-layout.s Sat Oct 10 18:25:39 2015<br>
@@ -23,7 +23,7 @@ _start:<br>
 # CHECK-NEXT:     SHF_ALLOC<br>
 # CHECK-NEXT:   ]<br>
 # CHECK-NEXT:   Address:<br>
-# CHECK-NEXT:   Offset: 0x1000<br>
+# CHECK-NEXT:   Offset: 0xE8<br>
 # CHECK-NEXT:   Size:<br>
 # CHECK-NEXT:   Link:<br>
 # CHECK-NEXT:   Info:<br>
@@ -49,8 +49,8 @@ _start:<br>
 # CHECK-NEXT:     Offset: 0x0<br>
 # CHECK-NEXT:     VirtualAddress:<br>
 # CHECK-NEXT:     PhysicalAddress:<br>
-# CHECK-NEXT:     FileSize: 4104<br>
-# CHECK-NEXT:     MemSize: 4104<br>
+# CHECK-NEXT:     FileSize: 240<br>
+# CHECK-NEXT:     MemSize: 240<br>
 # CHECK-NEXT:     Flags [<br>
 # CHECK-NEXT:       PF_R<br>
 # CHECK-NEXT:     ]<br>
<br>
Modified: lld/trunk/test/elf2/relative-dynamic-reloc.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relative-dynamic-reloc.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relative-dynamic-reloc.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/relative-dynamic-reloc.s (original)<br>
+++ lld/trunk/test/elf2/relative-dynamic-reloc.s Sat Oct 10 18:25:39 2015<br>
@@ -9,10 +9,10 @@<br>
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {<br>
 // CHECK-NEXT:     0x[[FOO_ADDR:.*]] R_X86_64_RELATIVE - 0x[[FOO_ADDR]]<br>
 // CHECK-NEXT:     0x[[BAR_ADDR:.*]] R_X86_64_RELATIVE - 0x[[BAR_ADDR]]<br>
-// CHECK-NEXT:     0x2010 R_X86_64_RELATIVE - 0x2009<br>
+// CHECK-NEXT:     0x1010 R_X86_64_RELATIVE - 0x1009<br>
 // CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x[[ZED_ADDR:.*]]<br>
 // CHECK-NEXT:     0x{{.*}} R_X86_64_RELATIVE - 0x[[FOO_ADDR]]<br>
-// CHECK-NEXT:     0x1008 R_X86_64_64 external 0x0<br>
+// CHECK-NEXT:     0x160 R_X86_64_64 external 0x0<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: ]<br>
<br>
<br>
Modified: lld/trunk/test/elf2/relocation-i686.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation-i686.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation-i686.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/relocation-i686.s (original)<br>
+++ lld/trunk/test/elf2/relocation-i686.s Sat Oct 10 18:25:39 2015<br>
@@ -27,14 +27,14 @@ R_386_PC32_2:<br>
<br>
 // CHECK: Disassembly of section .R_386_32:<br>
 // CHECK-NEXT: R_386_32:<br>
-// CHECK-NEXT:  12000: {{.*}} movl $73729, %edx<br>
+// CHECK-NEXT:  11000: {{.*}} movl $69633, %edx<br>
<br>
 // CHECK: Disassembly of section .R_386_PC32:<br>
 // CHECK-NEXT: R_386_PC32:<br>
-// CHECK-NEXT:   12005:  e8 04 00 00 00  calll 4<br>
+// CHECK-NEXT:   11005:  e8 04 00 00 00  calll 4<br>
<br>
 // CHECK:      R_386_PC32_2:<br>
-// CHECK-NEXT:   1200e:  90  nop<br>
+// CHECK-NEXT:   1100e:  90  nop<br>
<br>
 // Create a .got<br>
 movl bar@GOT, %eax<br>
@@ -45,8 +45,8 @@ movl bar@GOT, %eax<br>
 // ADDR-NEXT:   SHF_ALLOC<br>
 // ADDR-NEXT:   SHF_EXECINSTR<br>
 // ADDR-NEXT: ]<br>
-// ADDR-NEXT: Address: 0x12030<br>
-// ADDR-NEXT: Offset: 0x2030<br>
+// ADDR-NEXT: Address: 0x11030<br>
+// ADDR-NEXT: Offset: 0x1030<br>
 // ADDR-NEXT: Size: 8<br>
<br>
 // ADDR:      Name: .got<br>
@@ -55,24 +55,24 @@ movl bar@GOT, %eax<br>
 // ADDR-NEXT:   SHF_ALLOC<br>
 // ADDR-NEXT:   SHF_WRITE<br>
 // ADDR-NEXT: ]<br>
-// ADDR-NEXT: Address: 0x13050<br>
+// ADDR-NEXT: Address: 0x12050<br>
<br>
 .section .R_386_GOTPC,"ax",@progbits<br>
 R_386_GOTPC:<br>
  movl $_GLOBAL_OFFSET_TABLE_, %eax<br>
<br>
-// 0x13050 - 0x12014 = 4156<br>
+// 0x12050 - 0x11014 = 4156<br>
<br>
 // CHECK:      Disassembly of section .R_386_GOTPC:<br>
 // CHECK-NEXT: R_386_GOTPC:<br>
-// CHECK-NEXT:   12014:  {{.*}} movl  $4156, %eax<br>
+// CHECK-NEXT:   11014:  {{.*}} movl  $4156, %eax<br>
<br>
 .section .dynamic_reloc, "ax",@progbits<br>
  call bar<br>
-// 0x12030 - (0x12019 + 5) = 18<br>
+// 0x11030 - (0x11019 + 5) = 18<br>
 // CHECK:      Disassembly of section .dynamic_reloc:<br>
 // CHECK-NEXT: .dynamic_reloc:<br>
-// CHECK-NEXT:   12019:  e8 12 00 00 00 calll 18<br>
+// CHECK-NEXT:   11019:  e8 12 00 00 00 calll 18<br>
<br>
 .section .R_386_GOT32,"ax",@progbits<br>
 .global R_386_GOT32<br>
@@ -81,4 +81,4 @@ R_386_GOT32:<br>
 // This is the second symbol in the got, so the offset is 4.<br>
 // CHECK:      Disassembly of section .R_386_GOT32:<br>
 // CHECK-NEXT: R_386_GOT32:<br>
-// CHECK-NEXT:   1201e:  {{.*}} movl 4, %eax<br>
+// CHECK-NEXT:   1101e:  {{.*}} movl 4, %eax<br>
<br>
Modified: lld/trunk/test/elf2/relocation-local.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation-local.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation-local.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/relocation-local.s (original)<br>
+++ lld/trunk/test/elf2/relocation-local.s Sat Oct 10 18:25:39 2015<br>
@@ -20,7 +20,7 @@ R_X86_64_32:<br>
 // constants in hex.<br>
 // CHECK: Disassembly of section .text2:<br>
 // CHECK-NEXT: R_X86_64_32:<br>
-// CHECK-NEXT:  12009: {{.*}} movl $73737, %edx<br>
+// CHECK-NEXT:  11009: {{.*}} movl $69641, %edx<br>
<br>
 .section .R_X86_64_32S,"ax",@progbits<br>
 R_X86_64_32S:<br>
@@ -28,11 +28,11 @@ R_X86_64_32S:<br>
<br>
 // CHECK: Disassembly of section .R_X86_64_32S:<br>
 // CHECK-NEXT: R_X86_64_32S:<br>
-// CHECK-NEXT:  {{.*}}: {{.*}} movq -974839, %rdx<br>
+// CHECK-NEXT:  {{.*}}: {{.*}} movq -978935, %rdx<br>
<br>
 .section .R_X86_64_64,"a",@progbits<br>
 R_X86_64_64:<br>
  .quad R_X86_64_64<br>
<br>
 // CHECK:      Contents of section .R_X86_64_64:<br>
-// CHECK-NEXT:   11000 00100100 00000000<br>
+// CHECK-NEXT:   100e8 e8000100 00000000<br>
<br>
Modified: lld/trunk/test/elf2/relocation.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocation.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/relocation.s (original)<br>
+++ lld/trunk/test/elf2/relocation.s Sat Oct 10 18:25:39 2015<br>
@@ -12,8 +12,8 @@<br>
 // SEC-NEXT:   SHF_ALLOC<br>
 // SEC-NEXT:   SHF_EXECINSTR<br>
 // SEC-NEXT: ]<br>
-// SEC-NEXT: Address: 0x12020<br>
-// SEC-NEXT: Offset: 0x2020<br>
+// SEC-NEXT: Address: 0x11020<br>
+// SEC-NEXT: Offset: 0x1020<br>
 // SEC-NEXT: Size: 8<br>
<br>
 // SEC:         Name: .got<br>
@@ -22,7 +22,7 @@<br>
 // SEC-NEXT:     SHF_ALLOC<br>
 // SEC-NEXT:     SHF_WRITE<br>
 // SEC-NEXT:   ]<br>
-// SEC-NEXT:   Address: 0x130A0<br>
+// SEC-NEXT:   Address: 0x120A0<br>
 // SEC-NEXT:   Offset:<br>
 // SEC-NEXT:   Size: 16<br>
 // SEC-NEXT:   Link: 0<br>
@@ -44,11 +44,11 @@ lulz:<br>
<br>
 // CHECK: Disassembly of section .text:<br>
 // CHECK-NEXT: _start:<br>
-// CHECK-NEXT:   12000:  e8 04 00 00 00   callq 4<br>
-// CHECK-NEXT:   12005:<br>
+// CHECK-NEXT:   11000:  e8 04 00 00 00   callq 4<br>
+// CHECK-NEXT:   11005:<br>
<br>
 // CHECK:      lulz:<br>
-// CHECK-NEXT:   12009:  90  nop<br>
+// CHECK-NEXT:   11009:  90  nop<br>
<br>
<br>
 .section       .text2,"ax",@progbits<br>
@@ -60,7 +60,7 @@ R_X86_64_32:<br>
 // constants in hex.<br>
 // CHECK: Disassembly of section .text2:<br>
 // CHECK-NEXT: R_X86_64_32:<br>
-// CHECK-NEXT:  1200a: {{.*}} movl $73738, %edx<br>
+// CHECK-NEXT:  1100a: {{.*}} movl $69642, %edx<br>
<br>
 .section .R_X86_64_32S,"ax",@progbits<br>
 .global R_X86_64_32S<br>
@@ -69,16 +69,16 @@ R_X86_64_32S:<br>
<br>
 // CHECK: Disassembly of section .R_X86_64_32S:<br>
 // CHECK-NEXT: R_X86_64_32S:<br>
-// CHECK-NEXT:  {{.*}}: {{.*}} movq -974839, %rdx<br>
+// CHECK-NEXT:  {{.*}}: {{.*}} movq -978935, %rdx<br>
<br>
 .section .R_X86_64_PC32,"ax",@progbits<br>
 .global R_X86_64_PC32<br>
 R_X86_64_PC32:<br>
  call bar<br>
-// 0x12020 - (0x12017 + 5) = 4<br>
+// 0x11020 - (0x11017 + 5) = 4<br>
 // CHECK:      Disassembly of section .R_X86_64_PC32:<br>
 // CHECK-NEXT: R_X86_64_PC32:<br>
-// CHECK-NEXT:  12017:   e8 04 00 00 00  callq  4<br>
+// CHECK-NEXT:  11017:   e8 04 00 00 00  callq  4<br>
<br>
 .section .R_X86_64_64,"a",@progbits<br>
 .global R_X86_64_64<br>
@@ -86,14 +86,14 @@ R_X86_64_64:<br>
  .quad R_X86_64_64<br>
<br>
 // CHECK:      Contents of section .R_X86_64_64:<br>
-// CHECK-NEXT:   11000 00100100 00000000<br>
+// CHECK-NEXT:   10158 58010100 00000000<br>
<br>
 .section .R_X86_64_GOTPCREL,"a",@progbits<br>
 .global R_X86_64_GOTPCREL<br>
 R_X86_64_GOTPCREL:<br>
  .long zed@gotpcrel<br>
<br>
-// 0x130A8 - 0x11008 = 8352<br>
-// 8352 = 0x80200000   in little endian<br>
+// 0x120A8 - 0x10160 = 8008<br>
+// 8008 = 0x481f0000   in little endian<br>
 // CHECK:      Contents of section .R_X86_64_GOTPCREL<br>
-// CHECK-NEXT:   11008 a0200000<br>
+// CHECK-NEXT:   10160 481f0000<br>
<br>
Modified: lld/trunk/test/elf2/shared.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/shared.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/shared.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/shared.s (original)<br>
+++ lld/trunk/test/elf2/shared.s Sat Oct 10 18:25:39 2015<br>
@@ -14,7 +14,7 @@<br>
 // SO-NEXT: Flags [<br>
 // SO-NEXT: ]<br>
 // SO-NEXT: Address:<br>
-// SO-NEXT: Offset: 0x2030<br>
+// SO-NEXT: Offset: 0x1030<br>
 // SO-NEXT: Size:<br>
 // SO-NEXT: Link:<br>
 // SO-NEXT: Info:<br>
@@ -46,7 +46,7 @@<br>
 // CHECK-NEXT:     SHF_ALLOC<br>
 // CHECK-NEXT:   ]<br>
 // CHECK-NEXT:   Address: [[DYNSYMADDR:.*]]<br>
-// CHECK-NEXT:   Offset: 0x101C<br>
+// CHECK-NEXT:   Offset: 0x110<br>
 // CHECK-NEXT:   Size:<br>
 // CHECK-NEXT:   Link: [[DYNSTR:.*]]<br>
 // CHECK-NEXT:   Info: 1<br>
@@ -145,7 +145,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start<br>
-// CHECK-NEXT:     Value: 0x12000<br>
+// CHECK-NEXT:     Value: 0x11000<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
@@ -184,7 +184,7 @@<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start@<br>
-// CHECK-NEXT:     Value: 0x12000<br>
+// CHECK-NEXT:     Value: 0x11000<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: Non<br>
<br>
Modified: lld/trunk/test/elf2/string-table.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/string-table.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/string-table.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/string-table.s (original)<br>
+++ lld/trunk/test/elf2/string-table.s Sat Oct 10 18:25:39 2015<br>
@@ -19,7 +19,7 @@ _start:<br>
 // CHECK-NEXT: Flags [<br>
 // CHECK-NEXT:  SHF_ALLOC<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x11000<br>
+// CHECK-NEXT: Address: 0x100B0<br>
<br>
 // CHECK:      Name: foobar<br>
 // CHECK-NEXT: Type: SHT_PROGBITS<br>
<br>
Modified: lld/trunk/test/elf2/symbols.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/symbols.s?rev=249957&r1=249956&r2=249957&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/symbols.s?rev=249957&r1=249956&r2=249957&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/symbols.s (original)<br>
+++ lld/trunk/test/elf2/symbols.s Sat Oct 10 18:25:39 2015<br>
@@ -50,7 +50,7 @@ internal:<br>
 // CHECK-NEXT: Flags [<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x11000<br>
+// CHECK-NEXT: Address: 0x10120<br>
<br>
 // CHECK:      Name: .text<br>
 // CHECK-NEXT: Type: SHT_PROGBITS<br>
@@ -58,7 +58,7 @@ internal:<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_EXECINSTR<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x12000<br>
+// CHECK-NEXT: Address: 0x1100<br>
<br>
 // CHECK:      Name: .bss<br>
 // CHECK-NEXT: Type: SHT_NOBITS<br>
@@ -66,7 +66,7 @@ internal:<br>
 // CHECK-NEXT:   SHF_ALLOC<br>
 // CHECK-NEXT:   SHF_WRITE<br>
 // CHECK-NEXT: ]<br>
-// CHECK-NEXT: Address: 0x13000<br>
+// CHECK-NEXT: Address: 0x12000<br>
 // CHECK-NEXT: Offset: 0x2000<br>
 // CHECK-NEXT: Size: 4<br>
<br>
@@ -82,7 +82,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT: Symbol {<br>
 // CHECK-NEXT:     Name: hidden<br>
-// CHECK-NEXT:     Value: 0x11008<br>
+// CHECK-NEXT:     Value: 0x10128<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -91,7 +91,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: internal<br>
-// CHECK-NEXT:     Value: 0x11008<br>
+// CHECK-NEXT:     Value: 0x10128<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Local<br>
 // CHECK-NEXT:     Type: None<br>
@@ -100,7 +100,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: _start<br>
-// CHECK-NEXT:     Value: 0x12000<br>
+// CHECK-NEXT:     Value: 0x11000<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global (0x1)<br>
 // CHECK-NEXT:     Type: Function<br>
@@ -127,7 +127,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: common<br>
-// CHECK-NEXT:     Value: 0x13000<br>
+// CHECK-NEXT:     Value: 0x12000<br>
 // CHECK-NEXT:     Size: 4<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: Object<br>
@@ -136,7 +136,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: foo<br>
-// CHECK-NEXT:     Value: 0x12000<br>
+// CHECK-NEXT:     Value: 0x11000<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Weak (0x2)<br>
 // CHECK-NEXT:     Type: Object<br>
@@ -145,7 +145,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: protected<br>
-// CHECK-NEXT:     Value: 0x11008<br>
+// CHECK-NEXT:     Value: 0x10128<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
@@ -154,7 +154,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: zed<br>
-// CHECK-NEXT:     Value: 0x11000<br>
+// CHECK-NEXT:     Value: 0x10120<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global (0x1)<br>
 // CHECK-NEXT:     Type: None<br>
@@ -163,7 +163,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: zed2<br>
-// CHECK-NEXT:     Value: 0x11004<br>
+// CHECK-NEXT:     Value: 0x10124<br>
 // CHECK-NEXT:     Size: 0<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
@@ -172,7 +172,7 @@ internal:<br>
 // CHECK-NEXT:   }<br>
 // CHECK-NEXT:   Symbol {<br>
 // CHECK-NEXT:     Name: zed3<br>
-// CHECK-NEXT:     Value: 0x11008<br>
+// CHECK-NEXT:     Value: 0x10128<br>
 // CHECK-NEXT:     Size: 4<br>
 // CHECK-NEXT:     Binding: Global<br>
 // CHECK-NEXT:     Type: None<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div></div>