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

[ELF] Reset verdefIndex for Defined preempting SharedSymbol 

to avoid spurious "attempt to reassign symbol '...'" warning after
7a58dd1046
This commit is contained in:
Fangrui Song 2022-09-29 21:26:53 -07:00
parent 565f4eb8e6
commit ab11ed5249
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lld/ELF/Relocations.cpp
View File

@ -301,6 +301,7 @@ static void replaceWithDefined(Symbol &sym, SectionBase &sec, uint64_t value,
size, &sec)
.overwrite(sym);
sym.verdefIndex = old.verdefIndex;
sym.exportDynamic = true;
sym.isUsedInRegularObj = true;
// A copy relocated alias may need a GOT entry.

1
lld/ELF/Symbols.h
View File

@ -344,6 +344,7 @@ public:
}
void overwrite(Symbol &sym) const {
Symbol::overwrite(sym, DefinedKind);
sym.verdefIndex = -1;
auto &s = static_cast<Defined &>(sym);
s.value = value;
s.size = size;

22
lld/test/ELF/verdef-defaultver.s
View File

@ -1,5 +1,6 @@
# REQUIRES: x86
# RUN: rm -rf %t && split-file %s %t && cd %t
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/verdef-defaultver.s -o %t1
# RUN: echo "V1 { global: a; b; local: *; };" > %t.script
# RUN: echo "V2 { global: b; c; } V1;" >> %t.script
@ -107,9 +108,9 @@
# DSO-NEXT: ]
## Check that we can link against DSO produced.
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2
# RUN: ld.lld --hash-style=sysv %t2 %t.so -o %t3
# RUN: llvm-readobj -V --dyn-syms %t3 | FileCheck --check-prefix=EXE %s
# RUN: llvm-mc -filetype=obj -triple=x86_64 a.s -o a.o
# RUN: ld.lld --hash-style=sysv a.o %t.so -o a
# RUN: llvm-readobj -V --dyn-syms a | FileCheck --check-prefix=EXE %s
# EXE: DynamicSymbols [
# EXE-NEXT: Symbol {
@ -193,8 +194,23 @@
# EXE-NEXT: }
# EXE-NEXT: ]
# RUN: llvm-mc -filetype=obj -triple=x86_64 b.s -o b.o
# RUN: ld.lld -shared --version-script=%t.script --fatal-warnings %t.so b.o -o b.so
# RUN: llvm-readelf --dyn-syms b.so | FileCheck %s --check-prefix=PREEMPT
# RUN: ld.lld -shared --version-script=%t.script --fatal-warnings b.o %t.so -o b.so
# RUN: llvm-readelf --dyn-syms b.so | FileCheck %s --check-prefix=PREEMPT
# PREEMPT-DAG: a@@V1
# PREEMPT-DAG: c@@V2
#--- a.s
.globl _start
_start:
.long a - .
.long b - .
.long c - .
#--- b.s
.globl a, c
a:
c: