From aee93e78d189ea679702a48fe1eaad6c885b9408 Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Thu, 11 Feb 2016 23:49:08 +0000 Subject: [PATCH] ARMv7k: use Cortex-A7 by default even for tvOS Also actually test the default CPU from those triples. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@260621 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Triple.cpp | 1 + unittests/ADT/TripleTest.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp index 1485d8e6185..12aa7bfa0ce 100644 --- a/lib/Support/Triple.cpp +++ b/lib/Support/Triple.cpp @@ -1412,6 +1412,7 @@ StringRef Triple::getARMCPUForArch(StringRef MArch) const { case llvm::Triple::MacOSX: case llvm::Triple::IOS: case llvm::Triple::WatchOS: + case llvm::Triple::TvOS: if (MArch == "v7k") return "cortex-a7"; break; diff --git a/unittests/ADT/TripleTest.cpp b/unittests/ADT/TripleTest.cpp index ad143ff1c71..7712b5a587d 100644 --- a/unittests/ADT/TripleTest.cpp +++ b/unittests/ADT/TripleTest.cpp @@ -982,6 +982,18 @@ TEST(TripleTest, getARMCPUForArch) { llvm::Triple Triple("armv7s-apple-ios7"); EXPECT_EQ("swift", Triple.getARMCPUForArch()); } + { + llvm::Triple Triple("armv7k-apple-ios9"); + EXPECT_EQ("cortex-a7", Triple.getARMCPUForArch()); + } + { + llvm::Triple Triple("armv7k-apple-watchos3"); + EXPECT_EQ("cortex-a7", Triple.getARMCPUForArch()); + } + { + llvm::Triple Triple("armv7k-apple-tvos9"); + EXPECT_EQ("cortex-a7", Triple.getARMCPUForArch()); + } { llvm::Triple Triple("armv7em-apple-ios7"); EXPECT_EQ("cortex-m4", Triple.getARMCPUForArch());