diff options
author | Anders Carlsson <andersca@mac.com> | 2011-01-24 00:46:19 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2011-01-24 00:46:19 +0000 |
commit | f502d93b0ea970bfbd897e657f8d940a20984de2 (patch) | |
tree | 7c33da35e9c49d7ed029844fe3ee9bb512783f66 /lib/CodeGen/CGRTTI.cpp | |
parent | 15e14a289583616e582a23b320933e846a742626 (diff) |
Mark VTables and RTTI data linkonce_odr instead of weak_odr, with the exception of explicit template instantiations, which have to be weak_odr.
This fixes PR6996.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124089 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGRTTI.cpp')
-rw-r--r-- | lib/CodeGen/CGRTTI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index 9f3571ee63..6e57f90e99 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/lib/CodeGen/CGRTTI.cpp @@ -355,10 +355,10 @@ static llvm::GlobalVariable::LinkageTypes getTypeInfoLinkage(QualType Ty) { return CodeGenModule::getVTableLinkage(RD); } - return llvm::GlobalValue::WeakODRLinkage; + return llvm::GlobalValue::LinkOnceODRLinkage; } - return llvm::GlobalValue::WeakODRLinkage; + return llvm::GlobalValue::LinkOnceODRLinkage; } // CanUseSingleInheritance - Return whether the given record decl has a "single, @@ -640,7 +640,7 @@ llvm::Constant *RTTIBuilder::BuildTypeInfo(QualType Ty, bool Force) { /*ForRTTI*/ true, /*ForDefinition*/ true); else if (Hidden || (CGM.getCodeGenOpts().HiddenWeakVTables && - Linkage == llvm::GlobalValue::WeakODRLinkage)) { + Linkage == llvm::GlobalValue::LinkOnceODRLinkage)) { GV->setVisibility(llvm::GlobalValue::HiddenVisibility); } GV->setUnnamedAddr(true); |