[PowerPC] Fix issue where binary uses a .got but is missing a .TOC.

[stefanp]

Summary

From the PowerPC ELFv2 ABI section 4.2.3. Global Offset Table.

The GOT consists of an 8-byte header that contains the TOC base (the first TOC
base when multiple TOCs are present), followed by an array of 8-byte addresses.

Due to the introduction of PC Relative code it is now possible to require a GOT
without having a .TOC. symbol in the object that is being linked. Since LLD uses
the .TOC. symbol to determine whether or not a GOT is required the GOT header is
not setup correctly and the 8-byte header is missing.

This patch allows the Power PC GOT setup to happen when an element is added to
the GOT instead of at the very begining. When this header is added a .TOC.
symbol is also added.

[MaskRay]

lld/ELF/SyntheticSections.cpp

719

Can you use an approach similar to GotPltSection::hasGotPltOffset?

[stefanp]

lld/ELF/SyntheticSections.cpp

719

I'm sorry but I'm not sure what you are looking for.
I assume you mean GotPltSection::hasGotPltOffRel.

Are you looking to replace

if (config->emachine != EM_PPC64 || ElfSym::globalOffsetTable)
    return;

with something like:

if (hasGotHeader || ElfSym::globalOffsetTable)
    return;

Where I can then set hasGotHeader from the GotSection constructor and/or PPC specific code?

Or:
Should I set numEntries += target->gotHeaderEntriesNum; from PPC specific code?

[NeHuang]

lld/test/ELF/ppc64-ld-got-dtprel.s

28

is the computation proper here? To me, &.got[2] is different from &.got[1]

[MaskRay]

lld/ELF/SyntheticSections.cpp

719

We should drop setupPPCDelayedInit and compute the size of GotSection with an approach similar to GotPltSection::hasGotPltOffset

[stefanp]

lld/ELF/SyntheticSections.cpp

719

I cannot find GotPltSection::hasGotPltOffset it is not in the code.

There are a couple of ways that I could remove

numEntries += target->gotHeaderEntriesNum;

from this function including adding it to Symbol::getGotOffset() in the same way that Symbol::getGotPltOffset() does. However, I still have to add the .TOC. symbol and so I cannot remove setupPPCDelayedInit completely.

I'm sorry but I'm still confused about this comment...

[stefanp]

@MaskRay
I'm sorry to bug you but I still don't understand what you are looking for.

[stefanp]

lld/test/ELF/ppc64-ld-got-dtprel.s

28

You are correct the comment there is wrong.
It should probably be:

## hi(j@got@dtprel) = (&.got[2] - .got >> 16) & 0xffff = -1

I will fix that.

[stefanp]

Updated incorrect comment in test case.

[stefanp]

I'm sorry @MaskRay I don't want to keep bugging you but I really don't understand what you meant by your comment with respect to GotPltSection::hasGotPltOffset.

[MaskRay]

Sorry, I missed your early comments.

Which test can demonstrate the bug? My idea is that instead of creating setupPPCDelayedInit, we should let in.got->hasGotOffRel to convey that .got is needed.
See Relocations.cpp:1397

[stefanp]

In D91426#2535050, @MaskRay wrote:

Sorry, I missed your early comments.

Which test can demonstrate the bug? My idea is that instead of creating setupPPCDelayedInit, we should let in.got->hasGotOffRel to convey that .got is needed.
See Relocations.cpp:1397

Thank you for looking at this again!
I think I understand what you are looking for.

Let me start with the example test case. Pretty much any test that requires a GOT will work as long as we use PC Relative and don't have a TOC.
Take globalvar.c:

 int glob_int=0;
int function() {
  return glob_int;
}

If we compile it for Power 10:

clang -O3 -mcpu=pwr10 -c globalvar.c -fPIC
ld.lld --shared globalvar.o -o globalvar.so

We can then dump out some information on the GOT for globalvar.so.

$ llvm-readelf -r globalvar.so
Relocation section '.rela.dyn' at offset 0x2a0 contains 1 entries:
    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
0000000000020380  0000000200000014 R_PPC64_GLOB_DAT       0000000000030388 glob_int + 0
$ llvm-readelf -x .got globalvar.so
Hex dump of section '.got':
0x00020380 80830200 00000000                   ........

The problem with the output is that the glob_int is placed right at the top of the .got section. The TOC base is missing and according to the ABI we require it in all cases that require a .got.
This becomes a problem when we link globalvar.so later on with something that expects that TOC base to exist.

Now with respect to the suggestion you made. The in.got->hasGotOffRel is not set in the example from above.
The reason is that:

R_PPC64_GOT_PCREL34	glob_int

And R_PPC64_GOT_PCREL34 is turned into R_GOT_PC which is not part of: oneof<R_GOTONLY_PC, R_GOTREL, R_PPC64_TOCBASE, R_PPC64_RELAX_TOC>(expr).
This is why I added setupPPCDelayedInit that would run when we actively tried to add something to the GOT. We do not want to try to add a header to the GOT if the R_GOT_PC ends up being relaxed away and the rest of the GOT is empty.

In the past this wasn't really a problem because .TOC. would be defined any time we needed a GOT because we would always access the GOT with the TOC pointer. But now with PC Relative that is not the case.

I'm not sure how to proceed in this case. I have no way of knowing whether or not a GOT entry will be required when I create the GotSection object and I need a header in all situations where the GOT has something in it.

[stefanp]

Gentle ping.

[sfertile]

Could there be a simpler approach where we always emit a .got section on PPC64: In addReservedSymbols if we fail to resolve .TOC. then we create it?

[stefanp]

In D91426#2568567, @sfertile wrote:

Could there be a simpler approach where we always emit a .got section on PPC64: In addReservedSymbols if we fail to resolve .TOC. then we create it?

We could do that and it would certainly solve the problem. The issue I have with that is that we will now have a .got for everything we link including things that we used to link in the past that did not require it. It seems odd to say that since the design of the linker won't allow us to do this easily we will generate this section whether we need it or not.

