Merging r296493:

brad0 · brad0 · commit 7b61abe47c66 · 2017-04-22T16:34:38.000Z
------------------------------------------------------------------------ r296493 | brad | 2017-02-28 12:28:35 -0500 (Tue, 28 Feb 2017) | 2 lines Set default CPU for OpenBSD/arm to Cortex-A8 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_40@301082 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
@@ -1511,6 +1511,7 @@ StringRef Triple::getARMCPUForArch(StringRef MArch) const {
       return "strongarm";
     }
   case llvm::Triple::NaCl:
+  case llvm::Triple::OpenBSD:
     return "cortex-a8";
   default:
     switch (getEnvironment()) {
diff --git a/unittests/ADT/TripleTest.cpp b/unittests/ADT/TripleTest.cpp
@@ -947,6 +947,10 @@ TEST(TripleTest, getARMCPUForArch) {
     llvm::Triple Triple("arm--nacl");
     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());

Original file line number	Diff line number	Diff line change
`@@ -1511,6 +1511,7 @@ StringRef Triple::getARMCPUForArch(StringRef MArch) const {`
`1511`	`1511`	`return "strongarm";`
`1512`	`1512`	`}`
`1513`	`1513`	`case llvm::Triple::NaCl:`
	`1514`	`+ case llvm::Triple::OpenBSD:`
`1514`	`1515`	`return "cortex-a8";`
`1515`	`1516`	`default:`
`1516`	`1517`	`switch (getEnvironment()) {`
Original file line number	Diff line number	Diff line change
`@@ -947,6 +947,10 @@ TEST(TripleTest, getARMCPUForArch) {`
`947`	`947`	`llvm::Triple Triple("arm--nacl");`
`948`	`948`	`EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch());`
`949`	`949`	`}`
	`950`	`+ {`
	`951`	`+ llvm::Triple Triple("arm--openbsd");`
	`952`	`+ EXPECT_EQ("cortex-a8", Triple.getARMCPUForArch());`
	`953`	`+ }`
`950`	`954`	`{`
`951`	`955`	`llvm::Triple Triple("armv6-unknown-freebsd");`
`952`	`956`	`EXPECT_EQ("arm1176jzf-s", Triple.getARMCPUForArch());`