diff --git a/lld/ELF/Arch/X86_64.cpp b/lld/ELF/Arch/X86_64.cpp --- a/lld/ELF/Arch/X86_64.cpp +++ b/lld/ELF/Arch/X86_64.cpp @@ -85,6 +85,7 @@ tlsGotRel = R_X86_64_TPOFF64; tlsModuleIndexRel = R_X86_64_DTPMOD64; tlsOffsetRel = R_X86_64_DTPOFF64; + gotEntrySize = 8; pltHeaderSize = 16; pltEntrySize = 16; ipltEntrySize = 16; diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp --- a/lld/ELF/Symbols.cpp +++ b/lld/ELF/Symbols.cpp @@ -160,7 +160,9 @@ return in.got->getVA() + getGotOffset(); } -uint64_t Symbol::getGotOffset() const { return gotIndex * config->wordsize; } +uint64_t Symbol::getGotOffset() const { + return gotIndex * target->gotEntrySize; +} uint64_t Symbol::getGotPltVA() const { if (isInIplt) @@ -170,8 +172,8 @@ uint64_t Symbol::getGotPltOffset() const { if (isInIplt) - return pltIndex * config->wordsize; - return (pltIndex + target->gotPltHeaderEntriesNum) * config->wordsize; + return pltIndex * target->gotEntrySize; + return (pltIndex + target->gotPltHeaderEntriesNum) * target->gotEntrySize; } uint64_t Symbol::getPltVA() const { diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp --- a/lld/ELF/SyntheticSections.cpp +++ b/lld/ELF/SyntheticSections.cpp @@ -644,8 +644,8 @@ } GotSection::GotSection() - : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, config->wordsize, - ".got") { + : SyntheticSection(SHF_ALLOC | SHF_WRITE, SHT_PROGBITS, + target->gotEntrySize, ".got") { numEntries = target->gotHeaderEntriesNum; } @@ -1145,15 +1145,16 @@ } size_t GotPltSection::getSize() const { - return (target->gotPltHeaderEntriesNum + entries.size()) * config->wordsize; + return (target->gotPltHeaderEntriesNum + entries.size()) * + target->gotEntrySize; } void GotPltSection::writeTo(uint8_t *buf) { target->writeGotPltHeader(buf); - buf += target->gotPltHeaderEntriesNum * config->wordsize; + buf += target->gotPltHeaderEntriesNum * target->gotEntrySize; for (const Symbol *b : entries) { target->writeGotPlt(buf, *b); - buf += config->wordsize; + buf += target->gotEntrySize; } } @@ -1181,7 +1182,7 @@ IgotPltSection::IgotPltSection() : SyntheticSection(SHF_ALLOC | SHF_WRITE, config->emachine == EM_PPC64 ? SHT_NOBITS : SHT_PROGBITS, - config->wordsize, getIgotPltName()) {} + target->gotEntrySize, getIgotPltName()) {} void IgotPltSection::addEntry(Symbol &sym) { assert(sym.pltIndex == entries.size()); @@ -1189,13 +1190,13 @@ } size_t IgotPltSection::getSize() const { - return entries.size() * config->wordsize; + return entries.size() * target->gotEntrySize; } void IgotPltSection::writeTo(uint8_t *buf) { for (const Symbol *b : entries) { target->writeIgotPlt(buf, *b); - buf += config->wordsize; + buf += target->gotEntrySize; } } diff --git a/lld/ELF/Target.h b/lld/ELF/Target.h --- a/lld/ELF/Target.h +++ b/lld/ELF/Target.h @@ -122,6 +122,7 @@ RelType tlsGotRel; RelType tlsModuleIndexRel; RelType tlsOffsetRel; + unsigned gotEntrySize = config->wordsize; unsigned pltEntrySize; unsigned pltHeaderSize; unsigned ipltEntrySize; diff --git a/lld/test/ELF/x86-x32-plt.s b/lld/test/ELF/x86-x32-plt.s new file mode 100644 --- /dev/null +++ b/lld/test/ELF/x86-x32-plt.s @@ -0,0 +1,80 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64--gnux32 %s -o %t.o +# RUN: llvm-mc -filetype=obj -triple=x86_64--gnux32 %p/Inputs/shared.s -o %t2.o +# RUN: ld.lld -shared -soname=t2 %t2.o -o %t2.so + +# RUN: ld.lld %t.o %t2.so -o %t +# RUN: ld.lld -shared %t.o %t2.so -o %t.so +# RUN: llvm-readelf -S -r %t | FileCheck %s --check-prefix=CHECK1 +# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s --check-prefixes=DISASM,DISASM1 +# RUN: llvm-readelf -S -r %t.so | FileCheck %s --check-prefix=CHECK2 +# RUN: llvm-objdump -d --no-show-raw-insn %t.so | FileCheck %s --check-prefixes=DISASM,DISASM2 + +# CHECK1: Name Type Address Off Size ES Flg Lk Inf Al +# CHECK1: .plt PROGBITS 002011e0 0001e0 000030 00 AX 0 0 16 +# CHECK1: .got.plt PROGBITS 00203278 000278 000028 00 WA 0 0 8 +# CHECK1: Relocation section '.rela.plt' at offset {{.*}} contains 2 entries: +# CHECK1: 00203290 {{.*}} R_X86_64_JUMP_SLOT 00000000 bar + 0 +# CHECK1-NEXT: 00203298 {{.*}} R_X86_64_JUMP_SLOT 00000000 weak + 0 + +# CHECK2: Name Type Address Off Size ES Flg Lk Inf Al +# CHECK2: .plt PROGBITS 00001200 000200 000030 00 AX 0 0 16 +# CHECK2: .got.plt PROGBITS 00003290 000290 000028 00 WA 0 0 8 +# CHECK2: Relocation section '.rela.plt' at offset {{.*}} contains 2 entries: +# CHECK2: 000032a8 {{.*}} R_X86_64_JUMP_SLOT 00000000 bar + 0 +# CHECK2-NEXT: 000032b0 {{.*}} R_X86_64_JUMP_SLOT 00000000 weak + 0 + +# DISASM: <_start>: +# DISASM-NEXT: callq {{.*}} +# DISASM-NEXT: callq {{.*}} +# DISASM-NEXT: jmp {{.*}} +# DISASM-NEXT: jmp {{.*}} + +# DISASM1: Disassembly of section .plt: +# DISASM1-EMPTY: +# DISASM1-NEXT: <.plt>: +# DISASM1-NEXT: 2011e0: pushq 8346(%rip) # 203280 +# DISASM1-NEXT: jmpq *8348(%rip) # 203288 +# DISASM1-NEXT: nopl (%rax) +# DISASM1-EMPTY: +# DISASM1-NEXT: : +# DISASM1-NEXT: 2011f0: jmpq *8346(%rip) # 203290 +# DISASM1-NEXT: pushq $0 +# DISASM1-NEXT: jmp 0x2011e0 <.plt> +# DISASM1-EMPTY: +# DISASM1-NEXT: : +# DISASM1-NEXT: 201200: jmpq *8338(%rip) # 203298 +# DISASM1-NEXT: pushq $1 +# DISASM1-NEXT: jmp 0x2011e0 <.plt> +# DISASM1-NOT: {{.}} + +# DISASM2: Disassembly of section .plt: +# DISASM2-EMPTY: +# DISASM2-NEXT: <.plt>: +# DISASM2-NEXT: 1200: pushq 8338(%rip) # 3298 +# DISASM2-NEXT: jmpq *8340(%rip) # 32a0 +# DISASM2-NEXT: nopl (%rax) +# DISASM2-EMPTY: +# DISASM2-NEXT: : +# DISASM2-NEXT: 1210: jmpq *8338(%rip) # 32a8 +# DISASM2-NEXT: pushq $0 +# DISASM2-NEXT: jmp 0x1200 <.plt> +# DISASM2-EMPTY: +# DISASM2-NEXT: : +# DISASM2-NEXT: 1220: jmpq *8330(%rip) # 32b0 +# DISASM2-NEXT: pushq $1 +# DISASM2-NEXT: jmp 0x1200 <.plt> +# DISASM2-NOT: {{.}} + +.global _start +.weak weak + +_start: + call local + call bar + jmp bar@plt + jmp weak + +## foo is local and non-preemptale, no PLT is generated. +local: + ret