[stefanp]

Ping.
I would like to restart the discussion on this patch.
I understand that the design of this fix is not ideal however I'm not sure of a better solution to this.
Adding the GOT to all linked binaries seems like too much. However, using hasGotOffRel isn't going to cover all of the test cases as it will not be set in all of the cases. The code needs to add a first symbol to the GOT in all cases where we use a GOT but we don't want to add a GOT if nothing else goes into it.

[sfertile]

In D91426#2569605, @stefanp wrote:

In D91426#2568567, @sfertile wrote:

Could there be a simpler approach where we always emit a .got section on PPC64: In addReservedSymbols if we fail to resolve .TOC. then we create it?

We could do that and it would certainly solve the problem. The issue I have with that is that we will now have a .got for everything we link including things that we used to link in the past that did not require it. It seems odd to say that since the design of the linker won't allow us to do this easily we will generate this section whether we need it or not.

I'll need to go over this again to refresh my memory. As a quick recap though:

• On PPC, if we create a .got, then the first entry must be the tocbase.
• If .TOC. is not defined by one of the input objects, then we do not increment the number of .got entries here
• If we synthetically define .TOC. in the linker, then we end up with a .got section in some cases where we would otherwise not need one.

Is it possible to change the .got section to always add gotHeaderEntriesNum in its constructor for PPC64, and remove the section late if all it contains is the single entry and .TOC. is not defined?

In D91426#2541656, @stefanp wrote:

In D91426#2535050, @MaskRay wrote:

Sorry, I missed your early comments.

Which test can demonstrate the bug? My idea is that instead of creating setupPPCDelayedInit, we should let in.got->hasGotOffRel to convey that .got is needed.
See Relocations.cpp:1397

Thank you for looking at this again!
I think I understand what you are looking for.

Let me start with the example test case. Pretty much any test that requires a GOT will work as long as we use PC Relative and don't have a TOC.
Take globalvar.c:

 int glob_int=0;
int function() {
  return glob_int;
}

If we compile it for Power 10:

clang -O3 -mcpu=pwr10 -c globalvar.c -fPIC
ld.lld --shared globalvar.o -o globalvar.so

We can then dump out some information on the GOT for globalvar.so.

$ llvm-readelf -r globalvar.so
Relocation section '.rela.dyn' at offset 0x2a0 contains 1 entries:
    Offset             Info             Type               Symbol's Value  Symbol's Name + Addend
0000000000020380  0000000200000014 R_PPC64_GLOB_DAT       0000000000030388 glob_int + 0
$ llvm-readelf -x .got globalvar.so
Hex dump of section '.got':
0x00020380 80830200 00000000                   ........

Please add this as a lit test as part of this patch.

[stefanp]

Rebased the patch to the latest top of trunk and added the test case.

[stefanp]

I'll need to go over this again to refresh my memory. As a quick recap though:

• On PPC, if we create a .got, then the first entry must be the tocbase.
• If .TOC. is not defined by one of the input objects, then we do not increment the number of .got entries here
• If we synthetically define .TOC. in the linker, then we end up with a .got section in some cases where we would otherwise not need one.

Yes, you got it!

Is it possible to change the .got section to always add gotHeaderEntriesNum in its constructor for PPC64, and remove the section late if all it contains is the single entry and .TOC. is not defined?

I see what you mean. An option might be to modify this function:

bool GotSection::isNeeded() const {
  // We need to emit a GOT even if it's empty if there's a relocation that is
  // relative to GOT(such as GOTOFFREL).
  return numEntries || hasGotOffRel;
}

On power PC we can say that we don't need the GOT if the number of entries is one and if the .TOC. is not defined. We now always add the GOT header but if we only have a GOT header at the end then we can say that we don't need the GOT. Does does that sound ok?

I can try to rework the patch to have it do this.

[MaskRay]

Apologies for my late response.

In D91426#2651428, @stefanp wrote:

I'll need to go over this again to refresh my memory. As a quick recap though:

• On PPC, if we create a .got, then the first entry must be the tocbase.
• If .TOC. is not defined by one of the input objects, then we do not increment the number of .got entries here
• If we synthetically define .TOC. in the linker, then we end up with a .got section in some cases where we would otherwise not need one.

Yes, you got it!

Thanks:) I need to refresh my memory as well.

Is it possible to change the .got section to always add gotHeaderEntriesNum in its constructor for PPC64, and remove the section late if all it contains is the single entry and .TOC. is not defined?

I see what you mean. An option might be to modify this function:

bool GotSection::isNeeded() const {
  // We need to emit a GOT even if it's empty if there's a relocation that is
  // relative to GOT(such as GOTOFFREL).
  return numEntries || hasGotOffRel;
}

On power PC we can say that we don't need the GOT if the number of entries is one and if the .TOC. is not defined. We now always add the GOT header but if we only have a GOT header at the end then we can say that we don't need the GOT. Does does that sound ok?

I can try to rework the patch to have it do this.

Sounds good.

Eventually I think we may need to do something like if we want to have better compatibility with GNU ld. A rudimentary patch like the following needs test updates for ppc32/ppc64/riscv.
(I haven't thought enough about the interaction with the GOT symbol yet.)

I can check whether your ppc64 specific patch will make it closer to the below ... and if so, make our code looks like that once your patch is committed:)

diff --git i/lld/ELF/SyntheticSections.cpp w/lld/ELF/SyntheticSections.cpp
index 9a875bd7ec3e..1f9a741b206a 100644
--- i/lld/ELF/SyntheticSections.cpp
+++ w/lld/ELF/SyntheticSections.cpp
@@ -648,7 +648,3 @@ GotSection::GotSection()
                        ".got") {
-  // If ElfSym::globalOffsetTable is relative to .got and is referenced,
-  // increase numEntries by the number of entries used to emit
-  // ElfSym::globalOffsetTable.
-  if (ElfSym::globalOffsetTable && !target->gotBaseSymInGotPlt)
-    numEntries += target->gotHeaderEntriesNum;
+  numEntries += target->gotHeaderEntriesNum;
 }
