diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp
index dac9a7c57a9e..049353faae99 100644
--- a/clang/lib/CodeGen/Mangle.cpp
+++ b/clang/lib/CodeGen/Mangle.cpp
@@ -34,6 +34,7 @@ namespace {
       : Context(C), Out(os) { }
 
     bool mangle(const NamedDecl *D);
+    void mangleGuardVariable(const VarDecl *D);
     
   private:
     bool mangleFunctionDecl(const FunctionDecl *FD);
@@ -124,6 +125,15 @@ bool CXXNameMangler::mangle(const NamedDecl *D) {
   return false;
 }
 
+void CXXNameMangler::mangleGuardVariable(const VarDecl *D)
+{
+  //  <special-name> ::= GV <object name>	# Guard variable for one-time 
+  //                                      # initialization
+
+  Out << "_ZGV";
+  mangleName(D);
+}
+
 void CXXNameMangler::mangleFunctionEncoding(const FunctionDecl *FD) {
   // <encoding> ::= <function name> <bare-function-type>
   mangleName(FD);
@@ -586,5 +596,14 @@ namespace clang {
     os.flush();
     return true;
   }
+  
+  /// mangleGuardVariable - Mangles the m
+  void mangleGuardVariable(const VarDecl *D, ASTContext &Context,
+                           llvm::raw_ostream &os) {
+    CXXNameMangler Mangler(Context, os);
+    Mangler.mangleGuardVariable(D);
+
+    os.flush();
+  }
 }
 
diff --git a/clang/lib/CodeGen/Mangle.h b/clang/lib/CodeGen/Mangle.h
index 627c16a08ef1..b3f88b0d6877 100644
--- a/clang/lib/CodeGen/Mangle.h
+++ b/clang/lib/CodeGen/Mangle.h
@@ -25,9 +25,12 @@ namespace llvm {
 namespace clang {
   class ASTContext;
   class NamedDecl;
-
+  class VarDecl;
+  
   bool mangleName(const NamedDecl *D, ASTContext &Context, 
                   llvm::raw_ostream &os);
+  void mangleGuardVariable(const VarDecl *D, ASTContext &Context,
+                           llvm::raw_ostream &os);
 }
 
 #endif