mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-06 02:45:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into merge-2.064

Browse source
This commit is contained in:
Kai Nacke 2014-03-05 18:48:11 +01:00
commit 7f44320dd0
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dmd2/cond.c
View file

@ -236,8 +236,8 @@ bool VersionCondition::isPredefined(const char *ident)
#if IN_LLVM #if IN_LLVM
"LLVM", "LDC", "LLVM64", "LLVM", "LDC", "LLVM64",
"PPC", "PPC64", "darwin","solaris","freebsd",
"darwin","solaris","freebsd" "NVPTX", "NVPTX64"
#endif #endif
}; };

6
driver/main.cpp
View file

@ -526,6 +526,12 @@ static void registerPredefinedTargetVersions() {
VersionCondition::addPredefinedGlobalIdent("SPARC64"); VersionCondition::addPredefinedGlobalIdent("SPARC64");
VersionCondition::addPredefinedGlobalIdent("D_HardFloat"); VersionCondition::addPredefinedGlobalIdent("D_HardFloat");
break; break;
case llvm::Triple::nvptx:
VersionCondition::addPredefinedGlobalIdent("NVPTX");
break;
case llvm::Triple::nvptx64:
VersionCondition::addPredefinedGlobalIdent("NVPTX64");
break;
default: default:
error("invalid cpu architecture specified: %s", global.params.targetTriple.getArchName().str().c_str()); error("invalid cpu architecture specified: %s", global.params.targetTriple.getArchName().str().c_str());
fatal(); fatal();