Fix memory leak in RiscV assembler.
[binutils-gdb.git] / gas / config / tc-aarch64.c
index 8d5cc5194de17fd8ed2b6ea3e38ce4810ecefed3..5f5ec1b3dbcba62fa20d339126e50311f651a952 100644 (file)
 #include "dw2gencfi.h"
 #include "dwarf2dbg.h"
 
-/* Types of processor to assemble for.  */
-#ifndef CPU_DEFAULT
-#define CPU_DEFAULT AARCH64_ARCH_V8
-#endif
-
 #define streq(a, b)          (strcmp (a, b) == 0)
 
 #define END_OF_INSN '\0'
@@ -56,7 +51,7 @@ static const aarch64_feature_set *mcpu_cpu_opt = NULL;
 static const aarch64_feature_set *march_cpu_opt = NULL;
 
 /* Constants for known architecture features.  */
-static const aarch64_feature_set cpu_default = CPU_DEFAULT;
+static const aarch64_feature_set cpu_default = AARCH64_ARCH_FEATURES (V8A);
 
 /* Currently active instruction sequence.  */
 static aarch64_instr_sequence *insn_sequence = NULL;
@@ -241,13 +236,6 @@ set_default_error (void)
   inst.parsing_error.data[0].i = SEF_DEFAULT_ERROR;
 }
 
-static inline void
-set_expected_error (unsigned int flags)
-{
-  set_error (AARCH64_OPDE_SYNTAX_ERROR, NULL);
-  inst.parsing_error.data[0].i = flags;
-}
-
 static inline void
 set_syntax_error (const char *error)
 {
@@ -312,6 +300,7 @@ struct reloc_entry
   BASIC_REG_TYPE(ZAT)  /* za[0-15] (ZA tile) */                        \
   BASIC_REG_TYPE(ZATH) /* za[0-15]h (ZA tile horizontal slice) */      \
   BASIC_REG_TYPE(ZATV) /* za[0-15]v (ZA tile vertical slice) */        \
+  BASIC_REG_TYPE(ZT0)  /* zt0 */                                       \
   /* Typecheck: any 64-bit int reg         (inc SP exc XZR).  */       \
   MULTI_REG_TYPE(R64_SP, REG_TYPE(R_64) | REG_TYPE(SP_64))             \
   /* Typecheck: same, plus SVE registers.  */                          \
@@ -348,6 +337,13 @@ struct reloc_entry
                 | REG_TYPE(FP_B) | REG_TYPE(FP_H)                      \
                 | REG_TYPE(FP_S) | REG_TYPE(FP_D) | REG_TYPE(FP_Q)     \
                 | REG_TYPE(Z) | REG_TYPE(P))                           \
+  /* Likewise, but with predicate-as-counter registers added.  */      \
+  MULTI_REG_TYPE(R_ZR_SP_BHSDQ_VZP_PN, REG_TYPE(R_32) | REG_TYPE(R_64) \
+                | REG_TYPE(SP_32) | REG_TYPE(SP_64)                    \
+                | REG_TYPE(ZR_32) | REG_TYPE(ZR_64) | REG_TYPE(V)      \
+                | REG_TYPE(FP_B) | REG_TYPE(FP_H)                      \
+                | REG_TYPE(FP_S) | REG_TYPE(FP_D) | REG_TYPE(FP_Q)     \
+                | REG_TYPE(Z) | REG_TYPE(P) | REG_TYPE(PN))            \
   /* Any integer register; used for error messages only.  */           \
   MULTI_REG_TYPE(R_N, REG_TYPE(R_32) | REG_TYPE(R_64)                  \
                 | REG_TYPE(SP_32) | REG_TYPE(SP_64)                    \
@@ -474,6 +470,8 @@ get_reg_expected_msg (unsigned int mask, unsigned int seen)
        PN is expected, and vice versa, so the issue at this point is
        "predicate-like" vs. "not predicate-like".  */
     return N_("expected an SVE predicate register at operand %d");
+  if (mask == reg_type_masks[REG_TYPE_PN])
+    return N_("expected an SVE predicate-as-counter register at operand %d");
   if (mask == reg_type_masks[REG_TYPE_VZ])
     return N_("expected a vector register at operand %d");
   if (mask == reg_type_masks[REG_TYPE_ZP])
@@ -481,11 +479,11 @@ get_reg_expected_msg (unsigned int mask, unsigned int seen)
   if (mask == reg_type_masks[REG_TYPE_VZP])
     return N_("expected a vector or predicate register at operand %d");
 
-  /* ZA-related registers.  */
+  /* SME-related registers.  */
   if (mask == reg_type_masks[REG_TYPE_ZA])
     return N_("expected a ZA array vector at operand %d");
-  if (mask == reg_type_masks[REG_TYPE_ZA_ZAT])
-    return N_("expected 'za' or a ZA tile at operand %d");
+  if (mask == (reg_type_masks[REG_TYPE_ZA_ZAT] | reg_type_masks[REG_TYPE_ZT0]))
+    return N_("expected ZT0 or a ZA mask at operand %d");
   if (mask == reg_type_masks[REG_TYPE_ZAT])
     return N_("expected a ZA tile at operand %d");
   if (mask == reg_type_masks[REG_TYPE_ZATHV])
@@ -1277,7 +1275,10 @@ parse_typed_reg (char **ccp, aarch64_reg_type type,
   if (!(flags & PTR_FULL_REG) && skip_past_char (&str, '['))
     {
       /* Reject Sn[index] syntax.  */
-      if (!is_typed_vecreg)
+      if (reg->type != REG_TYPE_Z
+         && reg->type != REG_TYPE_PN
+         && reg->type != REG_TYPE_ZT0
+         && !is_typed_vecreg)
        {
          first_error (_("this type of register can't be indexed"));
          return NULL;
@@ -1344,6 +1345,14 @@ eq_vector_type_el (struct vector_type_el e1, struct vector_type_el e2)
          && e1.index == e2.index);
 }
 
+/* Return the register number mask for registers of type REG_TYPE.  */
+
+static inline int
+reg_type_mask (aarch64_reg_type reg_type)
+{
+  return reg_type == REG_TYPE_P ? 15 : 31;
+}
+
 /* This function parses a list of vector registers of type TYPE.
    On success, it returns the parsed register list information in the
    following encoded format:
@@ -1372,7 +1381,7 @@ parse_vector_reg_list (char **ccp, aarch64_reg_type type,
   char *str = *ccp;
   int nb_regs;
   struct vector_type_el typeinfo, typeinfo_first;
-  int val, val_range;
+  uint32_t val, val_range, mask;
   int in_range;
   int ret_val;
   bool error = false;
@@ -1393,9 +1402,10 @@ parse_vector_reg_list (char **ccp, aarch64_reg_type type,
   typeinfo_first.element_size = 0;
   typeinfo_first.index = 0;
   ret_val = 0;
-  val = -1;
-  val_range = -1;
+  val = -1u;
+  val_range = -1u;
   in_range = 0;
+  mask = reg_type_mask (type);
   do
     {
       if (in_range)
@@ -1431,7 +1441,7 @@ parse_vector_reg_list (char **ccp, aarch64_reg_type type,
                (_("invalid range in vector register list"));
              error = true;
            }
-         val_range = (val_range + 1) & 0x1f;
+         val_range = (val_range + 1) & mask;
        }
       else
        {
@@ -1448,11 +1458,11 @@ parse_vector_reg_list (char **ccp, aarch64_reg_type type,
       if (! error)
        for (;;)
          {
-           ret_val |= val_range << (5 * nb_regs);
+           ret_val |= val_range << ((5 * nb_regs) & 31);
            nb_regs++;
            if (val_range == val)
              break;
-           val_range = (val_range + 1) & 0x1f;
+           val_range = (val_range + 1) & mask;
          }
       in_range = 0;
       ptr_flags |= PTR_GOOD_MATCH;
@@ -4316,8 +4326,10 @@ parse_adrp (char **str)
 
 /* Parse a symbolic operand such as "pow2" at *STR.  ARRAY is an array
    of SIZE tokens in which index I gives the token for field value I,
-   or is null if field value I is invalid.  REG_TYPE says which register
-   names should be treated as registers rather than as symbolic immediates.
+   or is null if field value I is invalid.  If the symbolic operand
+   can also be given as a 0-based integer, REG_TYPE says which register
+   names should be treated as registers rather than as symbolic immediates
+   while parsing that integer.  REG_TYPE is REG_TYPE_MAX otherwise.
 
    Return true on success, moving *STR past the operand and storing the
    field value in *VAL.  */
@@ -4345,6 +4357,9 @@ parse_enum_string (char **str, int64_t *val, const char *const *array,
        return true;
       }
 
+  if (reg_type == REG_TYPE_MAX)
+    return false;
+
   if (!parse_immediate_expression (&p, &exp, reg_type))
     return false;
 
@@ -4874,7 +4889,8 @@ parse_sys_reg (char **str, htab_t sys_regs,
                  "name '%s'"), buf);
       if (!pstatefield_p
          && !aarch64_sys_ins_reg_supported_p (cpu_variant, o->name,
-                                              o->value, o->flags, o->features))
+                                              o->value, o->flags,
+                                              &o->features))
        as_bad (_("selected processor does not support system register "
                  "name '%s'"), buf);
       if (aarch64_sys_reg_deprecated_p (o->flags))
