replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF] GotSection increment NumEntries when Target saves GlobalOffsetTable in the .got 

When the target saves ElfSym::GlobalOffsetTable in the .got rather than
.got.plt, Target->GotHeaderEntriesNum states the number of extra entries
required in the .got. Rather than having to add Target->GotHeaderEntriesNum to
NumEntries in every function which refers to NumEntries, this patch changes the
initial value of NumEntries in the constructor.

Differential Revision: https://reviews.llvm.org/D44744

llvm-svn: 328559
This commit is contained in:
Zaara Syeda 2018-03-26 17:50:52 +00:00
parent be0afb0870
commit c65ae14766
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/ELF/SyntheticSections.cpp
View File

@ -587,10 +587,18 @@ void EhFrameSection::writeTo(uint8_t *Buf) {
GotSection::GotSection()
: SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS,
Target->GotEntrySize, ".got") {}
Target->GotEntrySize, ".got") {
// PPC64 saves the ElfSym::GlobalOffsetTable .TOC. as the first entry in the
// .got. If there are no references to .TOC. in the symbol table,
// ElfSym::GlobalOffsetTable will not be defined and we won't need to save
// .TOC. in the .got. When it is defined, we increase NumEntries by the number
// of entries used to emit ElfSym::GlobalOffsetTable.
if (ElfSym::GlobalOffsetTable && !Target->GotBaseSymInGotPlt)
NumEntries += Target->GotHeaderEntriesNum;
}
void GotSection::addEntry(Symbol &Sym) {
Sym.GotIndex = Target->GotHeaderEntriesNum + NumEntries;
Sym.GotIndex = NumEntries;
++NumEntries;
}
@ -622,7 +630,7 @@ uint64_t GotSection::getGlobalDynOffset(const Symbol &B) const {
}
void GotSection::finalizeContents() {
Size = (NumEntries + Target->GotHeaderEntriesNum) * Config->Wordsize;
Size = NumEntries * Config->Wordsize;
}
bool GotSection::empty() const {

5
lld/test/ELF/ppc64_entry_point.s
View File

@ -1,7 +1,7 @@
# REQUIRES: ppc
# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
# RUN: ld.lld %t -o %t2
# RUN: llvm-objdump -d %t2 | FileCheck %s
# RUN: llvm-objdump -D %t2 | FileCheck %s
.text
.abiversion 2
@ -31,3 +31,6 @@ _start:
// CHECK-NEXT: 10010004: 00 00 84 38 addi 4, 4, 0
// CHECK-NEXT: 10010008: 02 00 a0 3c lis 5, 2
// CHECK-NEXT: 1001000c: 00 80 a5 38 addi 5, 5, -32768
// CHECK: Disassembly of section .got:
// CHECK-NEXT: .got:
// CHECK-NEXT: 10020000: 00 80 02 10