diff options
| author | Peter Smith <peter.smith@linaro.org> | 2018-09-28 09:04:27 +0000 |
|---|---|---|
| committer | Peter Smith <peter.smith@linaro.org> | 2018-09-28 09:04:27 +0000 |
| commit | 33291e44f2fc4db80021c840a561c7772f04564c (patch) | |
| tree | c099280f60f73a4c49e731688dc199991206d7cd /llvm/unittests/Support | |
| parent | ea605913bed0eb9264c83fa8a91de064ffe8c74b (diff) | |
| download | bcm5719-llvm-33291e44f2fc4db80021c840a561c7772f04564c.tar.gz bcm5719-llvm-33291e44f2fc4db80021c840a561c7772f04564c.zip | |
[ARM] Remove non-existent cpu arm1176j-s and use mpcore for v6k
The ARMTargetParser.def contains an entry for arm1176j-s which is the
default for the ArmV6K architecture. This cpu does not exist, there are
only arm1176jz-s and arm1176jzf-s and they are both architecture ArmV6KZ.
The only CPUs that are actually ArmV6K are the mpcore, mpcore_nofpu and
later revisions of the arm1136 family r1px (which we don't have a table
entry for).
This patch removes the arm1176j-s and makes mpcore the default for armv6k.
Differential Revision: https://reviews.llvm.org/D52594
llvm-svn: 343303
Diffstat (limited to 'llvm/unittests/Support')
| -rw-r--r-- | llvm/unittests/Support/TargetParserTest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/unittests/Support/TargetParserTest.cpp b/llvm/unittests/Support/TargetParserTest.cpp index f67d84ebd1c..68874701635 100644 --- a/llvm/unittests/Support/TargetParserTest.cpp +++ b/llvm/unittests/Support/TargetParserTest.cpp @@ -126,8 +126,6 @@ TEST(TargetParserTest, testARMCPU) { ARM::AEK_DSP, "6")); EXPECT_TRUE(testARMCPU("arm1136jz-s", "armv6", "none", ARM::AEK_DSP, "6")); - EXPECT_TRUE(testARMCPU("arm1176j-s", "armv6k", "none", - ARM::AEK_DSP, "6K")); EXPECT_TRUE(testARMCPU("arm1176jz-s", "armv6kz", "none", ARM::AEK_SEC | ARM::AEK_DSP, "6KZ")); EXPECT_TRUE(testARMCPU("mpcore", "armv6k", "vfpv2", @@ -285,7 +283,7 @@ TEST(TargetParserTest, testARMCPU) { "7-S")); } -static constexpr unsigned NumARMCPUArchs = 83; +static constexpr unsigned NumARMCPUArchs = 82; TEST(TargetParserTest, testARMCPUArchList) { SmallVector<StringRef, NumARMCPUArchs> List; @@ -346,7 +344,7 @@ TEST(TargetParserTest, testARMArch) { testARMArch("armv6", "arm1136jf-s", "v6", ARMBuildAttrs::CPUArch::v6)); EXPECT_TRUE( - testARMArch("armv6k", "arm1176j-s", "v6k", + testARMArch("armv6k", "mpcore", "v6k", ARMBuildAttrs::CPUArch::v6K)); EXPECT_TRUE( testARMArch("armv6t2", "arm1156t2-s", "v6t2", |