@@ -4971,6 +4987,12 @@ parse_sys_ins_reg (char **str, htab_t sys_ins_regs)
       goto failure;                                            \
   } while (0)
 
+#define po_strict_enum_or_fail(array) do {                     \
+    if (!parse_enum_string (&str, &val, array,                 \
+                           ARRAY_SIZE (array), REG_TYPE_MAX))  \
+      goto failure;                                            \
+  } while (0)
+
 #define po_misc_or_fail(expr) do {                             \
     if (!expr)                                                 \
       goto failure;                                            \
@@ -5827,6 +5849,10 @@ output_operand_error_record (const operand_error_record *record, char *str)
       else if ((detail->data[0].i & -detail->data[0].i) == detail->data[0].i)
        handler (_("expected a list of %d registers at operand %d -- `%s'"),
                 get_log2 (detail->data[0].i), idx + 1, str);
+      else if (detail->data[0].i == 0x14)
+       handler (_("expected a list of %d or %d registers at"
+                  " operand %d -- `%s'"),
+                2, 4, idx + 1, str);
       else
        handler (_("invalid number of registers in the list"
                   " at operand %d -- `%s'"), idx + 1, str);
@@ -5836,6 +5862,10 @@ output_operand_error_record (const operand_error_record *record, char *str)
       if (detail->data[0].i == (1 << 1))
        handler (_("the register list must have a stride of %d"
                   " at operand %d -- `%s'"), 1, idx + 1, str);
+      else if (detail->data[0].i == 0x12 || detail->data[0].i == 0x102)
+       handler (_("the register list must have a stride of %d or %d"
+                  " at operand %d -- `%s`"), 1,
+                detail->data[0].i == 0x12 ? 4 : 8, idx + 1, str);
       else
        handler (_("invalid register stride at operand %d -- `%s'"),
                 idx + 1, str);
@@ -6437,16 +6467,18 @@ ldst_lo12_determine_real_reloc_type (void)
   return reloc_ldst_lo12[inst.reloc.type - BFD_RELOC_AARCH64_LDST_LO12][logsz];
 }
 
-/* Check whether a register list REGINFO is valid.  The registers must be
-   numbered in increasing order (modulo 32).  They must also have a
-   consistent stride.
+/* Check whether a register list REGINFO is valid.  The registers have type
+   REG_TYPE and must be numbered in increasing order (modulo the register
+   bank size).  They must have a consistent stride.
 
    Return true if the list is valid, describing it in LIST if so.  */
 
 static bool
