<div dir="ltr">Thanks!</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 14, 2016 at 11:41 PM, David Majnemer via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Tue Mar 15 01:41:02 2016<br>
New Revision: 263539<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=263539&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=263539&view=rev</a><br>
Log:<br>
[COFF] Use the correct size of the TLS directory<br>
<br>
The TLS directory has a different layout depending on the bitness of the<br>
machine the image will run on.  LLD would always use the 64-bit TLS<br>
directory for the data directory entry instead of an appropriately sized<br>
TLS directory.<br>
<br>
Modified:<br>
    lld/trunk/COFF/Writer.cpp<br>
    lld/trunk/test/COFF/tls32.test<br>
<br>
Modified: lld/trunk/COFF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Writer.cpp?rev=263539&r1=263538&r2=263539&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Writer.cpp?rev=263539&r1=263538&r2=263539&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/COFF/Writer.cpp (original)<br>
+++ lld/trunk/COFF/Writer.cpp Tue Mar 15 01:41:02 2016<br>
@@ -596,7 +596,9 @@ template <typename PEHeaderTy> void Writ<br>
   if (Symbol *Sym = Symtab->findUnderscore("_tls_used")) {<br>
     if (Defined *B = dyn_cast<Defined>(Sym->Body)) {<br>
       Dir[TLS_TABLE].RelativeVirtualAddress = B->getRVA();<br>
-      Dir[TLS_TABLE].Size = 40;<br>
+      Dir[TLS_TABLE].Size = Config->is64()<br>
+                                ? sizeof(object::coff_tls_directory64)<br>
+                                : sizeof(object::coff_tls_directory32);<br>
     }<br>
   }<br>
   if (Symbol *Sym = Symtab->findUnderscore("_load_config_used")) {<br>
<br>
Modified: lld/trunk/test/COFF/tls32.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/tls32.test?rev=263539&r1=263538&r2=263539&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/tls32.test?rev=263539&r1=263538&r2=263539&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/COFF/tls32.test (original)<br>
+++ lld/trunk/test/COFF/tls32.test Tue Mar 15 01:41:02 2016<br>
@@ -3,7 +3,7 @@<br>
 # RUN: llvm-readobj -file-headers %t.exe | FileCheck %s<br>
<br>
 # CHECK: TLSTableRVA: 0x1000<br>
-# CHECK: TLSTableSize: 0x28<br>
+# CHECK: TLSTableSize: 0x18<br>
<br>
 ---<br>
 header:<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>