@@ -694,3 +690,3 @@ bool GotSection::isNeeded() const {
   // relative to GOT(such as GOTOFFREL).
-  return numEntries || hasGotOffRel;
+  return numEntries > target->gotHeaderEntriesNum || ElfSym::globalOffsetTable || hasGotOffRel;
 }

[stefanp]

Updated to always add the header to the got on PPC64.

If the .got only contains the header it is not needed and so old linking
behaviour will remain the same.

I was not able to add the .TOC. symbol to the patch. Adding the symbol in the
constructor did no allow me remove it later and adding it to either
finalizeContents or isNeeded is too late and it won't appear in the symbol table
in the object that is linked.

However, I do not believe that the symbol is necessary to fix the bug. Even
without the symbol the .got has space for the .TOC. at the top.

[stefanp]

Removed extra whitespace.

[MaskRay]

lld/test/ELF/ppc64-check-missing-tocbase.s

37

I know there is prior art but why can't this be written as t`.reloc ., R_PPC64_PCREL_OPT, 0` before pld?

[stefanp]

lld/test/ELF/ppc64-check-missing-tocbase.s

37

The ABI does require that the .reloc come after the glob_int@got@pcrel relocation because the R_PPC64_PCREL_OPT relocation is an optimization opportunity related to that previous relocation. Therefore, I don't want to swap the order of the two.
It would be in section 3.5.4. Relocation Descriptions. It is a new relocation so I don't know if you have the text. So, here it is:

This relocation specifies that the instruction at r_offset and the instruction at r_offset + r_addend
may be optimized by the linker; the compiler must guarantee that register lifetimes are such that
the optimization is safe. In code sequences where this relocation is valid, the first instruction also
has another relocation at r_offset. The R_PPC64_PCREL_OPT entry occurs immediately after
that relocation in the table of relocations. See Section 3.6.3.3, “Displacement Optimization for PC-Relative Accesses” [95] for more details.

lld/ELF/SyntheticSections.cpp

 }
 
 GotSection::GotSection()
     : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, config->wordsize,
                        ".got") {
   // If ElfSym::globalOffsetTable is relative to .got and is referenced,
   // increase numEntries by the number of entries used to emit
   // ElfSym::globalOffsetTable.
-  if (ElfSym::globalOffsetTable && !target->gotBaseSymInGotPlt)
+  // On PP64 we always add the header at the start.
+  if ((ElfSym::globalOffsetTable && !target->gotBaseSymInGotPlt) ||
+      config->emachine == EM_PPC64)
     numEntries += target->gotHeaderEntriesNum;
 }
 
 void GotSection::addEntry(Symbol &sym) {
   sym.gotIndex = numEntries;
   ++numEntries;
 }
 
uint64_t GotSection::getGlobalDynAddr(const Symbol &b) const {
   return this->getVA() + b.globalDynIndex * config->wordsize;
 }
 
 uint64_t GotSection::getGlobalDynOffset(const Symbol &b) const {
   return b.globalDynIndex * config->wordsize;
 }
 
 void GotSection::finalizeContents() {
+  if (config->emachine == EM_PPC64 &&
+      numEntries <= target->gotHeaderEntriesNum && !ElfSym::globalOffsetTable)
+    size = 0;
+  else
     size = numEntries * config->wordsize;
 }
 
 bool GotSection::isNeeded() const {
   // We need to emit a GOT even if it's empty if there's a relocation that is
   // relative to GOT(such as GOTOFFREL).
+
+  // On PPC64 we need to check that the number of entires is more than just the
+  // size of the header since the header is always added. A GOT with just the
+  // header may not actually be needed.
+  if (config->emachine == EM_PPC64)
+    return numEntries > target->gotHeaderEntriesNum || hasGotOffRel;
+
   return numEntries || hasGotOffRel;
 }
 
 void GotSection::writeTo(uint8_t *buf) {
   target->writeGotHeader(buf);
   relocateAlloc(buf, buf + size);
 }
 
 static uint64_t getMipsPageAddr(uint64_t addr) {
   return (addr + 0x8000) & ~0xffff;
 }
 
 static uint64_t getMipsPageCount(uint64_t size) {
   return (size + 0xfffe) / 0xffff + 1;
 }
 
 MipsGotSection::MipsGotSection()
     : SyntheticSection(SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL, SHT_PROGBITS, 16,
                        ".got") {}
 

lld/test/ELF/ppc64-check-missing-tocbase.s

+# REQUIRES: ppc
+
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le %s -o %t.o
+# RUN: llvm-readobj -r %t.o | FileCheck --check-prefix=INPUT-REL %s
+# RUN: llvm-objdump -d --no-show-raw-insn --mcpu=pwr10 %t.o | FileCheck --check-prefix=INPUT-ASM %s
+
+# RUN: ld.lld --shared %t.o --soname=t.so -o %t.so
+# RUN: llvm-readelf -r %t.so | FileCheck --check-prefix=SO-REL %s
+# RUN: llvm-readelf -x .got %t.so | FileCheck --check-prefix=SO-GOT %s
+# RUN: llvm-readelf -s %t.so | FileCheck --check-prefix=SO-SYM %s
+
+## Test to make sure that the first element of a GOT section is the tocbase .TOC.
+
+# INPUT-REL:          Section (3) .rela.text {
+# INPUT-REL-NEXT:       0x0 R_PPC64_GOT_PCREL34 glob_int 0x0
+# INPUT-REL-NEXT:       0x0 R_PPC64_PCREL_OPT - 0x8
+# INPUT-REL-NEXT:     }
+
+# INPUT-ASM-LABEL:    <test>:
+# INPUT-ASM:            pld 3, 0(0), 1
+# INPUT-ASM-NEXT:       lwa 3, 0(3)
+# INPUT-ASM-NEXT:       blr
+
+# SO-REL: Relocation section '.rela.dyn'
+# SO-REL:   0000000000020390  0000000100000014 R_PPC64_GLOB_DAT       00000000000102d0 glob_int + 0
+
+# SO-GOT: Hex dump of section '.got':
+# SO-GOT:   0x00020388 88830200 00000000 00000000 00000000
+
+# SO-SYM: Symbol table '.symtab' contains 4 entries:
+# SO-SYM:   3: 00000000000102d0     4 NOTYPE  GLOBAL DEFAULT     6 glob_int
+
+test:
+  pld 3, glob_int@got@pcrel(0), 1
+.Lpcrel0:
+  .reloc .Lpcrel0-8,R_PPC64_PCREL_OPT,.-(.Lpcrel0-8)
+  lwa 3, 0(3)
+  blr
+
+  .globl  glob_int
+  .p2align  2
+glob_int:
+  .long 0
+  .size glob_int, 4

