[cfe-commits] r127580 - /cfe/trunk/lib/CodeGen/CGObjCGNU.cpp

[Douglas Gregor]

Bill, please merge this to the 2.9 release branch.

	Thanks!
	- Doug

On Mar 14, 2011, at 8:01 AM, David Chisnall wrote:

> Author: theraven
> Date: Mon Mar 14 10:01:16 2011
> New Revision: 127580
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=127580&view=rev
> Log:
> Fix incorrect linkage specifiers for selectors.
> 
> 
> Modified:
>    cfe/trunk/lib/CodeGen/CGObjCGNU.cpp
> 
> Modified: cfe/trunk/lib/CodeGen/CGObjCGNU.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGObjCGNU.cpp?rev=127580&r1=127579&r2=127580&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGObjCGNU.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGObjCGNU.cpp Mon Mar 14 10:01:16 2011
> @@ -1720,7 +1720,7 @@
>     llvm::Constant *Idxs[] = {Zeros[0],
>       llvm::ConstantInt::get(llvm::Type::getInt32Ty(VMContext), index++), Zeros[0]};
>     llvm::Constant *SelPtr = new llvm::GlobalVariable(TheModule, SelStructPtrTy,
> -      true, llvm::GlobalValue::LinkOnceODRLinkage,
> +      true, llvm::GlobalValue::InternalLinkage,
>       llvm::ConstantExpr::getGetElementPtr(SelectorList, Idxs, 2),
>       MangleSelectorTypes(".objc_sel_ptr"+iter->first.first+"."+
>          iter->first.second));
> @@ -1739,7 +1739,7 @@
>     llvm::Constant *Idxs[] = {Zeros[0],
>       llvm::ConstantInt::get(llvm::Type::getInt32Ty(VMContext), index++), Zeros[0]};
>     llvm::Constant *SelPtr = new llvm::GlobalVariable(TheModule, SelStructPtrTy,
> -      true, llvm::GlobalValue::LinkOnceODRLinkage,
> +      true, llvm::GlobalValue::InternalLinkage,
>       llvm::ConstantExpr::getGetElementPtr(SelectorList, Idxs, 2),
>       MangleSelectorTypes(std::string(".objc_sel_ptr")+iter->getKey().str()));
>     // If selectors are defined as an opaque type, cast the pointer to this
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits