diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index 19634cf943f..28f3e8bfa05 100644
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -418,6 +418,9 @@ namespace llvm {
 
     /// printVisibility - This prints visibility information about symbol, if
     /// this is suported by the target.
+    void printVisibility(const MCSymbol *Sym, unsigned Visibility) const;
+    
+    // FIXME: This is deprecated and should be removed.
     void printVisibility(const std::string& Name, unsigned Visibility) const;
 
     /// printOffset - This is just convenient handler for printing offsets.
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 013889b5b2a..7293ec0ba9e 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1856,6 +1856,23 @@ void AsmPrinter::printVisibility(const std::string& Name,
   }
 }
 
+void AsmPrinter::printVisibility(const MCSymbol *Sym,
+                                 unsigned Visibility) const {
+  if (Visibility == GlobalValue::HiddenVisibility) {
+    if (const char *Directive = MAI->getHiddenDirective()) {
+      O << Directive;
+      Sym->print(O, MAI);
+      O << '\n';
+    }
+  } else if (Visibility == GlobalValue::ProtectedVisibility) {
+    if (const char *Directive = MAI->getProtectedDirective()) {
+      O << Directive;
+      Sym->print(O, MAI);
+      O << '\n';
+    }
+  }
+}
+
 void AsmPrinter::printOffset(int64_t Offset) const {
   if (Offset > 0)
     O << '+' << Offset;
diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index 2f3dec42f87..5c596880e41 100644
--- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -49,7 +49,6 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormattedStream.h"
-#include "llvm/Support/Mangler.h"
 #include "llvm/Support/MathExtras.h"
 #include <cctype>
 using namespace llvm;
@@ -1186,9 +1185,7 @@ void ARMAsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
     return;
   }
 
-  std::string Name = Mang->getMangledName(GVar);
   MCSymbol *GVarSym = GetGlobalValueSymbol(GVar);
-
   
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -1196,7 +1193,7 @@ void ARMAsmPrinter::PrintGlobalVariable(const GlobalVariable* GVar) {
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
   bool isDarwin = Subtarget->isTargetDarwin();
 
-  printVisibility(Name, GVar->getVisibility());
+  printVisibility(GVarSym, GVar->getVisibility());
 
   if (Subtarget->isTargetELF()) {
     O << "\t.type ";