lld/test/ELF/ppc64-ld-got-dtprel.s

 
 # RELOCS:      .rela.text {
 # RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_HA i 0x0
 # RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_LO_DS i 0x0
 # RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_HI j 0x0
 # RELOCS-NEXT:   R_PPC64_GOT_DTPREL16_DS j 0x0
 # RELOCS-NEXT: }
 
-## ha(i@got@dtprel) = (&.got[0] - (.got+0x8000) + 0x8000 >> 16) & 0xffff = 0
-## lo(i@got@dtprel) = &.got[0] - (.got+0x8000) & 0xffff = -32768
-## hi(j@got@dtprel) = (&.got[1] - (.got+0x8000) >> 16) & 0xffff = -1
-## j@got@dtprel = &.got[1] - (.got+0x8000) = -32760
+## Start with .got[1] as .got[0] is .TOC.
+## ha(i@got@dtprel) = (&.got[1] - (.got+0x8000) >> 16) & 0xffff = 0
+## lo(i@got@dtprel) = &.got[1] - (.got+0x8000) & 0xffff = -32760
+## hi(j@got@dtprel) = (&.got[2] - .got >> 16) & 0xffff = -1
+## j@got@dtprel = &.got[2] - (.got+0x8000) = -32752
 # CHECK:      addis 3, 2, 0
-# CHECK-NEXT: ld 3, -32768(3)
+# CHECK-NEXT: ld 3, -32760(3)
 # CHECK-NEXT: addis 3, 2, -1
-# CHECK-NEXT: addi 3, 2, -32760
+# CHECK-NEXT: addi 3, 2, -32752
 
   addis 3, 2, i@got@dtprel@ha
   ld 3, i@got@dtprel@l(3)
   addis 3, 2, j@got@dtprel@h
   addi 3, 2, j@got@dtprel
 
 .section .tbss,"awT",@nobits
 .p2align 2
 i:
   .long 0
 j:
   .long 0

lld/test/ELF/ppc64-reloc-got-pcrel34.s

 # RUN: ld.lld -T %t.script --shared %t.o -o %t
 # RUN: llvm-readelf -s %t | FileCheck %s --check-prefix=SYMBOL
 # RUN: llvm-readelf -r %t | FileCheck %s --check-prefix=RELA
 # RUN: llvm-objdump -d --no-show-raw-insn --mcpu=future %t | FileCheck %s
 
 .text
 .section .text_low, "ax", %progbits
 # CHECK-LABEL: <GlobIntPCRel>:
-# CHECK-NEXT:    pld 3, 458928(0), 1
+# CHECK-NEXT:    pld 3, 458936(0), 1
 # CHECK-NEXT:    lwa 3, 0(3)
+
 # SYMBOL: Symbol table '.dynsym' contains 4 entries:
 # SYMBOL:      00000000     0 NOTYPE  GLOBAL  DEFAULT     UND glob_int
-# RELA:        100800b0  0000000100000014 R_PPC64_GLOB_DAT       0000000000000000 glob_int + 0
+# RELA:        100800b8  0000000100000014 R_PPC64_GLOB_DAT       0000000000000000 glob_int + 0
 GlobIntPCRel:
   pld 3, glob_int@got@PCREL(0), 1
   lwa 3, 0(3)
   blr
 
 # CHECK-LABEL: <GlobIntPCRelOffset>:
-# CHECK-NEXT:    pld 3, 458920(0), 1
+# CHECK-NEXT:    pld 3, 458928(0), 1
 # CHECK-NEXT:    lwa 3, 8(3)
 # SYMBOL:      00000000     0 NOTYPE  GLOBAL  DEFAULT     UND glob_int8
-# RELA:        100800b8  0000000200000014 R_PPC64_GLOB_DAT       0000000000000000 glob_int8 + 0
+# RELA:        100800c0  0000000200000014 R_PPC64_GLOB_DAT       0000000000000000 glob_int8 + 0
 GlobIntPCRelOffset:
   pld 3, glob_int8@got@PCREL(0), 1
   lwa 3, 8(3)
   blr
 
 # CHECK-LABEL: <GlobIntPCRelBigOffset>:
-# CHECK-NEXT:    pld 3, 192(0), 1
+# CHECK-NEXT:    pld 3, 200(0), 1
 # CHECK-NEXT:    lwa 3, 64(3)
 # SYMBOL:      00000000     0 NOTYPE  GLOBAL  DEFAULT     UND glob_int8_big
-# RELA:        100800c0  0000000300000014 R_PPC64_GLOB_DAT       0000000000000000 glob_int8_big + 0
+# RELA:        100800c8  0000000300000014 R_PPC64_GLOB_DAT       0000000000000000 glob_int8_big + 0
+
+## Note that the first entry of the .got[0] should always be .TOC.
+# SYMBOL: Symbol table '.symtab' contains 8 entries:
+# SYMBOL: 1: 0000000010010000 0 NOTYPE LOCAL DEFAULT 6 GlobIntPCRel
+# SYMBOL: 2: 0000000010010010 0 NOTYPE LOCAL DEFAULT 6 GlobIntPCRelOffset
+# SYMBOL: 3: 0000000010080000 0 NOTYPE LOCAL DEFAULT 7 GlobIntPCRelBigOffset
 .section .text_high, "ax", %progbits
 GlobIntPCRelBigOffset:
   pld 3, glob_int8_big@got@PCREL(0), 1
   lwa 3, 64(3)
   blr

