[PATCH 28/30] [arm] Add a few missing architecture extension options.

[Richard Earnshaw]

Reviewing the list of options for the purposes of writing the
documentation revealed that a small number of options were missing.
Mostly these are aliases for existing options, but in a couple of
cases we lacked the ability to disable certain other options.

        * config/arm/arm-cpus.in (armv7): Add extension +nofp.
        (armv7-r): Add aliases vfpv3xd and vfpv3-d16.
        (armv8-m.main): Add option +nodsp.
        * config/arm/arm-cpu-cdata.h: Regenerated.
---
 gcc/config/arm/arm-cpu-cdata.h | 24 ++++++++++++++++++++++++
 gcc/config/arm/arm-cpus.in     |  6 ++++++
 2 files changed, 30 insertions(+)


diff --git a/gcc/config/arm/arm-cpu-cdata.h b/gcc/config/arm/arm-cpu-cdata.h
index ddfb05c..6cc2ea2 100644
--- a/gcc/config/arm/arm-cpu-cdata.h
+++ b/gcc/config/arm/arm-cpu-cdata.h
@@ -1856,6 +1856,10 @@ static const struct cpu_arch_extension arch_opttab_armv7[] = {
     { ISA_VFPv3,ISA_FP_DBL, isa_nobit }
   },
   {
+    "nofp", true, false,
+    { ISA_ALL_FP, isa_nobit }
+  },
+  {
     "vfpv3-d16", false, true, 
     { ISA_VFPv3,ISA_FP_DBL, isa_nobit }
   },
@@ -2003,6 +2007,14 @@ static const struct cpu_arch_extension arch_opttab_armv7_r[] = {
     "noidiv", true, false,
     { isa_bit_adiv, isa_nobit }
   },
+  {
+    "vfpv3xd", false, true, 
+    { ISA_VFPv3, isa_nobit }
+  },
+  {
+    "vfpv3-d16", false, true, 
+    { ISA_VFPv3,ISA_FP_DBL, isa_nobit }
+  },
   { NULL, false, false, {isa_nobit}}
 };
 
@@ -2023,6 +2035,14 @@ static const struct cpu_arch_extension arch_opttab_armv7e_m[] = {
     "nofp", true, false,
     { ISA_ALL_FP, isa_nobit }
   },
+  {
+    "vfpv4-sp-d16", false, true, 
+    { ISA_VFPv4, isa_nobit }
+  },
+  {
+    "fpv5-d16", false, true, 
+    { ISA_FPv5,ISA_FP_DBL, isa_nobit }
+  },
   { NULL, false, false, {isa_nobit}}
 };
 
@@ -2111,6 +2131,10 @@ static const struct cpu_arch_extension arch_opttab_armv8_m_main[] = {
     "nofp", true, false,
     { ISA_ALL_FP, isa_nobit }
   },
+  {
+    "nodsp", true, false,
+    { isa_bit_ARMv7em, isa_nobit }
+  },
   { NULL, false, false, {isa_nobit}}
 };
 
diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
index 739de45..b0c0eae 100644
--- a/gcc/config/arm/arm-cpus.in
+++ b/gcc/config/arm/arm-cpus.in
@@ -228,6 +228,7 @@ begin arch armv7
 # fp => VFPv3-d16 (only useful for the A+R profile subset).
  option fp add VFPv3 FP_DBL
  optalias vfpv3-d16 fp
+ option nofp remove ALL_FP
 end arch armv7
 
 begin arch armv7-a
@@ -281,7 +282,9 @@ begin arch armv7-r
  isa ARMv7r
 # ARMv7-r uses VFPv3-d16
  option fp.sp add VFPv3
+ optalias vfpv3xd fp.sp
  option fp add VFPv3 FP_DBL
+ optalias vfpv3-d16 fp
  option idiv add bit_adiv
  option nofp remove ALL_FP
  option noidiv remove bit_adiv
@@ -303,8 +306,10 @@ begin arch armv7e-m
  isa ARMv7em
 # fp => VFPv4-sp-d16; fpv5 => FPv5-sp-d16; fp.dp => FPv5-d16
  option fp add VFPv4
+ optalias vfpv4-sp-d16 fp
  option fpv5 add FPv5
  option fp.dp add FPv5 FP_DBL
+ optalias fpv5-d16 fp.dp
  option nofp remove ALL_FP
 end arch armv7e-m
 
@@ -359,6 +364,7 @@ begin arch armv8-m.main
  option fp add FPv5
  option fp.dp add FPv5 FP_DBL
  option nofp remove ALL_FP
+ option nodsp remove bit_ARMv7em
 end arch armv8-m.main
 
 begin arch iwmmxt