commit 58878f85ab89b13e9eea4af3ccf055e42c557bc8
author Pirama Arumuga Nainar <pirama@google.com> Wed May 06 11:48:57 2015 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Wed May 06 11:48:57 2015 -0700
tree 3bf522a2cb819d02935c537ee23c8604b9e3f807
parent 13cb65defa5e5c4578d83b4f3ca5bdfc08a4e06f

Update aosp/master clang for rebase to r235153

Change-Id: Ia94bbcb6da7c75b6e7c2afedd1001094d62a7324

lib/Driver/Driver.cpp

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 0e99c58..07a5e42 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -2062,6 +2062,9 @@
       else
         TC = new toolchains::Linux(*this, Target, Args);
       break;
+    case llvm::Triple::NaCl:
+      TC = new toolchains::NaCl_TC(*this, Target, Args);
+      break;
     case llvm::Triple::Solaris:
       TC = new toolchains::Solaris(*this, Target, Args);
       break;
@@ -2149,7 +2152,7 @@
 
   Major = Minor = Micro = 0;
   if (*Str == '\0')
-    return true;
+    return false;
 
   char *End;
   Major = (unsigned) strtol(Str, &End, 10);