diff --git a/llvm/include/llvm/Support/ARMTargetParser.def b/llvm/include/llvm/Support/ARMTargetParser.def --- a/llvm/include/llvm/Support/ARMTargetParser.def +++ b/llvm/include/llvm/Support/ARMTargetParser.def @@ -220,7 +220,6 @@ ARM_CPU_NAME("arm920", ARMV4T, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("arm920t", ARMV4T, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("arm922t", ARMV4T, FK_NONE, false, ARM::AEK_NONE) -ARM_CPU_NAME("arm9312", ARMV4T, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("arm940t", ARMV4T, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("ep9312", ARMV4T, FK_NONE, false, ARM::AEK_NONE) ARM_CPU_NAME("arm10tdmi", ARMV5T, FK_NONE, true, ARM::AEK_NONE) diff --git a/llvm/unittests/Support/TargetParserTest.cpp b/llvm/unittests/Support/TargetParserTest.cpp --- a/llvm/unittests/Support/TargetParserTest.cpp +++ b/llvm/unittests/Support/TargetParserTest.cpp @@ -143,7 +143,6 @@ ARMCPUTestParams("arm920", "armv4t", "none", ARM::AEK_NONE, "4T"), ARMCPUTestParams("arm920t", "armv4t", "none", ARM::AEK_NONE, "4T"), ARMCPUTestParams("arm922t", "armv4t", "none", ARM::AEK_NONE, "4T"), - ARMCPUTestParams("arm9312", "armv4t", "none", ARM::AEK_NONE, "4T"), ARMCPUTestParams("arm940t", "armv4t", "none", ARM::AEK_NONE, "4T"), ARMCPUTestParams("ep9312", "armv4t", "none", ARM::AEK_NONE, "4T"), ARMCPUTestParams("arm10tdmi", "armv5t", "none", ARM::AEK_NONE, "5T"), @@ -389,7 +388,7 @@ ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP, "7-S"))); -static constexpr unsigned NumARMCPUArchs = 91; +static constexpr unsigned NumARMCPUArchs = 90; TEST(TargetParserTest, testARMCPUArchList) { SmallVector List;