1 files changed, 16 insertions, 16 deletions
diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 40854ce5ae1..66be62d3a82 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -9041,7 +9041,7 @@ bool ARMAsmParser::parseDirectiveArch(SMLoc L) {
 
   unsigned ID = ARMTargetParser::parseArch(Arch);
 
-  if (ID == ARM::INVALID_ARCH) {
+  if (ID == ARM::AK_INVALID) {
     Error(L, "Unknown arch name");
     return false;
   }
@@ -9190,49 +9190,49 @@ static const struct {
   const uint64_t Enabled;
   const uint64_t Disabled;
 } FPUs[] = {
-    {/* ID */ ARM::VFP,
+    {/* ID */ ARM::FK_VFP,
      /* Enabled */ ARM::FeatureVFP2,
      /* Disabled */ ARM::FeatureNEON},
-    {/* ID */ ARM::VFPV2,
+    {/* ID */ ARM::FK_VFPV2,
      /* Enabled */ ARM::FeatureVFP2,
      /* Disabled */ ARM::FeatureNEON},
-    {/* ID */ ARM::VFPV3,
+    {/* ID */ ARM::FK_VFPV3,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3,
      /* Disabled */ ARM::FeatureNEON | ARM::FeatureD16},
-    {/* ID */ ARM::VFPV3_D16,
+    {/* ID */ ARM::FK_VFPV3_D16,
      /* Enable */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureD16,
      /* Disabled */ ARM::FeatureNEON},
-    {/* ID */ ARM::VFPV4,
+    {/* ID */ ARM::FK_VFPV4,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4,
      /* Disabled */ ARM::FeatureNEON | ARM::FeatureD16},
-    {/* ID */ ARM::VFPV4_D16,
+    {/* ID */ ARM::FK_VFPV4_D16,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureD16,
      /* Disabled */ ARM::FeatureNEON},
-    {/* ID */ ARM::FPV5_D16,
+    {/* ID */ ARM::FK_FPV5_D16,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureFPARMv8 | ARM::FeatureD16,
      /* Disabled */ ARM::FeatureNEON | ARM::FeatureCrypto},
-    {/* ID */ ARM::FP_ARMV8,
+    {/* ID */ ARM::FK_FP_ARMV8,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureFPARMv8,
      /* Disabled */ ARM::FeatureNEON | ARM::FeatureCrypto | ARM::FeatureD16},
-    {/* ID */ ARM::NEON,
+    {/* ID */ ARM::FK_NEON,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureNEON,
      /* Disabled */ ARM::FeatureD16},
-    {/* ID */ ARM::NEON_VFPV4,
+    {/* ID */ ARM::FK_NEON_VFPV4,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureNEON,
      /* Disabled */ ARM::FeatureD16},
-    {/* ID */ ARM::NEON_FP_ARMV8,
+    {/* ID */ ARM::FK_NEON_FP_ARMV8,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureFPARMv8 | ARM::FeatureNEON,
      /* Disabled */ ARM::FeatureCrypto | ARM::FeatureD16},
-    {/* ID */ ARM::CRYPTO_NEON_FP_ARMV8,
+    {/* ID */ ARM::FK_CRYPTO_NEON_FP_ARMV8,
      /* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 |
          ARM::FeatureFPARMv8 | ARM::FeatureNEON | ARM::FeatureCrypto,
      /* Disabled */ ARM::FeatureD16},
-    {ARM::SOFTVFP, 0, 0},
+    {ARM::FK_SOFTVFP, 0, 0},
 };
 
 /// parseDirectiveFPU
@@ -9243,7 +9243,7 @@ bool ARMAsmParser::parseDirectiveFPU(SMLoc L) {
 
   unsigned ID = ARMTargetParser::parseFPU(FPU);
 
-  if (ID == ARM::INVALID_FPU) {
+  if (ID == ARM::FK_INVALID) {
     Error(FPUNameLoc, "Unknown FPU name");
     return false;
   }
@@ -9897,7 +9897,7 @@ bool ARMAsmParser::parseDirectiveObjectArch(SMLoc L) {
 
   unsigned ID = ARMTargetParser::parseArch(Arch);
 
-  if (ID == ARM::INVALID_ARCH) {
+  if (ID == ARM::AK_INVALID) {
     Error(ArchLoc, "unknown architecture '" + Arch + "'");
     Parser.eatToEndOfStatement();
     return false;