intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-06 06:31:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

[RuntimeDyld][ELF] Fixed relocations referencing undefined TLS symbols

Browse Source 
The classification of TLS symbols in ELF was changed from ST_Data to
ST_Other in the following commit:
018a484cd2

RuntimeDyldELF::processRelocationRef() needs to be updated to also
handle ST_Other symbols so that it handles TLS relocations correctly.
The current tests did not fail because we have a shortcut for global
symbols that are already defined.

Differential Revision: https://reviews.llvm.org/D143568
This commit is contained in:
Moritz Sichert
2023-02-08 11:47:32 +01:00
parent e1b5014119
commit cb19b83baa
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
View File

@@ -1282,6 +1282,7 @@ RuntimeDyldELF::processRelocationRef(
}
case SymbolRef::ST_Data:
case SymbolRef::ST_Function:
case SymbolRef::ST_Other:
case SymbolRef::ST_Unknown: {
Value.SymbolName = TargetName.data();
Value.Addend = Addend;

40
llvm/test/ExecutionEngine/RuntimeDyld/X86/TLS.s
View File

@@ -1,8 +1,11 @@
# REQUIRES: x86_64-linux
# RUN: rm -rf %t && mkdir -p %t
# RUN: llvm-mc -triple=x86_64-unknown-linux -filetype=obj -o %t/tls.o %s
# RUN: llvm-rtdyld -triple=x86_64-unknown-linux -execute %t/tls.o
# RUN: split-file %s %t
# RUN: llvm-mc -triple=x86_64-unknown-linux -filetype=obj -o %t/test_runner.o %t/test_runner.s
# RUN: llvm-mc -triple=x86_64-unknown-linux -filetype=obj -o %t/external_tls.o %t/external_tls.s
# RUN: llvm-rtdyld -triple=x86_64-unknown-linux -execute %t/test_runner.o %t/external_tls.o
#--- test_runner.s
_main:
@@ -130,6 +133,28 @@ _main:
jmp 2f
1:
# External TLS variable, Local Exec TLS Model (small code model)
mov %fs:external_tls_var@tpoff, %eax
cmp $0x56, %eax
je 1f
mov $12, %eax
jmp 2f
1:
# External TLS variable, Global Dynamic TLS Model (small code model)
.byte 0x66
leaq external_tls_var@tlsgd(%rip), %rdi
.byte 0x66, 0x66, 0x48
call __tls_get_addr@plt
mov (%rax), %eax
cmp $0x56, %eax
je 1f
mov $13, %eax
jmp 2f
1:
# Return 0 if all tests are successful
xor %eax, %eax
2:
@@ -152,3 +177,14 @@ tls_foo:
.align 4
tls_bar:
.long 0x34
#--- external_tls.s
.section .tdata, "awT", @progbits
.global external_tls_var
.type external_tls_var, @object
.size external_tls_var, 4
.align 4
external_tls_var:
.long 0x56