Merge branch 'master' into merge-2.064

This commit is contained in:
Kai Nacke
2013-12-03 18:10:29 +01:00
+19 -2
View File
@@ -572,6 +572,12 @@ static void registerPredefinedTargetVersions() {
case llvm::Triple::Linux:
VersionCondition::addPredefinedGlobalIdent("linux");
VersionCondition::addPredefinedGlobalIdent("Posix");
#if LDC_LLVM_VER >= 302
if (global.params.targetTriple.getEnvironment() == llvm::Triple::Android)
{
VersionCondition::addPredefinedGlobalIdent("Android");
}
#endif
break;
case llvm::Triple::Haiku:
VersionCondition::addPredefinedGlobalIdent("Haiku");
@@ -611,8 +617,19 @@ static void registerPredefinedTargetVersions() {
break;
#endif
default:
error("target '%s' is not yet supported", global.params.targetTriple.str().c_str());
fatal();
switch (global.params.targetTriple.getEnvironment())
{
#if LDC_LLVM_VER >= 302
case llvm::Triple::Android:
VersionCondition::addPredefinedGlobalIdent("Android");
VersionCondition::addPredefinedGlobalIdent("linux");
VersionCondition::addPredefinedGlobalIdent("Posix");
break;
#endif
default:
error("target '%s' is not yet supported", global.params.targetTriple.str().c_str());
fatal();
}
}
}