4 files changed, 32 insertions, 24 deletions

diff --git a/include/llvm/Support/Mangler.h b/include/llvm/Support/Mangler.h
index 533b44f525..15ec2f49fc 100644
--- a/include/llvm/Support/Mangler.h
+++ b/include/llvm/Support/Mangler.h
@@ -14,14 +14,29 @@ class Module;
 #include <string>
 
 class Mangler {
+  /// This keeps track of which global values have had their names
+  /// mangled in the current module.
+  ///
+  std::set<const Value *> MangledGlobals;
+
+  Module &M;
+  bool AddUnderscorePrefix;
+
+  typedef std::map<const Value *, std::string> ValueMap;
+  ValueMap Memo;
+
+  unsigned Count;
 public:
+
+  // Mangler ctor - if AddUnderscorePrefix is true, then all public global
+  // symbols will be prefixed with an underscore.
+  Mangler(Module &M, bool AddUnderscorePrefix = false);
+
   /// getValueName - Returns the mangled name of V, an LLVM Value,
   /// in the current module.
   ///
   std::string getValueName(const Value *V);
 
-  Mangler(Module &M_);
-
   /// makeNameProper - We don't want identifier names with ., space, or
   /// - in them, so we mangle these characters into the strings "d_",
   /// "s_", and "D_", respectively. This is a very simple mangling that
@@ -30,19 +45,6 @@ public:
   /// from getValueName.
   /// 
   static std::string makeNameProper(const std::string &x);
-
-private:
-  /// This keeps track of which global values have had their names
-  /// mangled in the current module.
-  ///
-  std::set<const Value *> MangledGlobals;
-
-  Module &M;
-
-  typedef std::map<const Value *, std::string> ValueMap;
-  ValueMap Memo;
-
-  unsigned int Count;
 };
 
 #endif // LLVM_SUPPORT_MANGLER_H
diff --git a/lib/Support/Mangler.cpp b/lib/Support/Mangler.cpp
index 665cb7388c..a58ca330af 100644
--- a/lib/Support/Mangler.cpp
+++ b/lib/Support/Mangler.cpp
@@ -42,8 +42,9 @@ std::string Mangler::getValueName(const Value *V) {
     //   2) V's name would collide if it is not mangled.
     //
     const GlobalValue* gv = dyn_cast<GlobalValue>(V);
-    if(gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
+    if (gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
       name = makeNameProper(gv->getName());
+      if (AddUnderscorePrefix) name = "_" + name;
     } else {
       // Non-global, or global with internal linkage / colliding name
       // -> mangle.
@@ -54,12 +55,13 @@ std::string Mangler::getValueName(const Value *V) {
     name = "ltmp_" + utostr(Count++) + "_"
       + utostr(V->getType()->getUniqueID());
   }
+  
   Memo[V] = name;
   return name;
 }
 
-Mangler::Mangler(Module &M_) : M(M_)
-{
+Mangler::Mangler(Module &m, bool addUnderscorePrefix)
+  : M(m), AddUnderscorePrefix(addUnderscorePrefix) {
   // Calculate which global values have names that will collide when we throw
   // away type information.
   std::set<std::string> FoundNames;
diff --git a/lib/VMCore/Mangler.cpp b/lib/VMCore/Mangler.cpp
index 665cb7388c..a58ca330af 100644
--- a/lib/VMCore/Mangler.cpp
+++ b/lib/VMCore/Mangler.cpp
@@ -42,8 +42,9 @@ std::string Mangler::getValueName(const Value *V) {
     //   2) V's name would collide if it is not mangled.
     //
     const GlobalValue* gv = dyn_cast<GlobalValue>(V);
-    if(gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
+    if (gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
       name = makeNameProper(gv->getName());
+      if (AddUnderscorePrefix) name = "_" + name;
     } else {
       // Non-global, or global with internal linkage / colliding name
       // -> mangle.
@@ -54,12 +55,13 @@ std::string Mangler::getValueName(const Value *V) {
     name = "ltmp_" + utostr(Count++) + "_"
       + utostr(V->getType()->getUniqueID());
   }
+  
   Memo[V] = name;
   return name;
 }
 
-Mangler::Mangler(Module &M_) : M(M_)
-{
+Mangler::Mangler(Module &m, bool addUnderscorePrefix)
+  : M(m), AddUnderscorePrefix(addUnderscorePrefix) {
   // Calculate which global values have names that will collide when we throw
   // away type information.
   std::set<std::string> FoundNames;
diff --git a/support/lib/Support/Mangler.cpp b/support/lib/Support/Mangler.cpp
index 665cb7388c..a58ca330af 100644
--- a/support/lib/Support/Mangler.cpp
+++ b/support/lib/Support/Mangler.cpp
@@ -42,8 +42,9 @@ std::string Mangler::getValueName(const Value *V) {
     //   2) V's name would collide if it is not mangled.
     //
     const GlobalValue* gv = dyn_cast<GlobalValue>(V);
-    if(gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
+    if (gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
       name = makeNameProper(gv->getName());
+      if (AddUnderscorePrefix) name = "_" + name;
     } else {
       // Non-global, or global with internal linkage / colliding name
       // -> mangle.
@@ -54,12 +55,13 @@ std::string Mangler::getValueName(const Value *V) {
     name = "ltmp_" + utostr(Count++) + "_"
       + utostr(V->getType()->getUniqueID());
   }
+  
   Memo[V] = name;
   return name;
 }
 
-Mangler::Mangler(Module &M_) : M(M_)
-{
+Mangler::Mangler(Module &m, bool addUnderscorePrefix)
+  : M(m), AddUnderscorePrefix(addUnderscorePrefix) {
   // Calculate which global values have names that will collide when we throw
   // away type information.
   std::set<std::string> FoundNames;