1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 35c18b4c5eb..dbdf016b31b 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -1059,8 +1059,7 @@ llvm::Constant *CodeGenModule::GetAddrOfUuidDescriptor(
     else
       Uuid = "00000000-0000-0000-0000-000000000000";
   }
-  std::string Name = "_GUID_" + Uuid.lower();
-  std::replace(Name.begin(), Name.end(), '-', '_');
+  std::string Name = "__uuid_" + Uuid.str();
 
   // Look for an existing global.
   if (llvm::GlobalVariable *GV = getModule().getNamedGlobal(Name))
@@ -1083,7 +1082,7 @@ llvm::Constant *CodeGenModule::GetAddrOfUuidDescriptor(
   }
 
   llvm::GlobalVariable *GV = new llvm::GlobalVariable(getModule(), GuidType,
-      /*isConstant=*/true, llvm::GlobalValue::ExternalLinkage, Init, Name);
+      /*isConstant=*/true, llvm::GlobalValue::PrivateLinkage, Init, Name);
   GV->setUnnamedAddr(true);
   return GV;
 }