maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Improve error reporting for relocations 

We should always include symbol name when reporting relocations
error to simplify debugging of these issues. Without symbol names
users have to manually investigate which of the libraries contain
invalid relocations which can be cumbersome when linking multiple
libraries.

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

llvm-svn: 279162
This commit is contained in:
Petr Hosek 2016-08-18 21:55:23 +00:00
parent e77a0a9a3b
commit 4071b1bac3
14 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lld/ELF/Relocations.cpp
View File

@ -374,7 +374,7 @@ template <class ELFT> static void addCopyRelSymbol(SharedSymbol<ELFT> *SS) {
// Copy relocation against zero-sized symbol doesn't make sense.
uintX_t SymSize = SS->template getSize<ELFT>();
if (SymSize == 0)
fatal("cannot create a copy relocation for " + SS->getName());
fatal("cannot create a copy relocation for symbol " + SS->getName());
uintX_t Alignment = getAlignment(SS);
uintX_t Off = alignTo(Out<ELFT>::Bss->getSize(), Alignment);
@ -400,6 +400,12 @@ template <class ELFT> static void addCopyRelSymbol(SharedSymbol<ELFT> *SS) {
{Target->CopyRel, Out<ELFT>::Bss, SS->OffsetInBss, false, SS, 0});
}
template <class ELFT>
static StringRef getLocalSymbolName(const elf::ObjectFile<ELFT> &File,
SymbolBody &Body) {
return File.getStringTable().data() + Body.getNameOffset();
}
template <class ELFT>
static RelExpr adjustExpr(const elf::ObjectFile<ELFT> &File, SymbolBody &Body,
bool IsWrite, RelExpr Expr, uint32_t Type,
@ -422,12 +428,14 @@ static RelExpr adjustExpr(const elf::ObjectFile<ELFT> &File, SymbolBody &Body,
// only memory. We can hack around it if we are producing an executable and
// the refered symbol can be preemepted to refer to the executable.
if (Config->Shared || (Config->Pic && !isRelExpr(Expr))) {
StringRef Name = Body.isLocal() ? getLocalSymbolName(File, Body)
: Body.getName();
error("can't create dynamic relocation " + getRelName(Type) +
" against readonly segment");
" against symbol " + Name);
return Expr;
}
if (Body.getVisibility() != STV_DEFAULT) {
error("cannot preempt symbol");
error("cannot preempt symbol " + Body.getName());
return Expr;
}
if (Body.isObject()) {
@ -461,7 +469,7 @@ static RelExpr adjustExpr(const elf::ObjectFile<ELFT> &File, SymbolBody &Body,
Body.NeedsCopyOrPltAddr = true;
return toPlt(Expr);
}
error("symbol is missing type");
error("symbol " + Body.getName() + " is missing type");
return Expr;
}

2
lld/test/ELF/aarch64-fpic-add_abs_lo12_nc.s
View File

@ -1,7 +1,7 @@
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
// RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_AARCH64_ADD_ABS_LO12_NC against readonly segment
// CHECK: can't create dynamic relocation R_AARCH64_ADD_ABS_LO12_NC against symbol dat
add x0, x0, :lo12:dat
.data

2
lld/test/ELF/aarch64-fpic-adr_prel_lo21.s
View File

@ -1,7 +1,7 @@
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
// RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_LO21 against readonly segment
// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_LO21 against symbol dat
adr x0, dat
.data

2
lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
View File

@ -1,7 +1,7 @@
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
// RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_PG_HI21 against readonly segment
// CHECK: can't create dynamic relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol dat
adrp x0, dat
.data

2
lld/test/ELF/aarch64-fpic-ldst32_abs_lo12_nc.s
View File

@ -1,7 +1,7 @@
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
// RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_AARCH64_LDST32_ABS_LO12_NC against readonly segment
// CHECK: can't create dynamic relocation R_AARCH64_LDST32_ABS_LO12_NC against symbol dat
ldr s4, [x0, :lo12:dat]
.data

2
lld/test/ELF/aarch64-fpic-ldst64_abs_lo12_nc.s
View File

@ -1,7 +1,7 @@
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
// RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_AARCH64_LDST64_ABS_LO12_NC against readonly segment
// CHECK: can't create dynamic relocation R_AARCH64_LDST64_ABS_LO12_NC against symbol dat
ldr x0, [x0, :lo12:dat]
.data

2
lld/test/ELF/aarch64-fpic-ldst8_abs_lo12_nc.s
View File

@ -1,7 +1,7 @@
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-none-freebsd %s -o %t.o
// RUN: not ld.lld -shared %t.o -o %t.so 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_AARCH64_LDST8_ABS_LO12_NC against readonly segment
// CHECK: can't create dynamic relocation R_AARCH64_LDST8_ABS_LO12_NC against symbol dat
ldrsb x0, [x1, :lo12:dat]
.data

2
lld/test/ELF/arm-target1.s
View File

@ -23,4 +23,4 @@
// RELATIVE: SYMBOL TABLE:
// RELATIVE: 00001004 .text 00000000 patatino
// ABS: can't create dynamic relocation R_ARM_TARGET1 against readonly segment
// ABS: can't create dynamic relocation R_ARM_TARGET1 against symbol patatino

4
lld/test/ELF/copy-errors.s
View File

@ -9,7 +9,7 @@ _start:
call bar
// CHECK: cannot preempt symbol
// CHECK: cannot preempt symbol bar
call zed
// CHECK: symbol is missing type
// CHECK: symbol zed is missing type

2
lld/test/ELF/copy-in-shared.s
View File

@ -7,4 +7,4 @@
.quad foo
// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
// CHECK: can't create dynamic relocation R_X86_64_64 against symbol foo

2
lld/test/ELF/copy-rel-corrupted.s
View File

@ -3,7 +3,7 @@
// RUN: ld.lld %t2.o -o %t2.so -shared
// RUN: not ld.lld %t.o %t2.so -o %t.exe 2>&1 | FileCheck %s
// CHECK: cannot create a copy relocation for x
// CHECK: cannot create a copy relocation for symbol x
.global _start
_start:

4
lld/test/ELF/copy-rel-pie-error.s
View File

@ -3,8 +3,8 @@
// RUN: ld.lld %t2.o -o %t2.so -shared
// RUN: not ld.lld %t.o %t2.so -o %t.exe -pie 2>&1 | FileCheck %s
// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
// CHECK: can't create dynamic relocation R_X86_64_64 against symbol bar
// CHECK: can't create dynamic relocation R_X86_64_64 against symbol foo
.global _start
_start:

2
lld/test/ELF/dynamic-reloc-in-ro.s
View File

@ -5,4 +5,4 @@
foo:
.quad foo
// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
// CHECK: can't create dynamic relocation R_X86_64_64 against symbol

2
lld/test/ELF/eh-frame-dyn-rel.s
View File

@ -7,4 +7,4 @@
.cfi_personality 0x8c, foo
.cfi_endproc
// CHECK: can't create dynamic relocation R_X86_64_64 against readonly segment
// CHECK: can't create dynamic relocation R_X86_64_64 against symbol foo