diff options
| author | dim <dim@FreeBSD.org> | 2015-01-31 19:28:59 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-01-31 19:28:59 +0000 |
| commit | cf8e1ca250cdf4ade1e7d628e56040eb27797b5d (patch) | |
| tree | 950414edc74ebec2c62ac1b5fd10e799f0204b5b /lib/CodeGen/CGDeclCXX.cpp | |
| parent | c86b984ea8ecb3e944dc3de48539f4c1f65851ea (diff) | |
| download | FreeBSD-src-cf8e1ca250cdf4ade1e7d628e56040eb27797b5d.zip FreeBSD-src-cf8e1ca250cdf4ade1e7d628e56040eb27797b5d.tar.gz | |
Vendor import of clang RELEASE_360/rc2 tag r227651 (effectively, 3.6.0 RC2):
https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc2@227651
Diffstat (limited to 'lib/CodeGen/CGDeclCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index 3b379b7..19e4bdd 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -267,7 +267,15 @@ void CodeGenModule::EmitPointerToInitFunc(const VarDecl *D, addUsedGlobal(PtrArray); // If the GV is already in a comdat group, then we have to join it. - if (llvm::Comdat *C = GV->getComdat()) + llvm::Comdat *C = GV->getComdat(); + + // LinkOnce and Weak linkage are lowered down to a single-member comdat group. + // Make an explicit group so we can join it. + if (!C && (GV->hasWeakLinkage() || GV->hasLinkOnceLinkage())) { + C = TheModule.getOrInsertComdat(GV->getName()); + GV->setComdat(C); + } + if (C) PtrArray->setComdat(C); } |
