Add debugger rendezvous DT_DEBUG .dynamic entry

[emaste]

Summary

The runtime linker may store a pointer to a data structure used by debuggers. This allows gdb and lldb to debug lld-linked binaries.

I can combine it as an else case in the existing if (Config->EMachine == EM_MIPS) block if that's preferred.

[emaste]

• add test
• add DT_DEBUG only to executables (use the presence of an entrypoint as a proxy for this)

[• rafael]

Why is mips special?

[emaste]

In D15775#316823, @rafael wrote:

Why is mips special?

MIPS's .dyanamic section is read-only. Instead of using DT_DEBUG for the pointer to dyld information it uses a separate tag DT_MIPS_RLD_MAP which points to storage in the read-write .rld_map section, which in turn points to the dyld information.

I added the support for DT_MIPS_RLD_MAP in D1890 which has some more background.

[• rafael]

That is pretty horrible. Any chance we could start producing a rw dynamic
section on MIPS too? With that we could at least hope for one day dropping
the MIPS specific field.

[emaste]

In D15775#316831, @rafael wrote:

That is pretty horrible. Any chance we could start producing a rw dynamic
section on MIPS too? With that we could at least hope for one day dropping
the MIPS specific field.

DT_MIPS_RLD_MAP is specified in the ABI and a migration would be a long process, but it shouldn't hurt anything to emit DT_DEBUG in MIPS binaries too. GNU ld did so until relatively recently. I'm happy to go ahead with or without the Config->EMachine != EM_MIPS.

[• rafael]

I would much prefer without. Thanks.

[emaste]

Drop MIPS special-case; DT_DEBUG is not currently used on MIPS but it doesn't hurt anything to leave the entry there either.

[davide]

test/ELF/dt_tags.s

1 ↗

