Teach the triple library about the androideabi environment.

Patch by Evgeniy Stepanov.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147871 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
index 4739fb5bac52b2f8b1310d3048a3f1df09e4bb12..772f339a34b79b4cc256cd9434bcc1b6aa465ab6 100644 (file)
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
@@ -105,7 +105,8 @@ public:
     GNU,
     GNUEABI,
     EABI,
-    MachO
+    MachO,
+    ANDROIDEABI
   };
 
 private:

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 8f58e7029a28f32ad13770f1ebd5ed315b10aa69..732fca5c133336b967e2ab05322011afae34d30b 100644 (file)
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -125,6 +125,7 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) {
   case GNUEABI: return "gnueabi";
   case EABI: return "eabi";
   case MachO: return "macho";
+  case ANDROIDEABI: return "androideabi";
   }
 
   return "<invalid>";
@@ -387,6 +388,8 @@ Triple::EnvironmentType Triple::ParseEnvironment(StringRef EnvironmentName) {
     return GNU;
   else if (EnvironmentName.startswith("macho"))
     return MachO;
+  else if (EnvironmentName.startswith("androideabi"))
+    return ANDROIDEABI;
   else
     return UnknownEnvironment;
 }