mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-04-29 14:40:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backport of "Avoid using llvm::Linker" to master.

Browse source 
See pull request #974 for the original code.
This commit is contained in:
Kai Nacke 2015-06-27 14:21:33 +02:00
parent d7347a5829
commit d1e764cec1
39 changed files with 753 additions and 812 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gen/llvmhelpers.cpp
View file

@ -208,17 +208,8 @@ void DtoAssert(Module* M, Loc& loc, DValue* msg)
LLValue *DtoModuleFileName(Module* M, const Loc& loc)
{
// we might be generating for an imported template function
const char* cur_file = M->srcfile->name->toChars();
if (loc.filename && strcmp(loc.filename, cur_file) != 0)
{
return DtoConstString(loc.filename);
}
else
{
IrModule* irmod = getIrModule(M);
return DtoLoad(irmod->fileName);
}
return DtoConstString(loc.filename ? loc.filename :
M->srcfile->name->toChars());
}
/****************************************************************************************/
@ -961,7 +952,7 @@ void DtoResolveVariable(VarDeclaration* vd)
linkage = llvm::GlobalValue::ExternalWeakLinkage;
}
llvm::GlobalVariable* gvar = getOrCreateGlobal(vd->loc, *gIR->module,
llvm::GlobalVariable* gvar = getOrCreateGlobal(vd->loc, gIR->module,
i1ToI8(DtoType(vd->type)), isLLConst, linkage, 0, llName,
vd->isThreadlocal());
getIrGlobal(vd)->value = gvar;
@ -1616,9 +1607,9 @@ void printLabelName(std::ostream& target, const char* func_mangle, const char* l
void AppendFunctionToLLVMGlobalCtorsDtors(llvm::Function* func, const uint32_t priority, const bool isCtor)
{
if (isCtor)
llvm::appendToGlobalCtors(*gIR->module, func, priority);
llvm::appendToGlobalCtors(gIR->module, func, priority);
else
llvm::appendToGlobalDtors(*gIR->module, func, priority);
llvm::appendToGlobalDtors(gIR->module, func, priority);
}
//////////////////////////////////////////////////////////////////////////////////////////