diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp
index a574703..a15ba4f 100644
--- a/lib/CodeGen/CGRTTI.cpp
+++ b/lib/CodeGen/CGRTTI.cpp
@@ -230,7 +230,7 @@
       return llvm::ConstantExpr::getBitCast(GV, Int8PtrTy);
 
     // If we're in an anonymous namespace, then we always want internal linkage.
-    if (RD->isInAnonymousNamespace())
+    if (RD->isInAnonymousNamespace() || !RD->hasLinkage())
       Linkage = llvm::GlobalVariable::InternalLinkage;
     
     bool Hidden = CGM.getDeclVisibilityMode(RD) == LangOptions::Hidden;
@@ -295,7 +295,7 @@
       return DecideExtern(PT->getPointeeType());
     if (const RecordType *RT = Ty->getAs<RecordType>())
       if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(RT->getDecl()))
-        return !RD->isInAnonymousNamespace();
+        return !RD->isInAnonymousNamespace() && RD->hasLinkage();
     return true;
   }