Index: lld/trunk/ELF/InputFiles.cpp
===================================================================
--- lld/trunk/ELF/InputFiles.cpp
+++ lld/trunk/ELF/InputFiles.cpp
@@ -465,6 +465,7 @@
     } else {
       Body = new (Alloc) DefinedBitcode(NameRef, IsWeak, Visibility);
     }
+    Body->IsTls = GV->isThreadLocal();
     SymbolBodies.push_back(Body);
   }
 }
Index: lld/trunk/test/ELF/lto/Inputs/tls-mixed.s
===================================================================
--- lld/trunk/test/ELF/lto/Inputs/tls-mixed.s
+++ lld/trunk/test/ELF/lto/Inputs/tls-mixed.s
@@ -0,0 +1,4 @@
+.globl foo
+.section .tbss,"awT",@nobits
+foo:
+.long 0
Index: lld/trunk/test/ELF/lto/tls-mixed.ll
===================================================================
--- lld/trunk/test/ELF/lto/tls-mixed.ll
+++ lld/trunk/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