summaryrefslogtreecommitdiffstats
path: root/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
commit43bf70986bb13c812e87ca959dd8f2dd9edf802c (patch)
tree1e067d82e74890b77a977b216bb9f763e2d6d0ea /lib/Support
parentf55ef64544f8ba81e50154a98f144f7b7783ed40 (diff)
downloadexternal_llvm-43bf70986bb13c812e87ca959dd8f2dd9edf802c.zip
external_llvm-43bf70986bb13c812e87ca959dd8f2dd9edf802c.tar.gz
external_llvm-43bf70986bb13c812e87ca959dd8f2dd9edf802c.tar.bz2
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163087 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
-rw-r--r--lib/Support/Triple.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index b5b2de1..d1dc7c8 100644
--- a/lib/Support/Triple.cpp
+++ b/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);
}