diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h
index ac77acce1bb..bace7893af3 100644
--- a/include/llvm/CodeGen/AsmPrinter.h
+++ b/include/llvm/CodeGen/AsmPrinter.h
@@ -44,12 +44,12 @@ namespace llvm {
     // Properties to be set by the derived class ctor, used to configure the
     // asmwriter.
 
-    /// UsesUnderscorePrefix - If this flag is set to true, all identifiers
-    /// printed by the asmwriter will include a '_' prefix.
-    bool UsesUnderscorePrefix;
+    /// GlobalPrefix - If this is set to a non-empty string, it is prepended
+    /// onto all global symbols.  This is often used for "_" or ".".
+    const char *GlobalPrefix;
 
     AsmPrinter(std::ostream &o, TargetMachine &tm)
-      : O(o), TM(tm), UsesUnderscorePrefix(false) { }
+      : O(o), TM(tm), GlobalPrefix("") { }
 
     /// doInitialization - Set up the AsmPrinter when we are working on a new
     /// module.  If your pass overrides this, it must make sure to explicitly
diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index 0cf5823bb8c..a84cc7127f1 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -19,7 +19,7 @@
 using namespace llvm;
 
 bool AsmPrinter::doInitialization(Module &M) {
-  Mang = new Mangler(M, UsesUnderscorePrefix);
+  Mang = new Mangler(M, GlobalPrefix);
   return false;
 }