lld/test/ELF/ppc64-tls-gd.s

 # RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
 
 # RUN: ld.lld %t.o %t1.so -o %t
 # RUN: llvm-readobj -r %t | FileCheck --check-prefix=IE-REL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=IE %s
 
 # GD-REL:      .rela.dyn {
-# GD-REL-NEXT:   0x20548 R_PPC64_DTPMOD64 a 0x0
-# GD-REL-NEXT:   0x20550 R_PPC64_DTPREL64 a 0x0
-# GD-REL-NEXT:   0x20558 R_PPC64_DTPMOD64 b 0x0
-# GD-REL-NEXT:   0x20560 R_PPC64_DTPREL64 b 0x0
-# GD-REL-NEXT:   0x20568 R_PPC64_DTPMOD64 c 0x0
-# GD-REL-NEXT:   0x20570 R_PPC64_DTPREL64 c 0x0
+# GD-REL-NEXT:   0x20550 R_PPC64_DTPMOD64 a 0x0
+# GD-REL-NEXT:   0x20558 R_PPC64_DTPREL64 a 0x0
+# GD-REL-NEXT:   0x20560 R_PPC64_DTPMOD64 b 0x0
+# GD-REL-NEXT:   0x20568 R_PPC64_DTPREL64 b 0x0
+# GD-REL-NEXT:   0x20570 R_PPC64_DTPMOD64 c 0x0
+# GD-REL-NEXT:   0x20578 R_PPC64_DTPREL64 c 0x0
 # GD-REL-NEXT: }
 
-## &DTPMOD(a) - .TOC. = &.got[0] - (.got+0x8000) = -32768
+## Start with .got[1] as .got[0] is the .TOC.
+## &DTPMOD(a) - .TOC. = &.got[1] - (.got+0x8000) = -32760
 # GD:      addis 3, 2, 0
-# GD-NEXT: addi 3, 3, -32768
+# GD-NEXT: addi 3, 3, -32760
 # GD-NEXT: bl 0x10400
 # GD-NEXT: ld 2, 24(1)
 
-## &DTPMOD(b) - .TOC. = &.got[2] - (.got+0x8000) = -32752
+## &DTPMOD(b) - .TOC. = &.got[3] - (.got+0x8000) = -32744
 # GD-NEXT: addis 3, 2, 0
-# GD-NEXT: addi 3, 3, -32752
+# GD-NEXT: addi 3, 3, -32744
 # GD-NEXT: bl 0x10400
 # GD-NEXT: ld 2, 24(1)
 
-## &DTPMOD(b) - .TOC. = &.got[4] - (.got+0x8000) = -32736
-# GD-NEXT: li 3, -32736
+## &DTPMOD(b) - .TOC. = &.got[5] - (.got+0x8000) = -32728
+# GD-NEXT: li 3, -32728
 # GD-NEXT: bl 0x10400
 # GD-NEXT: ld 2, 24(1)
 
 # NOREL: no relocations
 
 ## a@tprel = st_value(a)-0x7000 = -28664
 # LE:      nop
 # LE-NEXT: addis 3, 13, 0
 # LE-NEXT: nop
 # LE-NEXT: addi 3, 3, -28664
 ## b@tprel = st_value(b)-0x7000 = -28660
 # LE:      nop
 # LE-NEXT: addis 3, 13, 0
 # LE-NEXT: nop
 # LE-NEXT: addi 3, 3, -28660
 ## c@tprel = st_value(c)-0x7000 = -28656
 # LE-NEXT: addis 3, 13, 0
 # LE-NEXT: nop
 # LE-NEXT: addi 3, 3, -28656
 
 # IE-REL:      .rela.dyn {
-# IE-REL-NEXT:   0x10020418 R_PPC64_TPREL64 b 0x0
-# IE-REL-NEXT:   0x10020420 R_PPC64_TPREL64 c 0x0
+# IE-REL-NEXT:   0x10020420 R_PPC64_TPREL64 b 0x0
+# IE-REL-NEXT:   0x10020428 R_PPC64_TPREL64 c 0x0
 # IE-REL-NEXT: }
 
 ## a is relaxed to use LE.
 ## a@tprel = st_value(a)-0x7000 = -28664
 # IE:      nop
 # IE-NEXT: addis 3, 13, 0
 # IE-NEXT: nop
 # IE-NEXT: addi 3, 3, -28664
-## &DTPMOD(b) - .TOC. = &.got[0] - (.got+0x8000) = -32768
+## &DTPMOD(b) - .TOC. = &.got[1] - (.got+0x8000) = -32760
 # IE-NEXT: addis 3, 2, 0
-# IE-NEXT: ld 3, -32768(3)
+# IE-NEXT: ld 3, -32760(3)
 # IE-NEXT: nop
 # IE-NEXT: add 3, 3, 13
-## &DTPMOD(c) - .TOC. = &.got[1] - (.got+0x8000) = -32760
+## &DTPMOD(c) - .TOC. = &.got[2] - (.got+0x8000) = -32752
 ## r0 is wrong. R_PPC64_GOT_TLS16 cannot be relaxed to IE but the behavior is
 ## consistent with ld.bfd
-# IE-NEXT: ld 3, -32760(0)
+# IE-NEXT: ld 3, -32752(0)
 # IE-NEXT: nop
 # IE-NEXT: add 3, 3, 13
 
 addis 3, 2, a@got@tlsgd@ha
 addi 3, 3, a@got@tlsgd@l
 bl __tls_get_addr(a@tlsgd)
 nop
 

lld/test/ELF/ppc64-tls-ie.s

 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=IE-REL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck --check-prefix=IE %s
 ## IE -> LE
 # RUN: ld.lld %t.o -o %t
 # RUN: llvm-readelf -r %t | FileCheck --check-prefix=NOREL %s
 # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck --check-prefix=LE %s
 
 # IE-REL:      .rela.dyn {
