2 files changed, 4 insertions, 4 deletions
diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index e9542fc6c1..90d77adfb3 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -352,11 +352,12 @@ unsigned AsmPrinter::getPreferredAlignmentLog(const GlobalVariable *GV) const {
 /// getGlobalLinkName - Returns the asm/link name of of the specified
 /// global variable.  Should be overridden by each target asm printer to
 /// generate the appropriate value.
-void AsmPrinter::getGlobalLinkName(const GlobalVariable *GV,
-                                  std::string &LinkName) {
+const std::string AsmPrinter::getGlobalLinkName(const GlobalVariable *GV) const{
+  std::string LinkName;
   // Default action is to use a global symbol.                              
   LinkName = TAI->getGlobalPrefix();
   LinkName += GV->getName();
+  return LinkName;
 }
 
 // EmitAlignment - Emit an alignment directive to the specified power of two.
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 1c52c5bf5d..1d08d07a8a 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -1634,8 +1634,7 @@ DIE *DwarfWriter::NewGlobalVariable(GlobalVariableDesc *GVD) {
   AddSourceLine(VariableDie, UnitDesc, GVD->getLine());
   
   // Work up linkage name.
-  std::string LinkageName;
-  Asm->getGlobalLinkName(GV, LinkageName);
+  const std::string LinkageName = Asm->getGlobalLinkName(GV);
 
   // Add address.
   DIEBlock *Block = new DIEBlock();