From 8f4bdc0e37b4b24a58a15ecf41d1355a3b3fdcbb Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 30 Apr 2013 21:34:13 +0000 Subject: Revert r180739 and r180748: they broke C++11 thread_local on non-Darwin systems and did not do the right thing on Darwin. Original commit message: Emit the TLS intialization functions into a list. Add the TLS initialization functions to a list of initialization functions. The back-end takes this list and places the function pointers into the correct section. This way they're called before `main().' git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@180809 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'lib/CodeGen/CodeGenModule.cpp') diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index 6247b15ce9..bf67bd1007 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -182,7 +182,6 @@ void CodeGenModule::Release() { AddGlobalCtor(ObjCInitFunction); EmitCtorList(GlobalCtors, "llvm.global_ctors"); EmitCtorList(GlobalDtors, "llvm.global_dtors"); - EmitTLSList(TLSInitFuncs); EmitGlobalAnnotations(); EmitStaticExternCAliases(); EmitLLVMUsed(); @@ -480,12 +479,6 @@ void CodeGenModule::AddGlobalDtor(llvm::Function * Dtor, int Priority) { GlobalDtors.push_back(std::make_pair(Dtor, Priority)); } -/// AddTLSInitFunc - Add a function to the list that will initialize TLS -/// variables before main() runs. -void CodeGenModule::AddTLSInitFunc(llvm::Function *Init) { - TLSInitFuncs.push_back(Init); -} - void CodeGenModule::EmitCtorList(const CtorList &Fns, const char *GlobalName) { // Ctor function type is void()*. llvm::FunctionType* CtorFTy = llvm::FunctionType::get(VoidTy, false); @@ -514,25 +507,6 @@ void CodeGenModule::EmitCtorList(const CtorList &Fns, const char *GlobalName) { } } -void CodeGenModule::EmitTLSList(ArrayRef Fns) { - if (Fns.empty()) return; - - // TLS init function types are void()*. - llvm::FunctionType* TLSFTy = llvm::FunctionType::get(VoidTy, false); - llvm::Type *TLSPFTy = llvm::PointerType::getUnqual(TLSFTy); - - SmallVector Inits; - for (ArrayRef::iterator I = Fns.begin(), - E = Fns.end(); I != E; ++I) - Inits.push_back(llvm::ConstantExpr::getBitCast(*I, TLSPFTy)); - - llvm::ArrayType *AT = llvm::ArrayType::get(TLSPFTy, Inits.size()); - new llvm::GlobalVariable(TheModule, AT, false, - llvm::GlobalValue::AppendingLinkage, - llvm::ConstantArray::get(AT, Inits), - "llvm.tls_init_funcs"); -} - llvm::GlobalValue::LinkageTypes CodeGenModule::getFunctionLinkage(const FunctionDecl *D) { GVALinkage Linkage = getContext().GetGVALinkageForFunction(D); -- cgit v1.2.3-18-g5258