[llvm] de7729d - [clang][ARM] Remove non-existent arm9312 CPU

[David Spickett via llvm-commits]

Author: David Spickett
Date: 2021-05-25T08:58:24Z
New Revision: de7729d47a8ba0060dd6a6190d20d698539f76fe

URL: https://github.com/llvm/llvm-project/commit/de7729d47a8ba0060dd6a6190d20d698539f76fe
DIFF: https://github.com/llvm/llvm-project/commit/de7729d47a8ba0060dd6a6190d20d698539f76fe.diff

LOG: [clang][ARM] Remove non-existent arm9312 CPU

I cannot find documentation on this CPU, and it
is not supported by the Arm Compiler 5 product either.

It was likely a mistake or a different name for the
"ep9312", which is an Arm based Cirrus Logic chip.

Reviewed By: peter.smith

Differential Revision: https://reviews.llvm.org/D103024

Added: 
    

Modified: 
    llvm/include/llvm/Support/ARMTargetParser.def
    llvm/unittests/Support/TargetParserTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Support/ARMTargetParser.def b/llvm/include/llvm/Support/ARMTargetParser.def
index 691b209757c77..6ce857a43e000 100644
--- a/llvm/include/llvm/Support/ARMTargetParser.def
+++ b/llvm/include/llvm/Support/ARMTargetParser.def
@@ -220,7 +220,6 @@ ARM_CPU_NAME("arm9tdmi", ARMV4T, FK_NONE, false, ARM::AEK_NONE)
 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
index f89a7f09ae52c..fd1ed7a0839b6 100644
--- a/llvm/unittests/Support/TargetParserTest.cpp
+++ b/llvm/unittests/Support/TargetParserTest.cpp
@@ -143,7 +143,6 @@ INSTANTIATE_TEST_SUITE_P(
         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 @@ INSTANTIATE_TEST_SUITE_P(
                          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<StringRef, NumARMCPUArchs> List;