-reg_list_valid_p (uint32_t reginfo, struct aarch64_reglist *list)
+reg_list_valid_p (uint32_t reginfo, struct aarch64_reglist *list,
+                 aarch64_reg_type reg_type)
 {
-  uint32_t i, nb_regs, prev_regno, incr;
+  uint32_t i, nb_regs, prev_regno, incr, mask;
+  mask = reg_type_mask (reg_type);
 
   nb_regs = 1 + (reginfo & 0x3);
   reginfo >>= 2;
@@ -6461,7 +6493,7 @@ reg_list_valid_p (uint32_t reginfo, struct aarch64_reglist *list)
       uint32_t curr_regno, curr_incr;
       reginfo >>= 5;
       curr_regno = reginfo & 0x1f;
-      curr_incr = (curr_regno - prev_regno) & 0x1f;
+      curr_incr = (curr_regno - prev_regno) & mask;
       if (curr_incr == 0)
        return false;
       else if (i == 1)
@@ -6491,9 +6523,10 @@ parse_operands (char *str, const aarch64_opcode *opcode)
   clear_error ();
   skip_whitespace (str);
 
-  if (AARCH64_CPU_HAS_ANY_FEATURES (*opcode->avariant,
-                                   AARCH64_FEATURE_SVE
-                                   | AARCH64_FEATURE_SVE2))
+  if (AARCH64_CPU_HAS_FEATURE (*opcode->avariant, SME2))
+    imm_reg_type = REG_TYPE_R_ZR_SP_BHSDQ_VZP_PN;
+  else if (AARCH64_CPU_HAS_FEATURE (*opcode->avariant, SVE)
+          || AARCH64_CPU_HAS_FEATURE (*opcode->avariant, SVE2))
     imm_reg_type = REG_TYPE_R_ZR_SP_BHSDQ_VZP;
   else
     imm_reg_type = REG_TYPE_R_ZR_BHSDQ_V;
@@ -6623,6 +6656,7 @@ parse_operands (char *str, const aarch64_opcode *opcode)
        case AARCH64_OPND_SVE_Zm_16:
        case AARCH64_OPND_SVE_Zn:
        case AARCH64_OPND_SVE_Zt:
+       case AARCH64_OPND_SME_Zm:
          reg_type = REG_TYPE_Z;
          goto vector_reg;
 
@@ -6630,6 +6664,9 @@ parse_operands (char *str, const aarch64_opcode *opcode)
        case AARCH64_OPND_SVE_PNg4_10:
        case AARCH64_OPND_SVE_PNn:
        case AARCH64_OPND_SVE_PNt:
+       case AARCH64_OPND_SME_PNd3:
+       case AARCH64_OPND_SME_PNg3:
+       case AARCH64_OPND_SME_PNn:
          reg_type = REG_TYPE_PN;
          goto vector_reg;
 
@@ -6683,10 +6720,24 @@ parse_operands (char *str, const aarch64_opcode *opcode)
 
        case AARCH64_OPND_SVE_Zm3_INDEX:
        case AARCH64_OPND_SVE_Zm3_22_INDEX:
+       case AARCH64_OPND_SVE_Zm3_19_INDEX:
        case AARCH64_OPND_SVE_Zm3_11_INDEX:
        case AARCH64_OPND_SVE_Zm4_11_INDEX:
        case AARCH64_OPND_SVE_Zm4_INDEX:
        case AARCH64_OPND_SVE_Zn_INDEX:
+       case AARCH64_OPND_SME_Zm_INDEX1:
+       case AARCH64_OPND_SME_Zm_INDEX2:
+       case AARCH64_OPND_SME_Zm_INDEX3_1:
+       case AARCH64_OPND_SME_Zm_INDEX3_2:
+       case AARCH64_OPND_SME_Zm_INDEX3_10:
+       case AARCH64_OPND_SME_Zm_INDEX4_1:
+       case AARCH64_OPND_SME_Zm_INDEX4_10:
+       case AARCH64_OPND_SME_Zn_INDEX1_16:
+       case AARCH64_OPND_SME_Zn_INDEX2_15:
+       case AARCH64_OPND_SME_Zn_INDEX2_16:
+       case AARCH64_OPND_SME_Zn_INDEX3_14:
+       case AARCH64_OPND_SME_Zn_INDEX3_15:
+       case AARCH64_OPND_SME_Zn_INDEX4_14:
          reg_type = REG_TYPE_Z;
          goto vector_reg_index;
 
@@ -6700,21 +6751,43 @@ parse_operands (char *str, const aarch64_opcode *opcode)
          reg = aarch64_reg_parse (&str, reg_type, &vectype);
          if (!reg)
            goto failure;
-         if (vectype.type == NT_invtype || !(vectype.defined & NTA_HASINDEX))
+         if (!(vectype.defined & NTA_HASINDEX))
            goto failure;
 
+         if (reg->type == REG_TYPE_Z && vectype.type == NT_invtype)
+           /* Unqualified Zn[index] is allowed in LUTI2 instructions.  */
+           info->qualifier = AARCH64_OPND_QLF_NIL;
+         else
+           {
+             if (vectype.type == NT_invtype)
+               goto failure;
+             info->qualifier = vectype_to_qualifier (&vectype);
+             if (info->qualifier == AARCH64_OPND_QLF_NIL)
+               goto failure;
+           }
+
          info->reglane.regno = reg->number;
          info->reglane.index = vectype.index;
-         info->qualifier = vectype_to_qualifier (&vectype);
-         if (info->qualifier == AARCH64_OPND_QLF_NIL)
-           goto failure;
          break;
 
        case AARCH64_OPND_SVE_ZnxN:
        case AARCH64_OPND_SVE_ZtxN:
+       case AARCH64_OPND_SME_Zdnx2:
+       case AARCH64_OPND_SME_Zdnx4:
+       case AARCH64_OPND_SME_Zmx2:
+       case AARCH64_OPND_SME_Zmx4:
+       case AARCH64_OPND_SME_Znx2:
+       case AARCH64_OPND_SME_Znx4:
+       case AARCH64_OPND_SME_Ztx2_STRIDED:
+       case AARCH64_OPND_SME_Ztx4_STRIDED:
          reg_type = REG_TYPE_Z;
          goto vector_reg_list;
 
+       case AARCH64_OPND_SME_Pdx2:
+       case AARCH64_OPND_SME_PdxN:
+         reg_type = REG_TYPE_P;
+         goto vector_reg_list;
+
        case AARCH64_OPND_LVn:
        case AARCH64_OPND_LVt:
        case AARCH64_OPND_LVt_AL:
@@ -6738,13 +6811,13 @@ parse_operands (char *str, const aarch64_opcode *opcode)
              if (val == PARSE_FAIL)
                goto failure;
 
-             if (! reg_list_valid_p (val, &info->reglist))
+             if (! reg_list_valid_p (val, &info->reglist, reg_type))
                {
                  set_fatal_syntax_error (_("invalid register list"));
                  goto failure;
                }
 
-             if (vectype.width != 0 && *str != ',')
+             if ((int) vectype.width > 0 && *str != ',')
                {
                  set_fatal_syntax_error
                    (_("expected element type rather than vector type"));
@@ -6764,7 +6837,7 @@ parse_operands (char *str, const aarch64_opcode *opcode)
                goto failure;
              if (!(vectype.defined & NTA_HASTYPE))
                {
-                 if (reg_type == REG_TYPE_Z)
+                 if (reg_type == REG_TYPE_Z || reg_type == REG_TYPE_P)
                    set_fatal_syntax_error (_("missing type suffix"));
                  goto failure;
                }
@@ -6817,6 +6890,8 @@ parse_operands (char *str, const aarch64_opcode *opcode)
        case AARCH64_OPND_SVE_SHLIMM_PRED:
        case AARCH64_OPND_SVE_SHLIMM_UNPRED:
        case AARCH64_OPND_SVE_SHLIMM_UNPRED_22:
+       case AARCH64_OPND_SME_SHRIMM4:
+       case AARCH64_OPND_SME_SHRIMM5:
        case AARCH64_OPND_SVE_SHRIMM_PRED:
        case AARCH64_OPND_SVE_SHRIMM_UNPRED:
        case AARCH64_OPND_SVE_SHRIMM_UNPRED_22:
@@ -7686,12 +7761,68 @@ parse_operands (char *str, const aarch64_opcode *opcode)
          inst.base.operands[i].prfop = aarch64_prfops + val;
          break;
 
+       case AARCH64_OPND_RPRFMOP:
+         po_enum_or_fail (aarch64_rprfmop_array);
+         info->imm.value = val;
+         break;
+
        case AARCH64_OPND_BARRIER_PSB:
          val = parse_barrier_psb (&str, &(info->hint_option));
          if (val == PARSE_FAIL)
            goto failure;
          break;
 
+       case AARCH64_OPND_SME_ZT0:
+         po_reg_or_fail (REG_TYPE_ZT0);
+         break;
+
+       case AARCH64_OPND_SME_ZT0_INDEX:
+         reg = aarch64_reg_parse (&str, REG_TYPE_ZT0, &vectype);
+         if (!reg || vectype.type != NT_invtype)
+           goto failure;
+         if (!(vectype.defined & NTA_HASINDEX))
+           {
+             set_syntax_error (_("missing register index"));
+             goto failure;
+           }
+         info->imm.value = vectype.index;
+         break;
+
+       case AARCH64_OPND_SME_ZT0_LIST:
+         if (*str != '{')
+           {
+             set_expected_reglist_error (REG_TYPE_ZT0, parse_reg (&str));
+             goto failure;
+           }
+         str++;
+         if (!parse_typed_reg (&str, REG_TYPE_ZT0, &vectype, PTR_IN_REGLIST))
+           goto failure;
+         if (*str != '}')
+           {
+             set_syntax_error (_("expected '}' after ZT0"));
+             goto failure;
+           }
+         str++;
+         break;
+
+       case AARCH64_OPND_SME_PNn3_INDEX1:
+       case AARCH64_OPND_SME_PNn3_INDEX2:
+         reg = aarch64_reg_parse (&str, REG_TYPE_PN, &vectype);
+         if (!reg)
+           goto failure;
+         if (!(vectype.defined & NTA_HASINDEX))
+           {
+             set_syntax_error (_("missing register index"));
+             goto failure;
+           }
+         info->reglane.regno = reg->number;
+         info->reglane.index = vectype.index;
+         if (vectype.type == NT_invtype)
+           info->qualifier = AARCH64_OPND_QLF_NIL;
+         else
+           info->qualifier = vectype_to_qualifier (&vectype);
+         break;
+
        case AARCH64_OPND_BTI_TARGET:
          val = parse_bti_operand (&str, &(info->hint_option));
          if (val == PARSE_FAIL)
@@ -7708,7 +7839,9 @@ parse_operands (char *str, const aarch64_opcode *opcode)
          break;
 
        case AARCH64_OPND_SME_ZA_HV_idx_src:
+       case AARCH64_OPND_SME_ZA_HV_idx_srcxN:
        case AARCH64_OPND_SME_ZA_HV_idx_dest:
+       case AARCH64_OPND_SME_ZA_HV_idx_destxN:
        case AARCH64_OPND_SME_ZA_HV_idx_ldstr:
          if (operands[i] == AARCH64_OPND_SME_ZA_HV_idx_ldstr
              ? !parse_sme_za_hv_tiles_operand_with_braces (&str,
@@ -7727,6 +7860,12 @@ parse_operands (char *str, const aarch64_opcode *opcode)
          info->imm.value = val;
          break;
 
+       case AARCH64_OPND_SME_ZA_array_off1x4:
+       case AARCH64_OPND_SME_ZA_array_off2x2:
+       case AARCH64_OPND_SME_ZA_array_off2x4:
+       case AARCH64_OPND_SME_ZA_array_off3_0:
+       case AARCH64_OPND_SME_ZA_array_off3_5:
+       case AARCH64_OPND_SME_ZA_array_off3x2:
        case AARCH64_OPND_SME_ZA_array_off4:
          if (!parse_dual_indexed_reg (&str, REG_TYPE_ZA,
                                       &info->indexed_za, &qualifier, 0))
@@ -7734,6 +7873,12 @@ parse_operands (char *str, const aarch64_opcode *opcode)
          info->qualifier = qualifier;
          break;
 
+       case AARCH64_OPND_SME_VLxN_10:
+       case AARCH64_OPND_SME_VLxN_13:
+         po_strict_enum_or_fail (aarch64_sme_vlxn_array);
+         info->imm.value = val;
+         break;
+
        case AARCH64_OPND_MOPS_ADDR_Rd:
        case AARCH64_OPND_MOPS_ADDR_Rs:
          po_char_or_fail ('[');
@@ -8386,7 +8531,10 @@ static const reg_entry reg_names[] = {
   REGSET16S (za, h, ZATH), REGSET16S (ZA, H, ZATH),
 
   /* SME ZA tile registers (vertical slice).  */
-  REGSET16S (za, v, ZATV), REGSET16S (ZA, V, ZATV)
+  REGSET16S (za, v, ZATV), REGSET16S (ZA, V, ZATV),
+
+  /* SME2 ZT0.  */
+  REGDEF (zt0, 0, ZT0), REGDEF (ZT0, 0, ZT0)
 };
 
 #undef REGDEF
@@ -9996,161 +10144,80 @@ struct aarch64_cpu_option_table
 /* This list should, at a minimum, contain all the cpu names
    recognized by GCC.  */
 static const struct aarch64_cpu_option_table aarch64_cpus[] = {
-  {"all", AARCH64_ANY, NULL},
-  {"cortex-a34", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                 AARCH64_FEATURE_CRC), "Cortex-A34"},
-  {"cortex-a35", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                 AARCH64_FEATURE_CRC), "Cortex-A35"},
-  {"cortex-a53", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                 AARCH64_FEATURE_CRC), "Cortex-A53"},
-  {"cortex-a57", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                 AARCH64_FEATURE_CRC), "Cortex-A57"},
-  {"cortex-a72", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                 AARCH64_FEATURE_CRC), "Cortex-A72"},
-  {"cortex-a73", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                 AARCH64_FEATURE_CRC), "Cortex-A73"},
-  {"cortex-a55", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_RCPC | AARCH64_FEATURE_F16 | AARCH64_FEATURE_DOTPROD),
+  {"all",              AARCH64_ALL_FEATURES, NULL},
+  {"cortex-a34",       AARCH64_CPU_FEATURES (V8A, 1, CRC), "Cortex-A34"},
+  {"cortex-a35",       AARCH64_CPU_FEATURES (V8A, 1, CRC), "Cortex-A35"},
+  {"cortex-a53",       AARCH64_CPU_FEATURES (V8A, 1, CRC), "Cortex-A53"},
+  {"cortex-a57",       AARCH64_CPU_FEATURES (V8A, 1, CRC), "Cortex-A57"},
+  {"cortex-a72",       AARCH64_CPU_FEATURES (V8A, 1, CRC), "Cortex-A72"},
+  {"cortex-a73",       AARCH64_CPU_FEATURES (V8A, 1, CRC), "Cortex-A73"},
+  {"cortex-a55",       AARCH64_CPU_FEATURES (V8_2A, 3, RCPC, F16, DOTPROD),
                                  "Cortex-A55"},
