[llvm-branch-commits] [cfe-branch] r127581 - /cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp

[David Chisnall]

Author: theraven
Date: Mon Mar 14 10:08:06 2011
New Revision: 127581

URL: http://llvm.org/viewvc/llvm-project?rev=127581&view=rev
Log:
Merged selector linkage fix (GNU runtime) from trunk.  Approved by Doug Gregor.


Modified:
    cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp

Modified: cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp?rev=127581&r1=127580&r2=127581&view=diff
==============================================================================
--- cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp (original)
+++ cfe/branches/release_29/lib/CodeGen/CGObjCGNU.cpp Mon Mar 14 10:08:06 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