diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2015-05-09 21:10:07 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2015-05-09 21:10:07 +0000 |
| commit | c7da6da58ec7447aabcae967dcc7bf222a5dff76 (patch) | |
| tree | 93ada3ab35d01f66fd6d473c2e01372dd65c9c40 /clang/lib/CodeGen/CGVTT.cpp | |
| parent | 1af9c7b9d4f0c0150419aa7887e9f67262cc615c (diff) | |
| download | bcm5719-llvm-c7da6da58ec7447aabcae967dcc7bf222a5dff76.tar.gz bcm5719-llvm-c7da6da58ec7447aabcae967dcc7bf222a5dff76.zip | |
Revert r236879, "Do not emit thunks with available_externally linkage in comdats"
It broke pecoff, at least i686-cygwin.
llvm-svn: 236937
Diffstat (limited to 'clang/lib/CodeGen/CGVTT.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGVTT.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGVTT.cpp b/clang/lib/CodeGen/CGVTT.cpp index aca9e7a3e62..895afd75afc 100644 --- a/clang/lib/CodeGen/CGVTT.cpp +++ b/clang/lib/CodeGen/CGVTT.cpp @@ -94,7 +94,8 @@ CodeGenVTables::EmitVTTDefinition(llvm::GlobalVariable *VTT, // Set the correct linkage. VTT->setLinkage(Linkage); - CGM.maybeSetTrivialComdat(*VTT); + if (CGM.supportsCOMDAT() && VTT->isWeakForLinker()) + VTT->setComdat(CGM.getModule().getOrInsertComdat(VTT->getName())); // Set the right visibility. CGM.setGlobalVisibility(VTT, RD); @@ -176,3 +177,4 @@ CodeGenVTables::getSecondaryVirtualPointerIndex(const CXXRecordDecl *RD, return I->second; } + |