-  {"cortex-a75", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_RCPC | AARCH64_FEATURE_F16 | AARCH64_FEATURE_DOTPROD),
+  {"cortex-a75",       AARCH64_CPU_FEATURES (V8_2A, 3, RCPC, F16, DOTPROD),
                                  "Cortex-A75"},
-  {"cortex-a76", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_RCPC | AARCH64_FEATURE_F16 | AARCH64_FEATURE_DOTPROD),
+  {"cortex-a76",       AARCH64_CPU_FEATURES (V8_2A, 3, RCPC, F16, DOTPROD),
                                  "Cortex-A76"},
-  {"cortex-a76ae", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                   AARCH64_FEATURE_F16 | AARCH64_FEATURE_RCPC
-                                   | AARCH64_FEATURE_DOTPROD
-                                   | AARCH64_FEATURE_SSBS),
-                                   "Cortex-A76AE"},
-  {"cortex-a77", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_F16 | AARCH64_FEATURE_RCPC
-                                 | AARCH64_FEATURE_DOTPROD
-                                 | AARCH64_FEATURE_SSBS),
-                                 "Cortex-A77"},
-  {"cortex-a65", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_F16 | AARCH64_FEATURE_RCPC
-                                 | AARCH64_FEATURE_DOTPROD
-                                 | AARCH64_FEATURE_SSBS),
-                                 "Cortex-A65"},
-  {"cortex-a65ae", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                   AARCH64_FEATURE_F16 | AARCH64_FEATURE_RCPC
-                                   | AARCH64_FEATURE_DOTPROD
-                                   | AARCH64_FEATURE_SSBS),
-                                   "Cortex-A65AE"},
-  {"cortex-a78", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                 AARCH64_FEATURE_F16
-                 | AARCH64_FEATURE_RCPC
-                 | AARCH64_FEATURE_DOTPROD
-                 | AARCH64_FEATURE_SSBS
-                 | AARCH64_FEATURE_PROFILE),
-   "Cortex-A78"},
-  {"cortex-a78ae", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                   AARCH64_FEATURE_F16
-                   | AARCH64_FEATURE_RCPC
-                   | AARCH64_FEATURE_DOTPROD
-                   | AARCH64_FEATURE_SSBS
-                   | AARCH64_FEATURE_PROFILE),
-   "Cortex-A78AE"},
-  {"cortex-a78c", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                   AARCH64_FEATURE_DOTPROD
-                   | AARCH64_FEATURE_F16
-                   | AARCH64_FEATURE_FLAGM
-                   | AARCH64_FEATURE_PAC
-                   | AARCH64_FEATURE_PROFILE
-                   | AARCH64_FEATURE_RCPC
-                   | AARCH64_FEATURE_SSBS),
-   "Cortex-A78C"},
-  {"cortex-a510", AARCH64_FEATURE (AARCH64_ARCH_V9,
-                  AARCH64_FEATURE_BFLOAT16
-                  | AARCH64_FEATURE_I8MM
-                  | AARCH64_FEATURE_MEMTAG
-                  | AARCH64_FEATURE_SVE2_BITPERM),
-   "Cortex-A510"},
-  {"cortex-a710", AARCH64_FEATURE (AARCH64_ARCH_V9,
-                  AARCH64_FEATURE_BFLOAT16
-                  | AARCH64_FEATURE_I8MM
-                  | AARCH64_FEATURE_MEMTAG
-                  | AARCH64_FEATURE_SVE2_BITPERM),
-   "Cortex-A710"},
-  {"ares", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_RCPC | AARCH64_FEATURE_F16
-                                 | AARCH64_FEATURE_DOTPROD
-                                 | AARCH64_FEATURE_PROFILE),
-                                 "Ares"},
-  {"exynos-m1", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                                AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO),
-                               "Samsung Exynos M1"},
-  {"falkor", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                             AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO
-                             | AARCH64_FEATURE_RDMA),
-   "Qualcomm Falkor"},
-  {"neoverse-e1", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_RCPC | AARCH64_FEATURE_F16
-                                 | AARCH64_FEATURE_DOTPROD
-                                 | AARCH64_FEATURE_SSBS),
-                                 "Neoverse E1"},
-  {"neoverse-n1", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                                 AARCH64_FEATURE_RCPC | AARCH64_FEATURE_F16
-                                 | AARCH64_FEATURE_DOTPROD
-                                 | AARCH64_FEATURE_PROFILE),
-                                 "Neoverse N1"},
-  {"neoverse-n2", AARCH64_FEATURE (AARCH64_ARCH_V8_5,
-                                  AARCH64_FEATURE_BFLOAT16
-                                | AARCH64_FEATURE_I8MM
-                                | AARCH64_FEATURE_F16
-                                | AARCH64_FEATURE_SVE
-                                | AARCH64_FEATURE_SVE2
-                                | AARCH64_FEATURE_SVE2_BITPERM
-                                | AARCH64_FEATURE_MEMTAG
-                                | AARCH64_FEATURE_RNG),
-                                "Neoverse N2"},
-  {"neoverse-v1", AARCH64_FEATURE (AARCH64_ARCH_V8_4,
-                           AARCH64_FEATURE_PROFILE
-                         | AARCH64_FEATURE_CVADP
-                         | AARCH64_FEATURE_SVE
-                         | AARCH64_FEATURE_SSBS
-                         | AARCH64_FEATURE_RNG
-                         | AARCH64_FEATURE_F16
-                         | AARCH64_FEATURE_BFLOAT16
-                         | AARCH64_FEATURE_I8MM), "Neoverse V1"},
-  {"qdf24xx", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                              AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO
-                              | AARCH64_FEATURE_RDMA),
-   "Qualcomm QDF24XX"},
-  {"saphira", AARCH64_FEATURE (AARCH64_ARCH_V8_4,
-                              AARCH64_FEATURE_CRYPTO | AARCH64_FEATURE_PROFILE),
-   "Qualcomm Saphira"},
-  {"thunderx", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                               AARCH64_FEATURE_CRC | AARCH64_FEATURE_CRYPTO),
-   "Cavium ThunderX"},
-  {"vulcan", AARCH64_FEATURE (AARCH64_ARCH_V8_1,
-                             AARCH64_FEATURE_CRYPTO),
-  "Broadcom Vulcan"},
+  {"cortex-a76ae",     AARCH64_CPU_FEATURES (V8_2A, 4, F16, RCPC, DOTPROD,
+                                             SSBS), "Cortex-A76AE"},
+  {"cortex-a77",       AARCH64_CPU_FEATURES (V8_2A, 4, F16, RCPC, DOTPROD,
+                                             SSBS), "Cortex-A77"},
+  {"cortex-a65",       AARCH64_CPU_FEATURES (V8_2A, 4, F16, RCPC, DOTPROD,
+                                             SSBS), "Cortex-A65"},
+  {"cortex-a65ae",     AARCH64_CPU_FEATURES (V8_2A, 4, F16, RCPC, DOTPROD,
+                                             SSBS), "Cortex-A65AE"},
+  {"cortex-a78",       AARCH64_CPU_FEATURES (V8_2A, 5, F16, RCPC, DOTPROD,
+                                             SSBS, PROFILE), "Cortex-A78"},
+  {"cortex-a78ae",     AARCH64_CPU_FEATURES (V8_2A, 5, F16, RCPC, DOTPROD,
+                                             SSBS, PROFILE), "Cortex-A78AE"},
+  {"cortex-a78c",      AARCH64_CPU_FEATURES (V8_2A, 7, DOTPROD, F16, FLAGM,
+                                             PAC, PROFILE, RCPC, SSBS),
+                       "Cortex-A78C"},
+  {"cortex-a510",      AARCH64_CPU_FEATURES (V9A, 4, BFLOAT16, I8MM, MEMTAG,
+                                             SVE2_BITPERM), "Cortex-A510"},
+  {"cortex-a520",      AARCH64_CPU_FEATURES (V9_2A, 2, MEMTAG, SVE2_BITPERM),
+                       "Cortex-A520"},
+  {"cortex-a710",      AARCH64_CPU_FEATURES (V9A, 4, BFLOAT16, I8MM, MEMTAG,
+                                             SVE2_BITPERM), "Cortex-A710"},
+  {"cortex-a720",      AARCH64_CPU_FEATURES (V9_2A, 3, MEMTAG, PROFILE,
+                                             SVE2_BITPERM), "Cortex-A720"},
+  {"ares",             AARCH64_CPU_FEATURES (V8_2A, 4, RCPC, F16, DOTPROD,
+                                             PROFILE), "Ares"},
+  {"exynos-m1",                AARCH64_CPU_FEATURES (V8A, 3, CRC, SHA2, AES),
+                       "Samsung Exynos M1"},
+  {"falkor",           AARCH64_CPU_FEATURES (V8A, 4, CRC, SHA2, AES, RDMA),
+                       "Qualcomm Falkor"},
+  {"neoverse-e1",      AARCH64_CPU_FEATURES (V8_2A, 4, RCPC, F16, DOTPROD,
+                                             SSBS), "Neoverse E1"},
+  {"neoverse-n1",      AARCH64_CPU_FEATURES (V8_2A, 4, RCPC, F16, DOTPROD,
+                                             PROFILE), "Neoverse N1"},
+  {"neoverse-n2",      AARCH64_CPU_FEATURES (V8_5A, 8, BFLOAT16, I8MM, F16,
+                                             SVE, SVE2, SVE2_BITPERM, MEMTAG,
+                                             RNG), "Neoverse N2"},
+  {"neoverse-v1",      AARCH64_CPU_FEATURES (V8_4A, 8, PROFILE, CVADP, SVE,
+                                             SSBS, RNG, F16, BFLOAT16, I8MM),
+                       "Neoverse V1"},
+  {"qdf24xx",          AARCH64_CPU_FEATURES (V8A, 4, CRC, SHA2, AES, RDMA),
+                       "Qualcomm QDF24XX"},
+  {"saphira",          AARCH64_CPU_FEATURES (V8_4A, 3, SHA2, AES, PROFILE),
+                       "Qualcomm Saphira"},
+  {"thunderx",         AARCH64_CPU_FEATURES (V8A, 3, CRC, SHA2, AES),
+                       "Cavium ThunderX"},
+  {"vulcan",           AARCH64_CPU_FEATURES (V8_1A, 2, SHA2, AES),
+                       "Broadcom Vulcan"},
   /* The 'xgene-1' name is an older name for 'xgene1', which was used
      in earlier releases and is superseded by 'xgene1' in all
      tools.  */
