From 0a727a9fe2f082a470c1e71c3b404f3a3b0e8f51 Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Fri, 17 Aug 2012 15:23:35 +0800
Subject: [PATCH] Add new triple to detect Android toolchain.

Add i686-linux-android and mipsel-linux-android to
detect the Android toolchain properly.
---
 llvm-3.1/tools/clang/lib/Driver/ToolChains.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/llvm-3.1/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1/tools/clang/lib/Driver/ToolChains.cpp
index 7f9ed9a..9b9c33e 100644
--- a/llvm-3.1/tools/clang/lib/Driver/ToolChains.cpp
+++ b/llvm-3.1/tools/clang/lib/Driver/ToolChains.cpp
@@ -1206,6 +1206,7 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector(
     "i686-pc-linux-gnu",
     "i486-linux-gnu",
     "i386-linux-gnu",
+    "i686-linux-android",
     "i686-redhat-linux",
     "i586-redhat-linux",
     "i386-redhat-linux",
@@ -1216,7 +1217,10 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector(
   static const char *const MIPSLibDirs[] = { "/lib" };
   static const char *const MIPSTriples[] = { "mips-linux-gnu" };
   static const char *const MIPSELLibDirs[] = { "/lib" };
-  static const char *const MIPSELTriples[] = { "mipsel-linux-gnu" };
+  static const char *const MIPSELTriples[] = {
+    "mipsel-linux-gnu",
+    "mipsel-linux-android"
+  };
 
   static const char *const PPCLibDirs[] = { "/lib32", "/lib" };
   static const char *const PPCTriples[] = {
-- 
1.7.7.3