Cherrypick upstream r233321

We upstreamed our Triple localmod for ARM in r233321. Remove the LOCALMODs
and update to the upstream version.

R=jvoung@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/1048993002

Author: dschuff

lib/Support/Triple.cpp

@@ -1011,13 +1011,6 @@ const char *Triple::getARMCPUForArch(StringRef MArch) const {
   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;
   }
@@ -1076,6 +1069,8 @@ const char *Triple::getARMCPUForArch(StringRef MArch) const {
     default:
       return "strongarm";
     }
+  case llvm::Triple::NaCl:
+    return "cortex-a8";
   default:
     switch (getEnvironment()) {
     case llvm::Triple::EABIHF:

unittests/ADT/TripleTest.cpp

@@ -663,5 +663,9 @@ TEST(TripleTest, getARMCPUForArch) {
     EXPECT_STREQ("cortex-a8", Triple.getARMCPUForArch());
     EXPECT_STREQ("swift", Triple.getARMCPUForArch("armv7s"));
   }
+  {
+    llvm::Triple Triple("arm--nacl");
+    EXPECT_STREQ("cortex-a8", Triple.getARMCPUForArch("arm"));
+  }
 }
 }