mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-01 23:50:43 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into merge-2.079

Browse source 
Conflicts:
	runtime/druntime
	runtime/phobos
This commit is contained in:
Martin 2018-03-30 00:06:01 +02:00
commit b144fe1123
17 changed files with 191 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gen/llvmhelpers.cpp
View file

@ -70,6 +70,14 @@ bool isTargetWindowsMSVC() {
return global.params.targetTriple->isWindowsMSVCEnvironment();
}
bool isMusl() {
#if LDC_LLVM_VER >= 309
return global.params.targetTriple->isMusl();
#else
return false;
#endif
}
/******************************************************************************
* Global context
******************************************************************************/
@ -311,7 +319,7 @@ void DtoCAssert(Module *M, Loc &loc, LLValue *msg) {
args.push_back(file);
args.push_back(line);
args.push_back(msg);
} else if (global.params.targetTriple->isOSSolaris()) {
} else if (global.params.targetTriple->isOSSolaris() || isMusl()) {
const auto irFunc = gIR->func();
const auto funcName =
(irFunc && irFunc->decl) ? irFunc->decl->toPrettyChars() : "";