This is an archive of the discontinued LLVM Phabricator instance.

Differential D38623

[ELF] - Improve "has non-ABS reloc" error.
ClosedPublic

Authored by grimar on Oct 6 2017, 6:32 AM.

Details

Reviewers
ruiu
• rafael
Commits
rG7e9c5610c9be: [ELF] - Improve "has non-ABS reloc" error.
rLLD315280: [ELF] - Improve "has non-ABS reloc" error.
rL315280: [ELF] - Improve "has non-ABS reloc" error.
Summary

It did not contain information about relocation type and symbol.
Relative to PR34852.

Diff Detail

Repository
rL LLVM

Event Timeline

grimar created this revision.Oct 6 2017, 6:32 AM
Herald added a subscriber: emaste. · View Herald TranscriptOct 6 2017, 6:32 AM
ruiu added inline comments.Oct 6 2017, 12:30 PM
ELF/InputSection.cpp
687 ↗(On Diff #117987)

I don't think you need lld::.

ruiu accepted this revision.Oct 6 2017, 12:33 PM

With that fix, LGTM

This revision is now accepted and ready to land.Oct 6 2017, 12:33 PM
Closed by commit rL315280: [ELF] - Improve "has non-ABS reloc" error. (authored by grimar). · Explain WhyOct 10 2017, 12:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
3 lines
test/
ELF/
2 lines

Diff 118324

lld/trunk/ELF/InputSection.cpp

Show First 20 Lines • Show All 679 Lines • ▼ Show 20 Lines for (const RelTy &Rel : Rels) {
if (!RelTy::IsRela) if (!RelTy::IsRela)
Addend += Target->getImplicitAddend(BufLoc, Type); Addend += Target->getImplicitAddend(BufLoc, Type);
SymbolBody &Sym = this->getFile<ELFT>()->getRelocTargetSym(Rel); SymbolBody &Sym = this->getFile<ELFT>()->getRelocTargetSym(Rel);
RelExpr Expr = Target->getRelExpr(Type, Sym, *File, BufLoc); RelExpr Expr = Target->getRelExpr(Type, Sym, *File, BufLoc);
if (Expr == R_NONE) if (Expr == R_NONE)
continue; continue;
if (Expr != R_ABS) { if (Expr != R_ABS) {
error(this->getLocation<ELFT>(Offset) + ": has non-ABS reloc"); error(this->getLocation<ELFT>(Offset) + ": has non-ABS relocation " +
toString(Type) + " against symbol '" + toString(Sym) + "'");
return; return;
} }
if (Sym.isTls() && !Out::TlsPhdr) if (Sym.isTls() && !Out::TlsPhdr)
Target->relocateOne(BufLoc, Type, 0); Target->relocateOne(BufLoc, Type, 0);
else else
Target->relocateOne(BufLoc, Type, SignExtend64<Bits>(Sym.getVA(Addend))); Target->relocateOne(BufLoc, Type, SignExtend64<Bits>(Sym.getVA(Addend)));
} }
▲ Show 20 Lines • Show All 355 Lines • Show Last 20 Lines

lld/trunk/test/ELF/non-abs-reloc.s

// REQUIRES: x86 // REQUIRES: x86
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
// RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s // RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s
// CHECK: {{.*}}:(.dummy+0x0): has non-ABS reloc // CHECK: {{.*}}:(.dummy+0x0): has non-ABS relocation R_X86_64_GOTPCREL against symbol 'foo'
.globl _start .globl _start
_start: _start:
nop nop
.section .dummy .section .dummy
.long foo@gotpcrel .long foo@gotpcrel