-  {"xgene-1", AARCH64_ARCH_V8, "APM X-Gene 1"},
-  {"xgene1", AARCH64_ARCH_V8, "APM X-Gene 1"},
-  {"xgene2", AARCH64_FEATURE (AARCH64_ARCH_V8,
-                             AARCH64_FEATURE_CRC), "APM X-Gene 2"},
-  {"cortex-r82", AARCH64_ARCH_V8_R, "Cortex-R82"},
-  {"cortex-x1", AARCH64_FEATURE (AARCH64_ARCH_V8_2,
-                AARCH64_FEATURE_F16
-                | AARCH64_FEATURE_RCPC
-                | AARCH64_FEATURE_DOTPROD
-                | AARCH64_FEATURE_SSBS
-                | AARCH64_FEATURE_PROFILE),
-                "Cortex-X1"},
-  {"cortex-x2", AARCH64_FEATURE (AARCH64_ARCH_V9,
-                AARCH64_FEATURE_BFLOAT16
-                | AARCH64_FEATURE_I8MM
-                | AARCH64_FEATURE_MEMTAG
-                | AARCH64_FEATURE_SVE2_BITPERM),
-                "Cortex-X2"},
-  {"generic", AARCH64_ARCH_V8, NULL},
-
-  {NULL, AARCH64_ARCH_NONE, NULL}
+  {"xgene-1",          AARCH64_ARCH_FEATURES (V8A), "APM X-Gene 1"},
+  {"xgene1",           AARCH64_ARCH_FEATURES (V8A), "APM X-Gene 1"},
+  {"xgene2",           AARCH64_CPU_FEATURES (V8A, 1, CRC), "APM X-Gene 2"},
+  {"cortex-r82",       AARCH64_ARCH_FEATURES (V8R), "Cortex-R82"},
+  {"cortex-x1",                AARCH64_CPU_FEATURES (V8_2A, 5, F16, RCPC, DOTPROD,
+                                             SSBS, PROFILE), "Cortex-X1"},
+  {"cortex-x2",                AARCH64_CPU_FEATURES (V9A, 4, BFLOAT16, I8MM, MEMTAG,
+                                             SVE2_BITPERM), "Cortex-X2"},
+  {"generic",          AARCH64_ARCH_FEATURES (V8A), NULL},
+
+  {NULL,               AARCH64_NO_FEATURES, NULL}
 };
 
 struct aarch64_arch_option_table
