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

[ELF] - Fix handling of weak symbols from static library when using version script. 

When version script was used, binding opf undefined weak symbols sometimes
was calculated as STB_LOCAL, making them non-preemtible what
broke correct relocations handling logic for them.

Fixes PR33738.

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

llvm-svn: 307767
This commit is contained in:
George Rimar 2017-07-12 11:09:46 +00:00
parent 995746da03
commit d92e1286ed
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/SymbolTable.cpp
View File

@ -325,7 +325,7 @@ static int compareDefined(Symbol *S, bool WasInserted, uint8_t Binding) {
if (WasInserted)
return 1;
SymbolBody *Body = S->body();
if (Body->isLazy() || !Body->isInCurrentDSO())
if (!Body->isInCurrentDSO())
return 1;
if (Binding == STB_WEAK)
return -1;

4
lld/ELF/Symbols.h
View File

@ -65,7 +65,9 @@ public:
return SymbolKind == LazyArchiveKind || SymbolKind == LazyObjectKind;
}
bool isShared() const { return SymbolKind == SharedKind; }
bool isInCurrentDSO() const { return !isUndefined() && !isShared(); }
bool isInCurrentDSO() const {
return !isUndefined() && !isShared() && !isLazy();
}
bool isLocal() const { return IsLocal; }
bool isPreemptible() const;
StringRef getName() const { return Name; }

4
lld/test/ELF/Inputs/version-script-weak.s Normal file
View File

@ -0,0 +1,4 @@
.text
.globl foo
.type foo,@function
foo:

28
lld/test/ELF/version-script-weak.s Normal file
View File

@ -0,0 +1,28 @@
# 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/Inputs/version-script-weak.s -o %tmp.o
# RUN: rm -f %t.a
# RUN: llvm-ar rcs %t.a %tmp.o
# RUN: echo "{ local: *; };" > %t.script
# RUN: ld.lld -shared --version-script %t.script %t.o %t.a -o %t.so
# RUN: llvm-readobj -dyn-symbols -r %t.so | FileCheck %s
# CHECK: Relocations [
# CHECK-NEXT: Section ({{.*}}) .rela.plt {
# CHECK-NEXT: 0x2018 R_X86_64_JUMP_SLOT foo
# CHECK-NEXT: }
# CHECK-NEXT: ]
# CHECK: Symbol {
# CHECK: Name: foo@
# CHECK-NEXT: Value: 0x0
# CHECK-NEXT: Size: 0
# CHECK-NEXT: Binding: Weak
# CHECK-NEXT: Type: None
# CHECK-NEXT: Other: 0
# CHECK-NEXT: Section: Undefined
# CHECK-NEXT: }
.text
callq foo@PLT
.weak foo