Rebased PNaCl localmods in LLVM to 223109

lib/Support/Triple.cpp

 //===--- Triple.cpp - Target triple helper class --------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/Triple.h"
@@ skipping 983 matching lines @@
 
   switch (getOS()) {
   case llvm::Triple::FreeBSD:
   case llvm::Triple::NetBSD:
     if (MArch == "armv6")
       return "arm1176jzf-s";
     break;
   case llvm::Triple::Win32:
     // FIXME: this is invalid for WindowsCE
     return "cortex-a9";
+  // @LOCALMOD-START
+  case llvm::Triple::NaCl:
+    // Default to armv7 unless something more specific is specified.
+    if (MArch == "arm")
+      return "cortex-a9";
+    break;
+  // @LOCALMOD-END
   default:
     break;
   }
 
   const char *result = nullptr;
   size_t offset = StringRef::npos;
   if (MArch.startswith("arm"))
     offset = 3;
   if (MArch.startswith("thumb"))
     offset = 5;
@@ skipping 48 matching lines @@
   default:
     switch (getEnvironment()) {
     case llvm::Triple::EABIHF:
     case llvm::Triple::GNUEABIHF:
       return "arm1176jzf-s";
     default:
       return "arm7tdmi";
     }
   }
 }