@@ -10162,22 +10229,22 @@ struct aarch64_arch_option_table
 /* This list should, at a minimum, contain all the architecture names
    recognized by GCC.  */
 static const struct aarch64_arch_option_table aarch64_archs[] = {
-  {"all", AARCH64_ANY},
-  {"armv8-a", AARCH64_ARCH_V8},
-  {"armv8.1-a", AARCH64_ARCH_V8_1},
-  {"armv8.2-a", AARCH64_ARCH_V8_2},
-  {"armv8.3-a", AARCH64_ARCH_V8_3},
-  {"armv8.4-a", AARCH64_ARCH_V8_4},
-  {"armv8.5-a", AARCH64_ARCH_V8_5},
-  {"armv8.6-a", AARCH64_ARCH_V8_6},
-  {"armv8.7-a", AARCH64_ARCH_V8_7},
-  {"armv8.8-a", AARCH64_ARCH_V8_8},
-  {"armv8-r",  AARCH64_ARCH_V8_R},
-  {"armv9-a",  AARCH64_ARCH_V9},
-  {"armv9.1-a",        AARCH64_ARCH_V9_1},
-  {"armv9.2-a",        AARCH64_ARCH_V9_2},
-  {"armv9.3-a",        AARCH64_ARCH_V9_3},
-  {NULL, AARCH64_ARCH_NONE}
+  {"all", AARCH64_ALL_FEATURES},
+  {"armv8-a", AARCH64_ARCH_FEATURES (V8A)},
+  {"armv8.1-a", AARCH64_ARCH_FEATURES (V8_1A)},
+  {"armv8.2-a", AARCH64_ARCH_FEATURES (V8_2A)},
+  {"armv8.3-a", AARCH64_ARCH_FEATURES (V8_3A)},
+  {"armv8.4-a", AARCH64_ARCH_FEATURES (V8_4A)},
+  {"armv8.5-a", AARCH64_ARCH_FEATURES (V8_5A)},
+  {"armv8.6-a", AARCH64_ARCH_FEATURES (V8_6A)},
+  {"armv8.7-a", AARCH64_ARCH_FEATURES (V8_7A)},
+  {"armv8.8-a", AARCH64_ARCH_FEATURES (V8_8A)},
+  {"armv8-r",  AARCH64_ARCH_FEATURES (V8R)},
+  {"armv9-a",  AARCH64_ARCH_FEATURES (V9A)},
+  {"armv9.1-a",        AARCH64_ARCH_FEATURES (V9_1A)},
+  {"armv9.2-a",        AARCH64_ARCH_FEATURES (V9_2A)},
+  {"armv9.3-a",        AARCH64_ARCH_FEATURES (V9_3A)},
+  {NULL, AARCH64_NO_FEATURES}
 };
 
 /* ISA extensions.  */
