diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 0564372..ed3a117 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -630,6 +630,7 @@
     new llvm::GlobalVariable(*M, unit->getType(), false,
                              llvm::GlobalValue::PrivateLinkage, unit,
                              ".str");
+  unitGV->setUnnamedAddr(true);
 
   // Create the ConstantStruct for the global annotation.
   llvm::Constant *Fields[4] = {
diff --git a/test/CodeGen/annotate.c b/test/CodeGen/annotate.c
index 84d564a..ffaeebb 100644
--- a/test/CodeGen/annotate.c
+++ b/test/CodeGen/annotate.c
@@ -5,4 +5,6 @@
   __attribute__((annotate("bar"))) static char bar;
 }
 
+// CHECK: private unnamed_addr global
+// CHECK: private unnamed_addr global
 // CHECK: @llvm.global.annotations = appending global [2 x %0]