-# IE-REL-NEXT:   0x204A0 R_PPC64_TPREL64 c 0x0
-# IE-REL-NEXT:   0x204A8 R_PPC64_TPREL64 s 0x0
-# IE-REL-NEXT:   0x204B0 R_PPC64_TPREL64 i 0x0
-# IE-REL-NEXT:   0x204B8 R_PPC64_TPREL64 l 0x0
+# IE-REL-NEXT:   0x204A8 R_PPC64_TPREL64 c 0x0
+# IE-REL-NEXT:   0x204B0 R_PPC64_TPREL64 s 0x0
+# IE-REL-NEXT:   0x204B8 R_PPC64_TPREL64 i 0x0
+# IE-REL-NEXT:   0x204C0 R_PPC64_TPREL64 l 0x0
 # IE-REL-NEXT: }
 
 # INPUT-REL: R_PPC64_GOT_TPREL16_HA c 0x0
 # INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS c 0x0
 # INPUT-REL: R_PPC64_TLS c 0x0
-## &.got[0] - .TOC. = -32768
+## &.got[1] - .TOC. = -32760
 # IE-LABEL: <test1>:
 # IE-NEXT:  addis 3, 2, 0
-# IE-NEXT:  ld 3, -32768(3)
+# IE-NEXT:  ld 3, -32760(3)
 # IE-NEXT:  lbzx 3, 3, 13
 # LE-LABEL: <test1>:
 # LE-NEXT:   nop
 # LE-NEXT:   addis 3, 13, 0
 # LE-NEXT:   lbz 3, -28672(3)
 test1:
   addis 3, 2, c@got@tprel@ha
   ld 3, c@got@tprel@l(3)
   lbzx 3, 3, c@tls
 
 # INPUT-REL: R_PPC64_GOT_TPREL16_HA s 0x0
 # INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS s 0x0
 # INPUT-REL: R_PPC64_TLS s 0x0
-## &.got[1] - .TOC. = -32760
+## &.got[2] - .TOC. = -32752
 # IE-LABEL: <test2>:
 # IE-NEXT:  addis 3, 2, 0
-# IE-NEXT:  ld 3, -32760(3)
+# IE-NEXT:  ld 3, -32752(3)
 # IE-NEXT:  lhzx 3, 3, 13
 # LE-LABEL: <test2>:
 # LE-NEXT:  nop
 # LE-NEXT:  addis 3, 13, 0
 # LE-NEXT:  lhz 3, -28670(3)
 test2:
   addis 3, 2, s@got@tprel@ha
   ld 3, s@got@tprel@l(3)
   lhzx 3, 3, s@tls
 
 # INPUT-REL: R_PPC64_GOT_TPREL16_HA i 0x0
 # INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS i 0x0
 # INPUT-REL: R_PPC64_TLS i 0x0
-## &.got[2] - .TOC. = -32752
+## &.got[3] - .TOC. = -32744
 # IE-LABEL: <test3>:
 # IE-NEXT:  addis 3, 2, 0
-# IE-NEXT:  ld 3, -32752(3)
+# IE-NEXT:  ld 3, -32744(3)
 # IE-NEXT:  lwzx 3, 3, 13
 # LE-LABEL: <test3>:
 # LE-NEXT:  nop
 # LE-NEXT:  addis 3, 13, 0
 # LE-NEXT:  lwz 3, -28668(3)
 test3:
   addis 3, 2, i@got@tprel@ha
   ld 3, i@got@tprel@l(3)
   lwzx 3, 3, i@tls
 
 # INPUT-REL: R_PPC64_GOT_TPREL16_HA l 0x0
 # INPUT-REL: R_PPC64_GOT_TPREL16_LO_DS l 0x0
 # INPUT-REL: R_PPC64_TLS l 0x0
-## &.got[3] - .TOC. = -32744
+## &.got[4] - .TOC. = -32736
 # IE-LABEL: <test4>:
 # IE-NEXT:  addis 3, 2, 0
-# IE-NEXT:  ld 3, -32744(3)
+# IE-NEXT:  ld 3, -32736(3)
 # IE-NEXT:  ldx 3, 3, 13
 # LE-LABEL: <test4>:
 # LE-NEXT:  nop
 # LE-NEXT:  addis 3, 13, 0
 # LE-NEXT:  ld 3, -28664(3)
 test4:
   addis 3, 2, l@got@tprel@ha
   ld 3, l@got@tprel@l(3)

lld/test/ELF/ppc64-tls-missing-gdld.s

 
 # WARN: warning: {{.*}}.o: disable TLS relaxation due to R_PPC64_GOT_TLS* relocations without R_PPC64_TLSGD/R_PPC64_TLSLD relocations
 
 ## .got+0: x is local - relaxed to LE - its DTPMOD/DTPREL slots are link-time constants.
 ## DTPMOD is 1. DTPREL is st_value-0x8000 = -0x8000.
 ## .got+16: DTPMOD/DTPREL for _TLS_MODULE_BASE_ is 1 and 0, respectively.
 ## .got+32: TPOFFSET for x = st_value-0x7000
 # HEX:      section '.got':
-# HEX-NEXT: [[#%x,IGNORE:]] 01000000 00000000 0080ffff ffffffff
-# HEX-NEXT: [[#%x,IGNORE:]] 01000000 00000000 00000000 00000000
-# HEX-NEXT: [[#%x,IGNORE:]] 0090ffff ffffffff
+# HEX-NEXT: [[#%x,IGNORE:]] 50820210 00000000 01000000 00000000
+# HEX-NEXT: [[#%x,IGNORE:]] 0080ffff ffffffff 01000000 00000000
+# HEX-NEXT: [[#%x,IGNORE:]] 00000000 00000000 0090ffff ffffffff
 
 ## .TOC.-32768 = (.got+0x8000)-32768 = .got
 # DIS-LABEL: <GeneralDynamic>:
 # DIS-NEXT:    addis 3, 2, 0
