summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support
diff options
context:
space:
mode:
authorLogan Chien <tzuhsiang.chien@gmail.com>2012-09-02 09:29:46 +0000
committerLogan Chien <tzuhsiang.chien@gmail.com>2012-09-02 09:29:46 +0000
commit9ab55b8d597168c08963b0ed93becc5ce3005f42 (patch)
tree68ed7732e43fc7ca3f1841c79d54e0810b428948 /llvm/lib/Support
parent500d691d4a4493934eaecbcb15800cbe5b89e0a5 (diff)
downloadbcm5719-llvm-9ab55b8d597168c08963b0ed93becc5ce3005f42.tar.gz
bcm5719-llvm-9ab55b8d597168c08963b0ed93becc5ce3005f42.zip
Rename ANDROIDEABI to Android.
Most of the code guarded with ANDROIDEABI are not ARM-specific, and having no relation with arm-eabi. Thus, it will be more natural to call this environment "Android" instead of "ANDROIDEABI". Note: We are not using ANDROID because several projects are using "-DANDROID" as the conditional compilation flag. llvm-svn: 163087
Diffstat (limited to 'llvm/lib/Support')
-rw-r--r--llvm/lib/Support/Triple.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index b5b2de1461a..d1dc7c81af0 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -139,7 +139,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) {
case GNUEABI: return "gnueabi";
case EABI: return "eabi";
case MachO: return "macho";
- case ANDROIDEABI: return "androideabi";
+ case Android: return "android";
}
llvm_unreachable("Invalid EnvironmentType!");
@@ -307,7 +307,7 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
.StartsWith("gnueabi", Triple::GNUEABI)
.StartsWith("gnu", Triple::GNU)
.StartsWith("macho", Triple::MachO)
- .StartsWith("androideabi", Triple::ANDROIDEABI)
+ .StartsWith("android", Triple::Android)
.Default(Triple::UnknownEnvironment);
}
OpenPOWER on IntegriCloud