diff options
| -rw-r--r-- | llvm/include/llvm/Support/ARMTargetParser.def | 5 | ||||
| -rw-r--r-- | llvm/unittests/Support/TargetParserTest.cpp | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/llvm/include/llvm/Support/ARMTargetParser.def b/llvm/include/llvm/Support/ARMTargetParser.def index 8650b5342b1..adf64390ff2 100644 --- a/llvm/include/llvm/Support/ARMTargetParser.def +++ b/llvm/include/llvm/Support/ARMTargetParser.def @@ -208,10 +208,9 @@ ARM_CPU_NAME("arm926ej-s", ARMV5TEJ, FK_NONE, true, ARM::AEK_NONE) ARM_CPU_NAME("arm1136j-s", ARMV6, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("arm1136jf-s", ARMV6, FK_VFPV2, true, ARM::AEK_NONE) ARM_CPU_NAME("arm1136jz-s", ARMV6, FK_NONE, false, ARM::AEK_NONE) -ARM_CPU_NAME("arm1176j-s", ARMV6K, FK_NONE, true, ARM::AEK_NONE) -ARM_CPU_NAME("arm1176jz-s", ARMV6KZ, FK_NONE, false, ARM::AEK_NONE) -ARM_CPU_NAME("mpcore", ARMV6K, FK_VFPV2, false, ARM::AEK_NONE) +ARM_CPU_NAME("mpcore", ARMV6K, FK_VFPV2, true, ARM::AEK_NONE) ARM_CPU_NAME("mpcorenovfp", ARMV6K, FK_NONE, false, ARM::AEK_NONE) +ARM_CPU_NAME("arm1176jz-s", ARMV6KZ, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("arm1176jzf-s", ARMV6KZ, FK_VFPV2, true, ARM::AEK_NONE) ARM_CPU_NAME("arm1156t2-s", ARMV6T2, FK_NONE, true, ARM::AEK_NONE) ARM_CPU_NAME("arm1156t2f-s", ARMV6T2, FK_VFPV2, false, ARM::AEK_NONE) 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", |