-# DIS-NEXT:    addi 3, 3, -32768
+# DIS-NEXT:    addi 3, 3, -32760
 # DIS-NEXT:    bl [[#%x,TGA:]]
 # DIS-LABEL: <GeneralDynamic_NOTOC>:
 # DIS-NEXT:    addis 3, 2, 0
-# DIS-NEXT:    addi 3, 3, -32768
+# DIS-NEXT:    addi 3, 3, -32760
 # DIS-NEXT:    bl [[#TGA]]
 
 ## LocalDynamic references _TLS_MODULE_BASE_.
 ## .TOC.-32752 = (.got+0x8000)-32752 = .got+16
 # DIS-LABEL: <LocalDynamic>:
 # DIS-NEXT:    addis 3, 2, 0
-# DIS-NEXT:    addi 3, 3, -32752
+# DIS-NEXT:    addi 3, 3, -32744
 # DIS-NEXT:    bl [[#TGA]]
 # DIS-LABEL: <LocalDynamic_NOTOC>:
 # DIS-NEXT:    addis 3, 2, 0
-# DIS-NEXT:    addi 3, 3, -32752
+# DIS-NEXT:    addi 3, 3, -32744
 # DIS-NEXT:    bl [[#TGA]]
 
 ## Technically we don't have to disable IE to LE relaxation,
 ## but disabling it for implementation simplicity does not hurt.
 # DIS-LABEL: <InitialExec>:
 # DIS-NEXT:    addis 3, 2, 0
-# DIS-NEXT:    ld 3, -32736(3)
+# DIS-NEXT:    ld 3, -32728(3)
 # DIS-NEXT:    add 3, 3, 13
 
 #--- a.s
 GeneralDynamic:
   addis 3, 2, x@got@tlsgd@ha
   addi 3, 3, x@got@tlsgd@l
   bl __tls_get_addr
   nop

lld/test/ELF/ppc64-tls-pcrel-gd.s

x:
   .long 0
 .globl  y
 y:
   .long 0
 
 #--- asm
 
 # GD-RELOC: Relocation section '.rela.dyn' at offset 0x100b8 contains 4 entries:
-# GD-RELOC: 0000000001001170  0000000100000044 R_PPC64_DTPMOD64       0000000000000000 x + 0
-# GD-RELOC: 0000000001001178  000000010000004e R_PPC64_DTPREL64       0000000000000000 x + 0
-# GD-RELOC: 0000000001001180  0000000300000044 R_PPC64_DTPMOD64       0000000000000000 y + 0
-# GD-RELOC: 0000000001001188  000000030000004e R_PPC64_DTPREL64       0000000000000000 y + 0
+# GD-RELOC: 0000000001001178  0000000100000044 R_PPC64_DTPMOD64       0000000000000000 x + 0
+# GD-RELOC: 0000000001001180  000000010000004e R_PPC64_DTPREL64       0000000000000000 x + 0
+# GD-RELOC: 0000000001001188  0000000300000044 R_PPC64_DTPMOD64       0000000000000000 y + 0
+# GD-RELOC: 0000000001001190  000000030000004e R_PPC64_DTPREL64       0000000000000000 y + 0
 
 # GD-SYM:   Symbol table '.dynsym' contains 4 entries:
 # GD-SYM:   0000000000000000     0 TLS     GLOBAL DEFAULT   UND x
 # GD-SYM:   0000000000000000     0 TLS     GLOBAL DEFAULT   UND y
 
 
 # GDTOIE-RELOC: Relocation section '.rela.dyn' at offset 0x{{.*}} contains 2 entries:
-# GDTOIE-RELOC: 00000000010010e0  0000000100000049 R_PPC64_TPREL64        0000000000000000 x + 0
-# GDTOIE-RELOC: 00000000010010e8  0000000300000049 R_PPC64_TPREL64        0000000000000000 y + 0
+# GDTOIE-RELOC: 00000000010010e8  0000000100000049 R_PPC64_TPREL64        0000000000000000 x + 0
+# GDTOIE-RELOC: 00000000010010f0  0000000300000049 R_PPC64_TPREL64        0000000000000000 y + 0
 
 # GDTOIE-SYM: Symbol table '.dynsym' contains 4 entries:
 # GDTOIE-SYM:   0000000000000000     0 TLS     GLOBAL DEFAULT   UND x
 # GDTOIE-SYM:   0000000000000000     0 TLS     GLOBAL DEFAULT   UND y
 
 
 # GDTOLE-RELOC: There are no relocations in this file.
 
 # GDTOLE-SYM: Symbol table '.symtab' contains 5 entries:
 # GDTOLE-SYM: 0000000000000000     0 TLS     GLOBAL DEFAULT     3 x
 # GDTOLE-SYM: 0000000000000004     0 TLS     GLOBAL DEFAULT     3 y
 
 # GD-LABEL: <GDTwoVal>:
-# GD-NEXT:    paddi 3, 0, 368, 1
+# GD-NEXT:    paddi 3, 0, 376, 1
 # GD-NEXT:    bl
-# GD-NEXT:    paddi 3, 0, 372, 1
+# GD-NEXT:    paddi 3, 0, 380, 1
 # GD-NEXT:    bl
 # GD-NEXT:    blr
 # GDTOIE-LABEL: <GDTwoVal>:
-# GDTOIE-NEXT:    pld 3, 224(0), 1
+# GDTOIE-NEXT:    pld 3, 232(0), 1
 # GDTOIE-NEXT:    add 3, 3, 13
-# GDTOIE-NEXT:    pld 3, 220(0), 1
+# GDTOIE-NEXT:    pld 3, 228(0), 1
 # GDTOIE-NEXT:    add 3, 3, 13
 # GDTOIE-NEXT:    blr
 # GDTOLE-LABEL: <GDTwoVal>:
 # GDTOLE-NEXT:    paddi 3, 13, -28672, 0
 # GDTOLE-NEXT:    nop
 # GDTOLE-NEXT:    paddi 3, 13, -28668, 0
 # GDTOLE-NEXT:    nop
 # GDTOLE-NEXT:    blr
 .section .text_addr, "ax", %progbits
 GDTwoVal:
   paddi 3, 0, x@got@tlsgd@pcrel, 1
   bl __tls_get_addr@notoc(x@tlsgd)
   paddi 3, 0, y@got@tlsgd@pcrel, 1
   bl __tls_get_addr@notoc(y@tlsgd)
   blr

