From 21fecf944107b7e6bb618f0176c8efae834402aa Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Tue, 17 Mar 2015 20:40:21 +0000
Subject: Revert "Address review comments"

This reverts commit r232540.  This was committed accidently.

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

(limited to 'llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp')

diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 10729cd81a5..5a8367eea77 100644
--- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -960,8 +960,13 @@ void TargetLoweringObjectFileCOFF::getNameWithPrefix(
       ((isa<Function>(GV) && TM.getFunctionSections()) ||
        (isa<GlobalVariable>(GV) && TM.getDataSections()))) {
     SmallString<256> Tmp;
-    Mang.getNameWithPrefix(Tmp, GV, CannotUsePrivateLabel, /*ForceNonPrivate=*/true);
-    OutName.append(Tmp.begin(), Tmp.end());
+    Mang.getNameWithPrefix(Tmp, GV, /*CannotUsePrivateLabel=*/false);
+    if (Tmp.startswith(".L"))
+      OutName.append(Tmp.begin() + 2, Tmp.end());
+    else if (Tmp.startswith("L"))
+      OutName.append(Tmp.begin() + 1, Tmp.end());
+    else
+      OutName.append(Tmp.begin(), Tmp.end());
     return;
   }
   Mang.getNameWithPrefix(OutName, GV, CannotUsePrivateLabel);
-- 
cgit v1.2.3