From 2810a0ab80695876b51209b535888df5dcf8ccbc Mon Sep 17 00:00:00 2001
From: Anton Korobeynikov <asl@math.spbu.ru>
Date: Mon, 18 Mar 2013 08:10:10 +0000
Subject: [PATCH] Windows TLS: Section name prefix to ensure correct order The
 linker sorts the .tls$<xyz> sections by name, and we need to make sure any
 extra sections we produce (e.g. for weak globals) always end up between
 .tls$AAA and .tls$ZZZ, even if the name starts with e.g. an underscore.

Patch by David Nadlinger!

llvm-svn: 177256
---
 llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 9a9ddc9..3bdca4c 100644
--- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -742,8 +742,11 @@ static const char *getCOFFSectionPrefixForUniqueGlobal(SectionKind Kind) {
     return ".text$";
   if (Kind.isBSS ())
     return ".bss$";
-  if (Kind.isThreadLocal())
-    return ".tls$";
+  if (Kind.isThreadLocal()) {
+    // 'LLVM' is just an arbitary string to ensure that the section name gets
+    // sorted in between '.tls$AAA' and '.tls$ZZZ' by the linker.
+    return ".tls$LLVM";
+  }
   if (Kind.isWriteable())
     return ".data$";
   return ".rdata$";
-- 
2.7.4