lld/test/ELF/ppc64-tls-pcrel-ie.s

 x:
   .long 0
 .globl  y
 y:
   .long 0
 
 #--- asm
 # IE-RELOC: Relocation section '.rela.dyn' at offset 0x10090 contains 2 entries:
-# IE-RELOC: 00000000010040d8  0000000100000049 R_PPC64_TPREL64        0000000000000000 x + 0
-# IE-RELOC: 00000000010040e0  0000000200000049 R_PPC64_TPREL64        0000000000000000 y + 0
+# IE-RELOC: 00000000010040e0  0000000100000049 R_PPC64_TPREL64        0000000000000000 x + 0
+# IE-RELOC: 00000000010040e8  0000000200000049 R_PPC64_TPREL64        0000000000000000 y + 0
 
 # IE-SYM:   Symbol table '.dynsym' contains 3 entries:
 # IE-SYM:   1: 0000000000000000     0 TLS     GLOBAL DEFAULT   UND x
 # IE-SYM:   2: 0000000000000000     0 TLS     GLOBAL DEFAULT   UND y
 
 # IE-GOT:      Hex dump of section '.got':
 # IE-GOT-NEXT: 0x010040d8 d8c00001 00000000 00000000 00000000
 
 # LE-RELOC: There are no relocations in this file.
 
 # LE-SYM: Symbol table '.symtab' contains 8 entries:
 # LE-SYM: 6: 0000000000000000     0 TLS     GLOBAL DEFAULT     6 x
 # LE-SYM: 7: 0000000000000004     0 TLS     GLOBAL DEFAULT     6 y
 
 # LE-GOT: could not find section '.got'
 
 # IE-LABEL: <IEAddr>:
-# IE-NEXT:    pld 3, 12504(0), 1
+# IE-NEXT:    pld 3, 12512(0), 1
 # IE-NEXT:    add 3, 3, 13
 # IE-NEXT:    blr
 # LE-LABEL: <IEAddr>:
 # LE-NEXT:    paddi 3, 13, -28672, 0
 # LE-NEXT:    nop
 # LE-NEXT:    blr
 .section .text_addr, "ax", %progbits
 IEAddr:
   pld 3, x@got@tprel@pcrel(0), 1
   add 3, 3, x@tls@pcrel
   blr
 
 # IE-LABEL: <IEAddrCopy>:
-# IE-NEXT:    pld 3, 12488(0), 1
+# IE-NEXT:    pld 3, 12496(0), 1
 # IE-NEXT:    add 4, 3, 13
 # IE-NEXT:    blr
 # LE-LABEL: <IEAddrCopy>:
 # LE-NEXT:    paddi 3, 13, -28672, 0
 # LE-NEXT:    mr 4, 3
 # LE-NEXT:    blr
 .section .text_addr, "ax", %progbits
 IEAddrCopy:
   pld 3, x@got@tprel@pcrel(0), 1
   add 4, 3, x@tls@pcrel
   blr
 
 # IE-LABEL: <IEVal>:
-# IE-NEXT:    pld 3, 8408(0), 1
+# IE-NEXT:    pld 3, 8416(0), 1
 # IE-NEXT:    lwzx 3, 3, 13
 # IE-NEXT:    blr
 # LE-LABEL: <IEVal>:
 # LE-NEXT:    paddi 3, 13, -28672, 0
 # LE-NEXT:    lwz 3, 0(3)
 # LE-NEXT:    blr
 .section .text_val, "ax", %progbits
 IEVal:
   pld 3, x@got@tprel@pcrel(0), 1
   lwzx 3, 3, x@tls@pcrel
   blr
 
 # IE-LABEL: <IETwoVal>:
-# IE-NEXT:    pld 3, 4312(0), 1
-# IE-NEXT:    pld 4, 4312(0), 1
+# IE-NEXT:    pld 3, 4320(0), 1
+# IE-NEXT:    pld 4, 4320(0), 1
 # IE-NEXT:    lwzx 3, 3, 13
 # IE-NEXT:    lwzx 4, 4, 13
 # IE-NEXT:    blr
 # LE-LABEL: <IETwoVal>:
 # LE-NEXT:    paddi 3, 13, -28672, 0
 # LE-NEXT:    paddi 4, 13, -28668, 0
 # LE-NEXT:    lwz 3, 0(3)
 # LE-NEXT:    lwz 4, 0(4)
 # LE-NEXT:    blr
 .section .text_twoval, "ax", %progbits
 IETwoVal:
   pld 3, x@got@tprel@pcrel(0), 1
   pld 4, y@got@tprel@pcrel(0), 1
   lwzx 3, 3, x@tls@pcrel
   lwzx 4, 4, y@tls@pcrel
   blr
 
 # IE-LABEL: <IEIncrementVal>:
-# IE-NEXT:    pld 4, 224(0), 1
+# IE-NEXT:    pld 4, 232(0), 1
 # IE-NEXT:    lwzx 3, 4, 13
 # IE-NEXT:    stwx 3, 4, 13
 # IE-NEXT:    blr
 # LE-LABEL: <IEIncrementVal>:
 # LE-NEXT:    paddi 4, 13, -28668, 0
 # LE-NEXT:    lwz 3, 0(4)
 # LE-NEXT:    stw 3, 0(4)
 # LE-NEXT:    blr
 .section .text_incrval, "ax", %progbits
 IEIncrementVal:
   pld 4, y@got@tprel@pcrel(0), 1
   lwzx 3, 4, y@tls@pcrel
   stwx 3, 4, y@tls@pcrel
   blr