diff options
| -rw-r--r-- | lld/ELF/InputFiles.cpp | 1 | ||||
| -rw-r--r-- | lld/test/ELF/lto/Inputs/tls-mixed.s | 4 | ||||
| -rw-r--r-- | lld/test/ELF/lto/tls-mixed.ll | 10 |
3 files changed, 15 insertions, 0 deletions
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index 2986cb0d487..653ac781f3e 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -465,6 +465,7 @@ void BitcodeFile::parse(DenseSet<StringRef> &ComdatGroups) { } else { Body = new (Alloc) DefinedBitcode(NameRef, IsWeak, Visibility); } + Body->IsTls = GV->isThreadLocal(); SymbolBodies.push_back(Body); } } diff --git a/lld/test/ELF/lto/Inputs/tls-mixed.s b/lld/test/ELF/lto/Inputs/tls-mixed.s new file mode 100644 index 00000000000..b31ae3dd54d --- /dev/null +++ b/lld/test/ELF/lto/Inputs/tls-mixed.s @@ -0,0 +1,4 @@ +.globl foo +.section .tbss,"awT",@nobits +foo: +.long 0 diff --git a/lld/test/ELF/lto/tls-mixed.ll b/lld/test/ELF/lto/tls-mixed.ll new file mode 100644 index 00000000000..524bb4fb44a --- /dev/null +++ b/lld/test/ELF/lto/tls-mixed.ll @@ -0,0 +1,10 @@ +; REQUIRES: x86 +; RUN: llvm-as %s -o %t1.o +; RUN: llvm-mc %p/Inputs/tls-mixed.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux +; RUN: ld.lld -m elf_x86_64 %t1.o %t2.o -o %t.so -shared + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +; Should not encounter TLS-ness mismatch for @foo +@foo = external thread_local global i32, align 4 |
