Merge branch 'master' into merge-2.064

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

View file

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