diff options
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 4 | ||||
| -rw-r--r-- | llvm/unittests/ADT/TripleTest.cpp | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index a63426f8857..a1ee18809ca 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -1113,8 +1113,8 @@ const char *Triple::getARMCPUForArch(StringRef MArch) const { switch (getOS()) { case llvm::Triple::FreeBSD: case llvm::Triple::NetBSD: - // FIXME: This doesn't work on BE/thumb variants. - if (MArch == "armv6") + MArch = ARMTargetParser::getCanonicalArchName(MArch); + if (!MArch.empty() && MArch == "v6") return "arm1176jzf-s"; break; case llvm::Triple::Win32: diff --git a/llvm/unittests/ADT/TripleTest.cpp b/llvm/unittests/ADT/TripleTest.cpp index b0f01b26e72..23a9128a8f2 100644 --- a/llvm/unittests/ADT/TripleTest.cpp +++ b/llvm/unittests/ADT/TripleTest.cpp @@ -800,6 +800,14 @@ TEST(TripleTest, getARMCPUForArch) { EXPECT_STREQ("arm1176jzf-s", Triple.getARMCPUForArch()); } { + llvm::Triple Triple("thumbv6-unknown-freebsd"); + EXPECT_STREQ("arm1176jzf-s", Triple.getARMCPUForArch()); + } + { + llvm::Triple Triple("armebv6-unknown-freebsd"); + EXPECT_STREQ("arm1176jzf-s", Triple.getARMCPUForArch()); + } + { llvm::Triple Triple("arm--win32"); EXPECT_STREQ("cortex-a9", Triple.getARMCPUForArch()); } |
