diff options
Diffstat (limited to 'lib/CodeGen/CodeGenModule.cpp')
| -rw-r--r-- | lib/CodeGen/CodeGenModule.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index a3cf69b675..1dab027455 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -1214,7 +1214,9 @@ CodeGenModule::GetLLVMLinkageVarDefinition(const VarDecl *D, // FIXME: It seems like we can provide more specific linkage here // (LinkOnceODR, WeakODR). return llvm::GlobalVariable::WeakAnyLinkage; - else if (!getLangOptions().CPlusPlus && !CodeGenOpts.NoCommon && + else if (!getLangOptions().CPlusPlus && + ((!CodeGenOpts.NoCommon && !D->getAttr<NoCommonAttr>()) || + D->getAttr<CommonAttr>()) && !D->hasExternalStorage() && !D->getInit() && !D->getAttr<SectionAttr>() && !D->isThreadSpecified()) { // Thread local vars aren't considered common linkage. |