diff options
| author | Tom Stellard <tstellar@redhat.com> | 2018-10-22 17:44:17 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2018-10-22 17:44:17 +0000 |
| commit | b8dce5ad76c7822226f6dae9a8bc768bdb06e06d (patch) | |
| tree | 1318b7d5234839c29e06d2e39ed45519b812db8c | |
| parent | 8e5d7e5115218df3e12564e6491725c23b800f17 (diff) | |
| download | llvm-b8dce5ad76c7822226f6dae9a8bc768bdb06e06d.zip llvm-b8dce5ad76c7822226f6dae9a8bc768bdb06e06d.tar.gz llvm-b8dce5ad76c7822226f6dae9a8bc768bdb06e06d.tar.bz2 | |
Merging r343668:
------------------------------------------------------------------------
r343668 | grimar | 2018-10-03 02:33:00 -0700 (Wed, 03 Oct 2018) | 20 lines
[ELF] - Do not forget to include to .dymsym symbols that were converted to Defined.
This is the fix for
"Bug 39104 - LLD links incorrect ELF executable if version script contains "local: *;"
(https://bugs.llvm.org/show_bug.cgi?id=39104).
The issue happens when we have non-PIC program call to function in a shared library.
(for example, the PR above has R_X86_64_PC32 relocation against __libc_start_main)
LLD converts symbol to Defined in that case with the use of replaceWithDefined()
The issue is that after above we create a broken relocation because do not
include the symbol into .dynsym.
That happens when the version script is used because we treat the symbol as
STB_LOCAL if the following condition match:
VersionId == VER_NDX_LOCAL && isDefined() and do not include it to
.dynsym because of that. Patch fixes the issue.
Differential revision: https://reviews.llvm.org/D52724
------------------------------------------------------------------------
llvm-svn: 344925
| -rw-r--r-- | lld/ELF/Symbols.cpp | 2 | ||||
| -rw-r--r-- | lld/test/ELF/local-ver-preemptible.s | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/lld/ELF/Symbols.cpp b/lld/ELF/Symbols.cpp index 4243cb1..f312de7 100644 --- a/lld/ELF/Symbols.cpp +++ b/lld/ELF/Symbols.cpp @@ -209,7 +209,7 @@ uint8_t Symbol::computeBinding() const { return Binding; if (Visibility != STV_DEFAULT && Visibility != STV_PROTECTED) return STB_LOCAL; - if (VersionId == VER_NDX_LOCAL && isDefined()) + if (VersionId == VER_NDX_LOCAL && isDefined() && !IsPreemptible) return STB_LOCAL; if (!Config->GnuUnique && Binding == STB_GNU_UNIQUE) return STB_GLOBAL; diff --git a/lld/test/ELF/local-ver-preemptible.s b/lld/test/ELF/local-ver-preemptible.s new file mode 100644 index 0000000..bfba4e9 --- /dev/null +++ b/lld/test/ELF/local-ver-preemptible.s @@ -0,0 +1,21 @@ +# REQUIRES: x86 +# RUN: echo '.global foo; .type foo, @function; foo:' | \ +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.so.o +# RUN: ld.lld %t.so.o -o %t.so -shared + +# RUN: echo "{ global: main; local: *; };" > %t.script + +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o +# RUN: ld.lld %t.o %t.so -o %t -version-script %t.script +# RUN: llvm-readelf -r --symbols %t | FileCheck %s + +# CHECK: Relocation section '.rela.plt' at offset 0x290 contains 1 entries: +# CHECK: R_X86_64_JUMP_SLOT 0000000000201020 foo + 0 + +# CHECK: Symbol table '.dynsym' contains 2 entries: +# CHECK-NEXT: Num: Value Size Type Bind Vis Ndx Name +# CHECK-NEXT: 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND @ +# CHECK-NEXT: 1: 0000000000201020 0 FUNC GLOBAL DEFAULT UND foo@ + +_start: + movl $foo - ., %eax |