(On Diff #43628)

Is this really required now?

[davide]

Ignore my previous comment, I missed the triple bit. This looks fine to me.

[emaste]

test/ELF/dt_tags.s

1 ↗

(On Diff #43628)

I think it is, based on the -triple below, but I'm not an expert in the way the tests are set up. Most other tests have it, or e.g. REQUIRES: x86,ppc for tests that use both x86 & ppc triples.

[emaste]

@ruiu or @rafael, ok with this version?

[emaste]

Other tests need updating for this change - I'll upload a new version next week.

[emaste]

Update existing tests for growth in .dynamic section

[emaste]

test/ELF/dt_tags.s

10 ↗

(On Diff #43741)

Note that this is also implicitly tested in dynamic-relocs.s

14 ↗

(On Diff #43741)

However I believe this is not tested elsewhere

[emaste]

Ping

[ruiu]

LGTM

lld/trunk/ELF/OutputSections.cpp

if (Config->ZOrigin) {
     DtFlags1 |= DF_1_ORIGIN;
   }
 
   if (DtFlags)
     ++NumEntries; // DT_FLAGS
   if (DtFlags1)
     ++NumEntries; // DT_FLAGS_1
 
+  if (!Config->Entry.empty())
+    ++NumEntries; // DT_DEBUG
+
   if (Config->EMachine == EM_MIPS) {
     ++NumEntries; // DT_MIPS_RLD_VERSION
     ++NumEntries; // DT_MIPS_FLAGS
     ++NumEntries; // DT_MIPS_BASE_ADDRESS
     ++NumEntries; // DT_MIPS_SYMTABNO
     ++NumEntries; // DT_MIPS_LOCAL_GOTNO
     ++NumEntries; // DT_MIPS_GOTSYM;
     ++NumEntries; // DT_PLTGOT
template <class ELFT> void DynamicSection<ELFT>::writeTo(uint8_t *Buf) {
   if (InitSym)
     WritePtr(DT_INIT, getSymVA<ELFT>(*InitSym));
   if (FiniSym)
     WritePtr(DT_FINI, getSymVA<ELFT>(*FiniSym));
   if (DtFlags)
     WriteVal(DT_FLAGS, DtFlags);
   if (DtFlags1)
     WriteVal(DT_FLAGS_1, DtFlags1);
+  if (!Config->Entry.empty())
+    WriteVal(DT_DEBUG, 0);
 
   // See "Dynamic Section" in Chapter 5 in the following document
   // for detailed description:
   // ftp://www.linux-mips.org/pub/linux/mips/doc/ABI/mipsabi.pdf
   if (Config->EMachine == EM_MIPS) {
     WriteVal(DT_MIPS_RLD_VERSION, 1);
     WriteVal(DT_MIPS_FLAGS, RHF_NOTPOT);
     WritePtr(DT_MIPS_BASE_ADDRESS, Target->getVAStart());

lld/trunk/test/ELF/dynamic-reloc.s

 // CHECK-NEXT:  0x0000000000000003 PLTGOT
 // CHECK-NEXT:  0x0000000000000014 PLTREL               RELA
 // CHECK-NEXT:  0x0000000000000006 SYMTAB
 // CHECK-NEXT:  0x000000000000000B SYMENT               24 (bytes)
 // CHECK-NEXT:  0x0000000000000005 STRTAB
 // CHECK-NEXT:  0x000000000000000A STRSZ
 // CHECK-NEXT:  0x0000000000000004 HASH
 // CHECK-NEXT:  0x0000000000000001 NEEDED               SharedLibrary ({{.*}}2.so)
+// CHECK-NEXT:  0x0000000000000015 DEBUG                0x0
 // CHECK-NEXT:  0x0000000000000000 NULL                 0x0
 // CHECK-NEXT: ]
 
 .global _start
 _start:
 .quad bar + 0x42
 .weak foo
 .quad foo
 call main

lld/trunk/test/ELF/got.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86
 
 // CHECK:      Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x120A0
+// CHECK-NEXT: Address: 0x120B0
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x120A0 R_X86_64_GLOB_DAT bar 0x0
-// CHECK-NEXT:     0x120A8 R_X86_64_GLOB_DAT zed 0x0
+// CHECK-NEXT:     0x120B0 R_X86_64_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x120B8 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:
-//  0x120A0 - (0x11000 + 2) - 4 = 4250
-//  0x120A0 - (0x11006 + 2) - 4 = 4244
-//  0x120A8 - (0x1100c + 2) - 4 = 4246
+//  0x120B0 - (0x11000 + 2) - 4 = 4266
+//  0x120B0 - (0x11006 + 2) - 4 = 4260
+//  0x120A8 - (0x1100c + 2) - 4 = 4262
 
 // DISASM:      _start:
-// DISASM-NEXT:   11000:  {{.*}}  jmpq  *4250(%rip)
-// DISASM-NEXT:   11006:  {{.*}}  jmpq  *4244(%rip)
-// DISASM-NEXT:   1100c:  {{.*}}  jmpq  *4246(%rip)
+// DISASM-NEXT:   11000:  {{.*}}  jmpq  *4266(%rip)
+// DISASM-NEXT:   11006:  {{.*}}  jmpq  *4260(%rip)
+// DISASM-NEXT:   1100c:  {{.*}}  jmpq  *4262(%rip)
 
 .global _start
 _start:
   jmp *bar@GOTPCREL(%rip)
   jmp *bar@GOTPCREL(%rip)
   jmp *zed@GOTPCREL(%rip)

lld/trunk/test/ELF/local-got.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r -section-data %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
         .globl _start
 _start:
   call bar@gotpcrel
   call foo@gotpcrel
 
         .global foo
 foo:
         nop
 
-// 0x120A0 - 0x11000 - 5 =  4251
-// 0x120A8 - 0x11005 - 5 =  4254
+// 0x120B0 - 0x11000 - 5 =  4251
+// 0x120B8 - 0x11005 - 5 =  4254
 // DISASM:      _start:
-// DISASM-NEXT:   11000: {{.*}} callq 4251
-// DISASM-NEXT:   11005: {{.*}} callq 4254
+// DISASM-NEXT:   11000: {{.*}} callq 4267
+// DISASM-NEXT:   11005: {{.*}} callq 4270
 
 // DISASM:      foo:
 // DISASM-NEXT:   1100a: {{.*}} nop
 
 // CHECK:      Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x120A0
+// CHECK-NEXT: Address: 0x120B0
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
 // 0x1200a in little endian
 // CHECK-NEXT:   0000:  00000000 00000000 0A100100 00000000
 // CHECK-NEXT: )
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x120A0 R_X86_64_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x120B0 R_X86_64_GLOB_DAT bar 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

lld/trunk/test/ELF/relocation-i686.s

 // ADDR-NEXT: Size: 32
 
 // ADDR:      Name: .got
 // ADDR-NEXT: Type: SHT_PROGBITS
 // ADDR-NEXT: Flags [
 // ADDR-NEXT:   SHF_ALLOC
 // ADDR-NEXT:   SHF_WRITE
 // ADDR-NEXT: ]
-// ADDR-NEXT: Address: 0x12070
+// ADDR-NEXT: Address: 0x12078
 
 .section .R_386_GOTPC,"ax",@progbits
 R_386_GOTPC:
  movl $_GLOBAL_OFFSET_TABLE_, %eax
 
 // 0x12050 - 0x11014 = 4156
 
 // CHECK:      Disassembly of section .R_386_GOTPC:
 // CHECK-NEXT: R_386_GOTPC:
-// CHECK-NEXT:   11014:  {{.*}} movl  $4188, %eax
+// CHECK-NEXT:   11014:  {{.*}} movl  $4196, %eax
 
 .section .dynamic_reloc, "ax",@progbits
  call bar
 // 0x11030 - (0x11019 + 5) = 18
 // CHECK:      Disassembly of section .dynamic_reloc:
 // CHECK-NEXT: .dynamic_reloc:
 // CHECK-NEXT:   11019:  e8 22 00 00 00 calll 34
 
 .section .R_386_GOT32,"ax",@progbits
 .global R_386_GOT32
 R_386_GOT32:
         movl zed@GOT, %eax
 // 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:   1101e:  {{.*}} movl 4, %eax

lld/trunk/test/ELF/relocation.s

 // SEC-NEXT: Size: 32
 
 // SEC:         Name: .got
 // SEC-NEXT:   Type: SHT_PROGBITS
 // SEC-NEXT:   Flags [
 // SEC-NEXT:     SHF_ALLOC
 // SEC-NEXT:     SHF_WRITE
 // SEC-NEXT:   ]
-// SEC-NEXT:   Address: 0x120E0
+// SEC-NEXT:   Address: 0x120F0
 // SEC-NEXT:   Offset:
 // SEC-NEXT:   Size: 8
 // SEC-NEXT:   Link: 0
 // SEC-NEXT:   Info: 0
 // SEC-NEXT:   AddressAlignment: 8
 // SEC-NEXT:   EntrySize: 0
 // SEC-NEXT: }
 

 // CHECK:      Contents of section .R_X86_64_64:
 // CHECK-NEXT:   101c8 c8010100 00000000
 
 .section .R_X86_64_GOTPCREL,"a",@progbits
 .global R_X86_64_GOTPCREL
 R_X86_64_GOTPCREL:
  .long zed@gotpcrel
 
-// 0x120E8 - 0x101D8 = 7952
+// 0x120F8 - 0x101D8 = 7952
 // 7952 = 0x101f0000 in little endian
 // CHECK:      Contents of section .R_X86_64_GOTPCREL
-// CHECK-NEXT:   101d0 101f0000
+// CHECK-NEXT:   101d0 201f0000

lld/trunk/test/ELF/relro.s

 // FULLRELRO:        Section {
 // FULLRELRO:        Index: 9
 // FULLRELRO-NEXT:   Name: .got
 // FULLRELRO-NEXT:   Type: SHT_PROGBITS
 // FULLRELRO-NEXT:   Flags [
 // FULLRELRO-NEXT:     SHF_ALLOC
 // FULLRELRO-NEXT:     SHF_WRITE
 // FULLRELRO-NEXT:   ]
-// FULLRELRO-NEXT:   Address: 0x12100
-// FULLRELRO-NEXT:   Offset: 0x2100
+// FULLRELRO-NEXT:   Address: 0x12110
+// FULLRELRO-NEXT:   Offset: 0x2110
 // FULLRELRO-NEXT:   Size: 8
 // FULLRELRO-NEXT:   Link: 0
 // FULLRELRO-NEXT:   Info: 0
 // FULLRELRO-NEXT:   AddressAlignment: 8
 // FULLRELRO-NEXT:   EntrySize: 0
 // FULLRELRO-NEXT:   SectionData (
 // FULLRELRO-NEXT:     0000: 00000000 00000000
 // FULLRELRO-NEXT:   )
 // FULLRELRO-NEXT: }
 // FULLRELRO-NEXT: Section {
 // FULLRELRO-NEXT:   Index: 10
 // FULLRELRO-NEXT:   Name: .got.plt
 // FULLRELRO-NEXT:   Type: SHT_PROGBITS
 // FULLRELRO-NEXT:   Flags [
 // FULLRELRO-NEXT:     SHF_ALLOC
 // FULLRELRO-NEXT:     SHF_WRITE
 // FULLRELRO-NEXT:   ]
-// FULLRELRO-NEXT:   Address: 0x12108
-// FULLRELRO-NEXT:   Offset: 0x2108
+// FULLRELRO-NEXT:   Address: 0x12118
+// FULLRELRO-NEXT:   Offset: 0x2118
 // FULLRELRO-NEXT:   Size: 32
 // FULLRELRO-NEXT:   Link: 0
 // FULLRELRO-NEXT:   Info: 0
 // FULLRELRO-NEXT:   AddressAlignment: 8
 // FULLRELRO-NEXT:   EntrySize: 0
 // FULLRELRO-NEXT:   SectionData (
 // FULLRELRO-NEXT:     0000:
 // FULLRELRO-NEXT:     0010:

 // FULLRELRO-NEXT:    PF_W
 // FULLRELRO-NEXT:  ]
 // FULLRELRO-NEXT:  Alignment: 4096
 // FULLRELRO-NEXT:}
 // FULLRELRO:       Type: PT_GNU_RELRO
 // FULLRELRO-NEXT:  Offset: 0x
 // FULLRELRO-NEXT:  VirtualAddress: [[RWADDR]]
 // FULLRELRO-NEXT:  PhysicalAddress:
-// FULLRELRO-NEXT:  FileSize: 296
-// FULLRELRO-NEXT:  MemSize: 296
+// FULLRELRO-NEXT:  FileSize: 312
+// FULLRELRO-NEXT:  MemSize: 312
 // FULLRELRO-NEXT:  Flags [
 // FULLRELRO-NEXT:    PF_R
 // FULLRELRO-NEXT:  ]
 // FULLRELRO-NEXT:  Alignment: 1
 // FULLRELRO-NEXT:}
 
 // PARTRELRO:       Section {
 // PARTRELRO:       Index: 9
 // PARTRELRO-NEXT:  Name: .got
 // PARTRELRO-NEXT:  Type: SHT_PROGBITS
 // PARTRELRO-NEXT:  Flags [
 // PARTRELRO-NEXT:    SHF_ALLOC
 // PARTRELRO-NEXT:    SHF_WRITE
 // PARTRELRO-NEXT:  ]
-// PARTRELRO-NEXT:  Address: 0x120E0
-// PARTRELRO-NEXT:  Offset: 0x20E0
+// PARTRELRO-NEXT:  Address: 0x120F0
+// PARTRELRO-NEXT:  Offset: 0x20F0
 // PARTRELRO-NEXT:  Size: 8
 // PARTRELRO-NEXT:  Link: 0
 // PARTRELRO-NEXT:  Info: 0
 // PARTRELRO-NEXT:  AddressAlignment: 8
 // PARTRELRO-NEXT:  EntrySize: 0
 // PARTRELRO-NEXT:  SectionData (
 // PARTRELRO-NEXT:    0000:
 // PARTRELRO-NEXT:  )

 // PARTRELRO-NEXT:    PF_R (0x4)
 // PARTRELRO-NEXT:    PF_W (0x2)
 // PARTRELRO-NEXT:  ]
 // PARTRELRO-NEXT:  Alignment: 4096
 // PARTRELRO:       Type: PT_GNU_RELRO
 // PARTRELRO-NEXT:  Offset: 0x2000
 // PARTRELRO-NEXT:  VirtualAddress: [[RWADDR]]
 // PARTRELRO-NEXT:  PhysicalAddress:
-// PARTRELRO-NEXT:  FileSize: 232
-// PARTRELRO-NEXT:  MemSize: 232
+// PARTRELRO-NEXT:  FileSize: 248
+// PARTRELRO-NEXT:  MemSize: 248
 // PARTRELRO-NEXT:  Flags [
 // PARTRELRO-NEXT:    PF_R
 // PARTRELRO-NEXT:  ]
 // PARTRELRO-NEXT:  Alignment: 1
 
 // NORELRO:     ProgramHeaders [
 // NORELRO-NOT: PT_GNU_RELRO
 

lld/trunk/test/ELF/shared-be.s

 
 // CHECK:      DynamicSection [
 // CHECK-NEXT:   Tag                Type                 Name/Value
 // CHECK-NEXT:   0x0000000000000007 RELA                 [[RELADDR]]
 // CHECK-NEXT:   0x0000000000000008 RELASZ               [[RELSIZE]] (bytes)
 // CHECK-NEXT:   0x0000000000000009 RELAENT              [[RELENT]] (bytes)
 // CHECK:        0x000000000000001D RUNPATH              foo:bar
 // CHECK-NEXT:   0x0000000000000001 NEEDED               SharedLibrary ({{.*}}2.so)
+// CHECK-NEXT:   0x0000000000000015 DEBUG                0x0
 // CHECK-NEXT:   0x0000000000000000 NULL                 0x0
 // CHECK-NEXT: ]
 
 .global _start
 _start:
 .long bar
 .long zed
 

lld/trunk/test/ELF/shared.s

 // CHECK-NEXT:   0x00000013 RELENT               [[RELENT]] (bytes)
 // CHECK-NEXT:   0x00000006 SYMTAB               [[DYNSYMADDR]]
 // CHECK-NEXT:   0x0000000B SYMENT               [[SYMENT]] (bytes)
 // CHECK-NEXT:   0x00000005 STRTAB               [[DYNSTRADDR]]
 // CHECK-NEXT:   0x0000000A STRSZ
 // CHECK-NEXT:   0x00000004 HASH                 [[HASHADDR]]
 // CHECK-NEXT:   0x0000001D RUNPATH              foo:bar
 // CHECK-NEXT:   0x00000001 NEEDED               SharedLibrary ({{.*}}2.so)
+// CHECK-NEXT:   0x00000015 DEBUG                0x0
 // CHECK-NEXT:   0x00000000 NULL                 0x0
 // CHECK-NEXT: ]
 
 // CHECK:     ProgramHeaders [
 // CHECK:        Type: PT_INTERP
 // CHECK-NEXT:   Offset: [[INTERPOFFSET]]
 // CHECK-NEXT:   VirtualAddress: [[INTERPADDR]]
 // CHECK-NEXT:   PhysicalAddress: [[INTERPADDR]]

lld/trunk/test/ELF/tls-got.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-got.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld -e main %t1.o %t2.so -o %t3
 // RUN: llvm-readobj -s -r %t3 | FileCheck %s
 // RUN: llvm-objdump -d %t3 | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Section {
 // CHECK:      Index: 8
 // CHECK-NEXT: Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: [[ADDR:.*]]
-// CHECK-NEXT: Offset: 0x20A0
+// CHECK-NEXT: Offset: 0x20B0
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: }
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (4) .rela.dyn {
 // CHECK-NEXT:     [[ADDR]] R_X86_64_TPOFF64 tls1 0x0
-// CHECK-NEXT:     0x120A8 R_X86_64_TPOFF64 tls0 0x0
+// CHECK-NEXT:     0x120B8 R_X86_64_TPOFF64 tls0 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
-//0x11000 + 4249 + 7 = 0x120A0
-//0x1100A + 4247 + 7 = 0x120A8
-//0x11014 + 4237 + 7 = 0x120A8
+//0x11000 + 4249 + 7 = 0x120B0
+//0x1100A + 4247 + 7 = 0x120B8
+//0x11014 + 4237 + 7 = 0x120B8
 //DISASM:      Disassembly of section .text:
 //DISASM-NEXT: main:
-//DISASM-NEXT: 11000: 48 8b 05 99 10 00 00 movq 4249(%rip), %rax
+//DISASM-NEXT: 11000: 48 8b 05 a9 10 00 00 movq 4265(%rip), %rax
 //DISASM-NEXT: 11007: 64 8b 00 movl %fs:(%rax), %eax
-//DISASM-NEXT: 1100a: 48 8b 05 97 10 00 00 movq 4247(%rip), %rax
+//DISASM-NEXT: 1100a: 48 8b 05 a7 10 00 00 movq 4263(%rip), %rax
 //DISASM-NEXT: 11011: 64 8b 00 movl %fs:(%rax), %eax
-//DISASM-NEXT: 11014: 48 8b 05 8d 10 00 00 movq 4237(%rip), %rax
+//DISASM-NEXT: 11014: 48 8b 05 9d 10 00 00 movq 4253(%rip), %rax
 //DISASM-NEXT: 1101b: 64 8b 00 movl %fs:(%rax), %eax
 //DISASM-NEXT: 1101e: c3 retq
 
 .section .tdata,"awT",@progbits
 
 .text
  .globl main
  .align 16, 0x90

lld/trunk/test/ELF/tls-opt-gdie.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-opt-gdie.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %t.so
 // RUN: ld.lld %t.o %t.so -o %t1
 // RUN: llvm-readobj -s -r %t1 | FileCheck --check-prefix=RELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 //RELOC:      Section {
 //RELOC:      Index: 9
 //RELOC-NEXT: Name: .got
 //RELOC-NEXT: Type: SHT_PROGBITS
 //RELOC-NEXT: Flags [
 //RELOC-NEXT:   SHF_ALLOC
 //RELOC-NEXT:   SHF_WRITE
 //RELOC-NEXT: ]
-//RELOC-NEXT: Address: 0x120E0
-//RELOC-NEXT: Offset: 0x20E0
+//RELOC-NEXT: Address: 0x120F0
+//RELOC-NEXT: Offset: 0x20F0
 //RELOC-NEXT: Size: 16
 //RELOC-NEXT: Link: 0
 //RELOC-NEXT: Info: 0
 //RELOC-NEXT: AddressAlignment: 8
 //RELOC-NEXT: EntrySize: 0
 //RELOC-NEXT: }
 //RELOC:      Relocations [
 //RELOC-NEXT:   Section (4) .rela.dyn {
-//RELOC-NEXT:     0x120E0 R_X86_64_TPOFF64 tlsshared0 0x0
-//RELOC-NEXT:     0x120E8 R_X86_64_TPOFF64 tlsshared1 0x0
+//RELOC-NEXT:     0x120F0 R_X86_64_TPOFF64 tlsshared0 0x0
+//RELOC-NEXT:     0x120F8 R_X86_64_TPOFF64 tlsshared1 0x0
 //RELOC-NEXT:   }
 //RELOC-NEXT:   Section (5) .rela.plt {
 //RELOC-NEXT:     0x13018 R_X86_64_JUMP_SLOT __tls_get_addr 0x0
 //RELOC-NEXT:   }
 //RELOC-NEXT: ]
 
-//0x11009 + (4304 + 7) = 0x120E0
-//0x11019 + (4296 + 7) = 0x120E8
+//0x11009 + (4304 + 7) = 0x120F0
+//0x11019 + (4296 + 7) = 0x120F8
 // DISASM:      Disassembly of section .text:
 // DISASM-NEXT: _start:
 // DISASM-NEXT: 11000: 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax
-// DISASM-NEXT: 11009: 48 03 05 d0 10 00 00       addq 4304(%rip), %rax
+// DISASM-NEXT: 11009: 48 03 05 e0 10 00 00       addq 4320(%rip), %rax
 // DISASM-NEXT: 11010: 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax
-// DISASM-NEXT: 11019: 48 03 05 c8 10 00 00       addq 4296(%rip), %rax
+// DISASM-NEXT: 11019: 48 03 05 d8 10 00 00       addq 4312(%rip), %rax
 
 .section .text
 .globl _start
 _start:
  .byte 0x66
  leaq tlsshared0@tlsgd(%rip),%rdi
  .word 0x6666
  rex64
  call __tls_get_addr@plt
  .byte 0x66
  leaq tlsshared1@tlsgd(%rip),%rdi
  .word 0x6666
  rex64
  call __tls_get_addr@plt

lld/trunk/test/ELF/tls-opt-gdiele-i686.s

 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %p/Inputs/tls-opt-gdiele-i686.s -o %tso.o
 // RUN: llvm-mc -filetype=obj -triple=i686-pc-linux %s -o %t.o
 // RUN: ld.lld -shared %tso.o -o %tso
 // RUN: ld.lld %t.o %tso -o %tout
 // RUN: llvm-readobj -r %tout | FileCheck --check-prefix=NORELOC %s
 // RUN: llvm-objdump -d %tout | FileCheck --check-prefix=DISASM %s
 
 // NORELOC:      Relocations [
 // NORELOC-NEXT: Section ({{.*}}) .rel.dyn {
-// NORELOC-NEXT:   0x12050 R_386_TLS_TPOFF tlsshared0 0x0
-// NORELOC-NEXT:   0x12054 R_386_TLS_TPOFF tlsshared1 0x0
+// NORELOC-NEXT:   0x12058 R_386_TLS_TPOFF tlsshared0 0x0
+// NORELOC-NEXT:   0x1205C R_386_TLS_TPOFF tlsshared1 0x0
 // NORELOC-NEXT:   }
 // NORELOC-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
 // DISASM-NEXT: _start:
 // DISASM-NEXT: 11000: 65 a1 00 00 00 00 movl %gs:0, %eax
 // DISASM-NEXT: 11006: 03 83 f8 ff ff ff addl -8(%ebx), %eax
 // DISASM-NEXT: 1100c: 65 a1 00 00 00 00 movl %gs:0, %eax

lld/trunk/test/ELF/tls-opt-iele-i686-nopic.s

 // GOTREL:      Section {
 // GOTREL:        Index:
 // GOTREL:        Name: .got
 // GOTREL-NEXT:   Type: SHT_PROGBITS
 // GOTREL-NEXT:   Flags [
 // GOTREL-NEXT:     SHF_ALLOC
 // GOTREL-NEXT:     SHF_WRITE
 // GOTREL-NEXT:   ]
-// GOTREL-NEXT:   Address: 0x12050
-// GOTREL-NEXT:   Offset: 0x2050
+// GOTREL-NEXT:   Address: 0x12058
+// GOTREL-NEXT:   Offset: 0x2058
 // GOTREL-NEXT:   Size: 8
 // GOTREL-NEXT:   Link: 0
 // GOTREL-NEXT:   Info: 0
 // GOTREL-NEXT:   AddressAlignment: 4
 // GOTREL-NEXT:   EntrySize: 0
 // GOTREL-NEXT: }
 // GOTREL:      Relocations [
 // GOTREL-NEXT: Section ({{.*}}) .rel.dyn {
-// GOTREL-NEXT:   0x12050 R_386_TLS_TPOFF tlsshared0 0x0
-// GOTREL-NEXT:   0x12054 R_386_TLS_TPOFF tlsshared1 0x0
+// GOTREL-NEXT:   0x12058 R_386_TLS_TPOFF tlsshared0 0x0
+// GOTREL-NEXT:   0x1205C R_386_TLS_TPOFF tlsshared1 0x0
 // GOTREL-NEXT:  }
 // GOTREL-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
 // DISASM-NEXT: _start:
 // 4294967288 = 0xFFFFFFF8
 // 4294967292 = 0xFFFFFFFC
-// 73808 = (.got)[0] = 0x12050
-// 73812 = (.got)[1] = 0x12054
+// 73808 = (.got)[0] = 0x12058
+// 73812 = (.got)[1] = 0x1205C
 // DISASM-NEXT: 11000: c7 c1 f8 ff ff ff movl $4294967288, %ecx
 // DISASM-NEXT: 11006: 65 8b 01          movl %gs:(%ecx), %eax
 // DISASM-NEXT: 11009: b8 f8 ff ff ff    movl $4294967288, %eax
 // DISASM-NEXT: 1100e: 65 8b 00          movl %gs:(%eax), %eax
 // DISASM-NEXT: 11011: 81 c1 f8 ff ff ff addl $4294967288, %ecx
 // DISASM-NEXT: 11017: 65 8b 01          movl %gs:(%ecx), %eax
 // DISASM-NEXT: 1101a: c7 c1 fc ff ff ff movl $4294967292, %ecx
 // DISASM-NEXT: 11020: 65 8b 01          movl %gs:(%ecx), %eax
 // DISASM-NEXT: 11023: b8 fc ff ff ff    movl $4294967292, %eax
 // DISASM-NEXT: 11028: 65 8b 00          movl %gs:(%eax), %eax
 // DISASM-NEXT: 1102b: 81 c1 fc ff ff ff addl $4294967292, %ecx
 // DISASM-NEXT: 11031: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 11034: 8b 0d 50 20 01 00 movl 73808, %ecx
+// DISASM-NEXT: 11034: 8b 0d 58 20 01 00 movl 73816, %ecx
 // DISASM-NEXT: 1103a: 65 8b 01          movl %gs:(%ecx), %eax
-// DISASM-NEXT: 1103d: 03 0d 54 20 01 00 addl 73812, %ecx
+// DISASM-NEXT: 1103d: 03 0d 5c 20 01 00 addl 73820, %ecx
 // DISASM-NEXT: 11043: 65 8b 01          movl %gs:(%ecx), %eax
 
 // GOTRELSHARED:     Section {
 // GOTRELSHARED:      Index: 8
 // GOTRELSHARED:      Name: .got
 // GOTRELSHARED-NEXT:   Type: SHT_PROGBITS
 // GOTRELSHARED-NEXT:   Flags [
 // GOTRELSHARED-NEXT:     SHF_ALLOC