@@ -10189,106 +10256,61 @@ struct aarch64_option_cpu_value_table
 };
 
 static const struct aarch64_option_cpu_value_table aarch64_features[] = {
-  {"crc",              AARCH64_FEATURE (AARCH64_FEATURE_CRC, 0),
-                       AARCH64_ARCH_NONE},
-  {"crypto",           AARCH64_FEATURE (AARCH64_FEATURE_CRYPTO, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)},
-  {"fp",               AARCH64_FEATURE (AARCH64_FEATURE_FP, 0),
-                       AARCH64_ARCH_NONE},
-  {"lse",              AARCH64_FEATURE (AARCH64_FEATURE_LSE, 0),
-                       AARCH64_ARCH_NONE},
-  {"simd",             AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_FP, 0)},
-  {"pan",              AARCH64_FEATURE (AARCH64_FEATURE_PAN, 0),
-                       AARCH64_ARCH_NONE},
-  {"lor",              AARCH64_FEATURE (AARCH64_FEATURE_LOR, 0),
-                       AARCH64_ARCH_NONE},
-  {"ras",              AARCH64_FEATURE (AARCH64_FEATURE_RAS, 0),
-                       AARCH64_ARCH_NONE},
-  {"rdma",             AARCH64_FEATURE (AARCH64_FEATURE_RDMA, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)},
-  {"fp16",             AARCH64_FEATURE (AARCH64_FEATURE_F16, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_FP, 0)},
-  {"fp16fml",          AARCH64_FEATURE (AARCH64_FEATURE_F16_FML, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_F16, 0)},
-  {"profile",          AARCH64_FEATURE (AARCH64_FEATURE_PROFILE, 0),
-                       AARCH64_ARCH_NONE},
-  {"sve",              AARCH64_FEATURE (AARCH64_FEATURE_SVE, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_COMPNUM, 0)},
-  {"tme",              AARCH64_FEATURE (AARCH64_FEATURE_TME, 0),
-                       AARCH64_ARCH_NONE},
-  {"compnum",          AARCH64_FEATURE (AARCH64_FEATURE_COMPNUM, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_F16
-                                        | AARCH64_FEATURE_SIMD, 0)},
-  {"rcpc",             AARCH64_FEATURE (AARCH64_FEATURE_RCPC, 0),
-                       AARCH64_ARCH_NONE},
-  {"dotprod",          AARCH64_FEATURE (AARCH64_FEATURE_DOTPROD, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)},
-  {"sha2",             AARCH64_FEATURE (AARCH64_FEATURE_SHA2, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_FP, 0)},
-  {"sb",               AARCH64_FEATURE (AARCH64_FEATURE_SB, 0),
-                       AARCH64_ARCH_NONE},
-  {"predres",          AARCH64_FEATURE (AARCH64_FEATURE_PREDRES, 0),
-                       AARCH64_ARCH_NONE},
-  {"aes",              AARCH64_FEATURE (AARCH64_FEATURE_AES, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)},
-  {"sm4",              AARCH64_FEATURE (AARCH64_FEATURE_SM4, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)},
-  {"sha3",             AARCH64_FEATURE (AARCH64_FEATURE_SHA3, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SHA2, 0)},
-  {"rng",              AARCH64_FEATURE (AARCH64_FEATURE_RNG, 0),
-                       AARCH64_ARCH_NONE},
-  {"ssbs",             AARCH64_FEATURE (AARCH64_FEATURE_SSBS, 0),
-                       AARCH64_ARCH_NONE},
-  {"memtag",           AARCH64_FEATURE (AARCH64_FEATURE_MEMTAG, 0),
-                       AARCH64_ARCH_NONE},
-  {"sve2",             AARCH64_FEATURE (AARCH64_FEATURE_SVE2, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE, 0)},
-  {"sve2-sm4",         AARCH64_FEATURE (AARCH64_FEATURE_SVE2_SM4, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE2
-                                        | AARCH64_FEATURE_SM4, 0)},
-  {"sve2-aes",         AARCH64_FEATURE (AARCH64_FEATURE_SVE2_AES, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE2
-                                        | AARCH64_FEATURE_AES, 0)},
-  {"sve2-sha3",                AARCH64_FEATURE (AARCH64_FEATURE_SVE2_SHA3, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE2
-                                        | AARCH64_FEATURE_SHA3, 0)},
-  {"sve2-bitperm",     AARCH64_FEATURE (AARCH64_FEATURE_SVE2_BITPERM, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE2, 0)},
-  {"sme",              AARCH64_FEATURE (AARCH64_FEATURE_SME, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE2
-                                        | AARCH64_FEATURE_BFLOAT16, 0)},
-  {"sme-f64",          AARCH64_FEATURE (AARCH64_FEATURE_SME_F64F64, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
-  {"sme-f64f64",       AARCH64_FEATURE (AARCH64_FEATURE_SME_F64F64, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
-  {"sme-i64",          AARCH64_FEATURE (AARCH64_FEATURE_SME_I16I64, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
-  {"sme-i16i64",       AARCH64_FEATURE (AARCH64_FEATURE_SME_I16I64, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
-  {"sme2",             AARCH64_FEATURE (AARCH64_FEATURE_SME2, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
-  {"bf16",             AARCH64_FEATURE (AARCH64_FEATURE_BFLOAT16, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_FP, 0)},
-  {"i8mm",             AARCH64_FEATURE (AARCH64_FEATURE_I8MM, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SIMD, 0)},
-  {"f32mm",            AARCH64_FEATURE (AARCH64_FEATURE_F32MM, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE, 0)},
-  {"f64mm",            AARCH64_FEATURE (AARCH64_FEATURE_F64MM, 0),
-                       AARCH64_FEATURE (AARCH64_FEATURE_SVE, 0)},
-  {"ls64",             AARCH64_FEATURE (AARCH64_FEATURE_LS64, 0),
-                       AARCH64_ARCH_NONE},
-  {"flagm",            AARCH64_FEATURE (AARCH64_FEATURE_FLAGM, 0),
-                       AARCH64_ARCH_NONE},
-  {"pauth",            AARCH64_FEATURE (AARCH64_FEATURE_PAC, 0),
-                       AARCH64_ARCH_NONE},
-  {"mops",             AARCH64_FEATURE (AARCH64_FEATURE_MOPS, 0),
-                       AARCH64_ARCH_NONE},
-  {"hbc",              AARCH64_FEATURE (AARCH64_FEATURE_HBC, 0),
-                       AARCH64_ARCH_NONE},
-  {"cssc",             AARCH64_FEATURE (AARCH64_FEATURE_CSSC, 0),
-                       AARCH64_ARCH_NONE},
-  {NULL,               AARCH64_ARCH_NONE, AARCH64_ARCH_NONE},
+  {"crc",              AARCH64_FEATURE (CRC), AARCH64_NO_FEATURES},
+  {"crypto",           AARCH64_FEATURES (2, AES, SHA2),
+                       AARCH64_FEATURE (SIMD)},
+  {"fp",               AARCH64_FEATURE (FP), AARCH64_NO_FEATURES},
+  {"lse",              AARCH64_FEATURE (LSE), AARCH64_NO_FEATURES},
+  {"simd",             AARCH64_FEATURE (SIMD), AARCH64_FEATURE (FP)},
+  {"pan",              AARCH64_FEATURE (PAN), AARCH64_NO_FEATURES},
+  {"lor",              AARCH64_FEATURE (LOR), AARCH64_NO_FEATURES},
+  {"ras",              AARCH64_FEATURE (RAS), AARCH64_NO_FEATURES},
+  {"rdma",             AARCH64_FEATURE (RDMA), AARCH64_FEATURE (SIMD)},
+  {"fp16",             AARCH64_FEATURE (F16), AARCH64_FEATURE (FP)},
+  {"fp16fml",          AARCH64_FEATURE (F16_FML), AARCH64_FEATURE (F16)},
+  {"profile",          AARCH64_FEATURE (PROFILE), AARCH64_NO_FEATURES},
+  {"sve",              AARCH64_FEATURE (SVE), AARCH64_FEATURE (COMPNUM)},
+  {"tme",              AARCH64_FEATURE (TME), AARCH64_NO_FEATURES},
+  {"compnum",          AARCH64_FEATURE (COMPNUM),
+                       AARCH64_FEATURES (2, F16, SIMD)},
+  {"rcpc",             AARCH64_FEATURE (RCPC), AARCH64_NO_FEATURES},
+  {"dotprod",          AARCH64_FEATURE (DOTPROD), AARCH64_FEATURE (SIMD)},
+  {"sha2",             AARCH64_FEATURE (SHA2), AARCH64_FEATURE (FP)},
+  {"sb",               AARCH64_FEATURE (SB), AARCH64_NO_FEATURES},
+  {"predres",          AARCH64_FEATURE (PREDRES), AARCH64_NO_FEATURES},
+  {"aes",              AARCH64_FEATURE (AES), AARCH64_FEATURE (SIMD)},
+  {"sm4",              AARCH64_FEATURE (SM4), AARCH64_FEATURE (SIMD)},
+  {"sha3",             AARCH64_FEATURE (SHA3), AARCH64_FEATURE (SHA2)},
+  {"rng",              AARCH64_FEATURE (RNG), AARCH64_NO_FEATURES},
+  {"ssbs",             AARCH64_FEATURE (SSBS), AARCH64_NO_FEATURES},
+  {"memtag",           AARCH64_FEATURE (MEMTAG), AARCH64_NO_FEATURES},
+  {"sve2",             AARCH64_FEATURE (SVE2), AARCH64_FEATURE (SVE)},
+  {"sve2-sm4",         AARCH64_FEATURE (SVE2_SM4),
+                       AARCH64_FEATURES (2, SVE2, SM4)},
+  {"sve2-aes",         AARCH64_FEATURE (SVE2_AES),
+                       AARCH64_FEATURES (2, SVE2, AES)},
+  {"sve2-sha3",                AARCH64_FEATURE (SVE2_SHA3),
+                       AARCH64_FEATURES (2, SVE2, SHA3)},
+  {"sve2-bitperm",     AARCH64_FEATURE (SVE2_BITPERM),
+                       AARCH64_FEATURE (SVE2)},
+  {"sme",              AARCH64_FEATURE (SME),
+                       AARCH64_FEATURES (2, SVE2, BFLOAT16)},
+  {"sme-f64",          AARCH64_FEATURE (SME_F64F64), AARCH64_FEATURE (SME)},
+  {"sme-f64f64",       AARCH64_FEATURE (SME_F64F64), AARCH64_FEATURE (SME)},
+  {"sme-i64",          AARCH64_FEATURE (SME_I16I64), AARCH64_FEATURE (SME)},
+  {"sme-i16i64",       AARCH64_FEATURE (SME_I16I64), AARCH64_FEATURE (SME)},
+  {"sme2",             AARCH64_FEATURE (SME2), AARCH64_FEATURE (SME)},
+  {"bf16",             AARCH64_FEATURE (BFLOAT16), AARCH64_FEATURE (FP)},
+  {"i8mm",             AARCH64_FEATURE (I8MM), AARCH64_FEATURE (SIMD)},
+  {"f32mm",            AARCH64_FEATURE (F32MM), AARCH64_FEATURE (SVE)},
+  {"f64mm",            AARCH64_FEATURE (F64MM), AARCH64_FEATURE (SVE)},
+  {"ls64",             AARCH64_FEATURE (LS64), AARCH64_NO_FEATURES},
+  {"flagm",            AARCH64_FEATURE (FLAGM), AARCH64_NO_FEATURES},
+  {"pauth",            AARCH64_FEATURE (PAC), AARCH64_NO_FEATURES},
+  {"mops",             AARCH64_FEATURE (MOPS), AARCH64_NO_FEATURES},
+  {"hbc",              AARCH64_FEATURE (HBC), AARCH64_NO_FEATURES},
+  {"cssc",             AARCH64_FEATURE (CSSC), AARCH64_NO_FEATURES},
+  {NULL,               AARCH64_NO_FEATURES, AARCH64_NO_FEATURES},
 };
 
 struct aarch64_long_option_table
@@ -10304,14 +10326,15 @@ static aarch64_feature_set
 aarch64_feature_disable_set (aarch64_feature_set set)
 {
   const struct aarch64_option_cpu_value_table *opt;
-  aarch64_feature_set prev = 0;
+  aarch64_feature_set prev = AARCH64_NO_FEATURES;
 
-  while (prev != set) {
-    prev = set;
-    for (opt = aarch64_features; opt->name != NULL; opt++)
-      if (AARCH64_CPU_HAS_ANY_FEATURES (opt->require, set))
-        AARCH64_MERGE_FEATURE_SETS (set, set, opt->value);
-  }
+  while (!AARCH64_CPU_HAS_ALL_FEATURES (prev, set))
+    {
+      prev = set;
+      for (opt = aarch64_features; opt->name != NULL; opt++)
+       if (AARCH64_CPU_HAS_ANY_FEATURES (opt->require, set))
+         AARCH64_MERGE_FEATURE_SETS (set, set, opt->value);
+    }
   return set;
 }
 
@@ -10320,14 +10343,15 @@ static aarch64_feature_set
 aarch64_feature_enable_set (aarch64_feature_set set)
 {
   const struct aarch64_option_cpu_value_table *opt;
-  aarch64_feature_set prev = 0;
+  aarch64_feature_set prev = AARCH64_NO_FEATURES;
 
-  while (prev != set) {
-    prev = set;
-    for (opt = aarch64_features; opt->name != NULL; opt++)
-      if (AARCH64_CPU_HAS_FEATURE (set, opt->value))
-        AARCH64_MERGE_FEATURE_SETS (set, set, opt->require);
-  }
+  while (!AARCH64_CPU_HAS_ALL_FEATURES (prev, set))
+    {
+      prev = set;
+      for (opt = aarch64_features; opt->name != NULL; opt++)
+       if (AARCH64_CPU_HAS_ALL_FEATURES (set, opt->value))
+         AARCH64_MERGE_FEATURE_SETS (set, set, opt->require);
+    }
   return set;
 }
 
@@ -10409,7 +10433,7 @@ aarch64_parse_features (const char *str, const aarch64_feature_set **opt_p,
            else
              {
                set = aarch64_feature_disable_set (opt->value);
-               AARCH64_CLEAR_FEATURE (*ext_set, *ext_set, set);
+               AARCH64_CLEAR_FEATURES (*ext_set, *ext_set, set);
              }
            break;
          }