This is an archive of the discontinued LLVM Phabricator instance.

Differential D43307

Fix an issue that lld drops symbol versions for -r.
ClosedPublic

Authored by ruiu on Feb 14 2018, 11:25 AM.

Details

Reviewers
• rafael
timshen
Commits
rG1092e490112b: Merging r325204: --------------------------------------------------------------…
rG44a8471227a3: Fix an issue that lld drops symbol versions for -r.
rL325502: Merging r325204:
rLLD325204: Fix an issue that lld drops symbol versions for -r.
rL325204: Fix an issue that lld drops symbol versions for -r.
Summary

When we are emitting a relocatable output, we should keep the original
symbol name including "@" part. Previously, we drop that part unconditionally
which resulted in dropping versions from symbols.

Diff Detail

Repository
rL LLVM

Event Timeline

ruiu created this revision.Feb 14 2018, 11:25 AM
Harbormaster completed remote builds in B14982: Diff 134274.Feb 14 2018, 11:25 AM
Herald added subscribers: arichardson, emaste. · View Herald TranscriptFeb 14 2018, 11:25 AM
This revision was not accepted when it landed; it landed in state Needs Review.Feb 14 2018, 6:44 PM
Closed by commit rL325204: Fix an issue that lld drops symbol versions for -r. (authored by ruiu). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay mentioned this in D82433: [ELF] -r: don't parse @ (symbol versioning) for .symver inline asm in bitcode.Jun 23 2020, 10:42 PM
MaskRay mentioned this in rG4542c18ef295: [ELF] -r: don't parse @ (symbol versioning) for .symver inline asm in bitcode.Jun 24 2020, 8:38 AM

Revision Contents

PathSize
lld/
trunk/
ELF/
7 lines
test/
ELF/
9 lines

Diff 134357

lld/trunk/ELF/Driver.cpp

Show First 20 Lines • Show All 1,098 Lines • ▼ Show 20 Linestemplate <class ELFT> void LinkerDriver::link(opt::InputArgList &Args) {
if (!Config->Relocatable) if (!Config->Relocatable)
addReservedSymbols(); addReservedSymbols();
// We want to declare linker script's symbols early, // We want to declare linker script's symbols early,
// so that we can version them. // so that we can version them.
Script->declareSymbols(); Script->declareSymbols();
// Apply version scripts. // Apply version scripts.
//
// For a relocatable output, version scripts don't make sense, and
// parsing a symbol version string (e.g. dropping "@ver1" from a symbol
// name "foo@ver1") rather do harm, so we don't call this if -r is given.
if (!Config->Relocatable)
Symtab->scanVersionScript(); Symtab->scanVersionScript();
// Create wrapped symbols for -wrap option. // Create wrapped symbols for -wrap option.
for (auto *Arg : Args.filtered(OPT_wrap)) for (auto *Arg : Args.filtered(OPT_wrap))
Symtab->addSymbolWrap<ELFT>(Arg->getValue()); Symtab->addSymbolWrap<ELFT>(Arg->getValue());
Symtab->addCombinedLTOObject<ELFT>(); Symtab->addCombinedLTOObject<ELFT>();
if (errorCount()) if (errorCount())
return; return;
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines

lld/trunk/test/ELF/relocatable-versioned.s

# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
# RUN: ld.lld -o %t2.o -r %t1.o
# RUN: llvm-nm %t2.o | FileCheck %s
# CHECK: foo@VERSION
.global "foo@VERSION"
"foo@VERSION":
ret