[llvm-branch-commits] [llvm-branch] r301082 - Merging r296493:

[Brad Smith via llvm-branch-commits]

Author: brad
Date: Sat Apr 22 11:34:38 2017
New Revision: 301082

URL: http://llvm.org/viewvc/llvm-project?rev=301082&view=rev
Log:
Merging r296493:

------------------------------------------------------------------------
r296493 | brad | 2017-02-28 12:28:35 -0500 (Tue, 28 Feb 2017) | 2 lines

Set default CPU for OpenBSD/arm to Cortex-A8
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/lib/Support/Triple.cpp
    llvm/branches/release_40/unittests/ADT/TripleTest.cpp

Modified: llvm/branches/release_40/lib/Support/Triple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/lib/Support/Triple.cpp?rev=301082&r1=301081&r2=301082&view=diff
==============================================================================
--- llvm/branches/release_40/lib/Support/Triple.cpp (original)
+++ llvm/branches/release_40/lib/Support/Triple.cpp Sat Apr 22 11:34:38 2017
@@ -1511,6 +1511,7 @@ StringRef Triple::getARMCPUForArch(Strin
       return "strongarm";
     }
   case llvm::Triple::NaCl:
+  case llvm::Triple::OpenBSD:
     return "cortex-a8";
   default:
     switch (getEnvironment()) {

Modified: llvm/branches/release_40/unittests/ADT/TripleTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/unittests/ADT/TripleTest.cpp?rev=301082&r1=301081&r2=301082&view=diff
==============================================================================
--- llvm/branches/release_40/unittests/ADT/TripleTest.cpp (original)
+++ llvm/branches/release_40/unittests/ADT/TripleTest.cpp Sat Apr 22 11:34:38 2017
@@ -948,6 +948,10 @@ TEST(TripleTest, getARMCPUForArch) {
     EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch());
   }
   {
+    llvm::Triple Triple("arm--openbsd");
+    EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch());
+  }
+  {
     llvm::Triple Triple("armv6-unknown-freebsd");
     EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch());
   }