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

[LLD][ELF] - Report a location for symbols from the linker script when reporting an error. 

When we report an error for symbols defined in the linker script,
we do not report the location properly.

For example:

ld.lld: error: relocation R_AARCH64_CALL26 cannot refer to absolute symbol: aliasto__text
>>> defined in <internal>
>>> referenced by rtoabs.o:(.text+0x4)

This patch fixes that.

Differential revision: https://reviews.llvm.org/D55360

llvm-svn: 349612
This commit is contained in:
George Rimar 2018-12-19 10:19:40 +00:00
parent c521ac3a44
commit 751e6e1cf5
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lld/ELF/Relocations.cpp
View File

@ -66,6 +66,14 @@ using namespace llvm::support::endian;
using namespace lld;
using namespace lld::elf;
static Optional<std::string> getLinkerScriptLocation(const Symbol &Sym) {
for (BaseCommand *Base : Script->SectionCommands)
if (auto *Cmd = dyn_cast<SymbolAssignment>(Base))
if (Cmd->Sym == &Sym)
return Cmd->Location;
return None;
}
// Construct a message in the following format.
//
// >>> defined in /home/alice/src/foo.o
@ -73,8 +81,13 @@ using namespace lld::elf;
// >>> /home/alice/src/bar.o:(.text+0x1)
static std::string getLocation(InputSectionBase &S, const Symbol &Sym,
uint64_t Off) {
std::string Msg =
"\n>>> defined in " + toString(Sym.File) + "\n>>> referenced by ";
std::string Msg = "\n>>> defined in ";
if (Sym.File)
Msg += toString(Sym.File);
else if (Optional<std::string> Loc = getLinkerScriptLocation(Sym))
Msg += *Loc;
Msg += "\n>>> referenced by ";
std::string Src = S.getSrcMsg(Sym, Off);
if (!Src.empty())
Msg += Src + "\n>>> ";

15
lld/test/ELF/linkerscript/symbol-location.s Normal file
View File

@ -0,0 +1,15 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
# RUN: echo "foo = 1;" > %t.script
# RUN: not ld.lld -pie -o %t --script %t.script %t.o 2>&1 | FileCheck %s
## Here we check that symbol 'foo' location is reported properly.
# CHECK: error: relocation R_X86_64_PLT32 cannot refer to absolute symbol: foo
# CHECK: >>> defined in {{.*}}.script:1
# CHECK: >>> referenced by {{.*}}.o:(.text+0x1)
.text
.globl _start
_start:
call foo@PLT