This patch removes the command line options that enabled generation of
FPA and maverick instructions, along with their associated documentation.
* arm.opt (mfp=2, mfp=3, mfpe, mfpe=2, mfpe=3): Delete options.
* arm-fpus.def (fpa, fpe2, fpe3, maverick): Delete FPU types.
* arm-tables.opt: Regenerated.
* doc/invoke.texi: Remove references to deleted options.
R.Index: doc/invoke.texi
===================================================================
--- doc/invoke.texi (revision 188510)
+++ doc/invoke.texi (working copy)
@@ -479,7 +479,7 @@ Objective-C and Objective-C++ Dialects}.
-mapcs-reentrant -mno-apcs-reentrant @gol
-msched-prolog -mno-sched-prolog @gol
-mlittle-endian -mbig-endian -mwords-little-endian @gol
--mfloat-abi=@var{name} -mfpe @gol
+-mfloat-abi=@var{name} @gol
-mfp16-format=@var{name}
-mthumb-interwork -mno-thumb-interwork @gol
-mcpu=@var{name} -march=@var{name} -mfpu=@var{name} @gol
@@ -10823,20 +10823,12 @@ Linux, and not all architectures are rec
unsuccessful the option has no effect.
@item -mfpu=@var{name}
-@itemx -mfpe=@var{number}
-@itemx -mfp=@var{number}
@opindex mfpu
-@opindex mfpe
-@opindex mfp
This specifies what floating-point hardware (or hardware emulation) is
-available on the target. Permissible names are: @samp{fpa}, @samp{fpe2},
-@samp{fpe3}, @samp{maverick}, @samp{vfp}, @samp{vfpv3}, @samp{vfpv3-fp16},
-@samp{vfpv3-d16}, @samp{vfpv3-d16-fp16}, @samp{vfpv3xd}, @samp{vfpv3xd-fp16},
-@samp{neon}, @samp{neon-fp16}, @samp{vfpv4}, @samp{vfpv4-d16},
-@samp{fpv4-sp-d16} and @samp{neon-vfpv4}.
-@option{-mfp} and @option{-mfpe} are synonyms for
-@option{-mfpu}=@samp{fpe}@var{number}, for compatibility with older versions
-of GCC@.
+available on the target. Permissible names are: @samp{vfp}, @samp{vfpv3},
+@samp{vfpv3-fp16}, @samp{vfpv3-d16}, @samp{vfpv3-d16-fp16}, @samp{vfpv3xd},
+@samp{vfpv3xd-fp16}, @samp{neon}, @samp{neon-fp16}, @samp{vfpv4},
+@samp{vfpv4-d16}, @samp{fpv4-sp-d16} and @samp{neon-vfpv4}.
If @option{-msoft-float} is specified this specifies the format of
floating-point values.
Index: config/arm/arm-tables.opt
===================================================================
--- config/arm/arm-tables.opt (revision 188510)
+++ config/arm/arm-tables.opt (working copy)
@@ -360,56 +360,44 @@ Name(arm_fpu) Type(int)
Known ARM FPUs (for use with the -mfpu= option):
EnumValue
-Enum(arm_fpu) String(fpa) Value(0)
+Enum(arm_fpu) String(vfp) Value(0)
EnumValue
-Enum(arm_fpu) String(fpe2) Value(1)
+Enum(arm_fpu) String(vfpv3) Value(1)
EnumValue
-Enum(arm_fpu) String(fpe3) Value(2)
+Enum(arm_fpu) String(vfpv3-fp16) Value(2)
EnumValue
-Enum(arm_fpu) String(maverick) Value(3)
+Enum(arm_fpu) String(vfpv3-d16) Value(3)
EnumValue
-Enum(arm_fpu) String(vfp) Value(4)
+Enum(arm_fpu) String(vfpv3-d16-fp16) Value(4)
EnumValue
-Enum(arm_fpu) String(vfpv3) Value(5)
+Enum(arm_fpu) String(vfpv3xd) Value(5)
EnumValue
-Enum(arm_fpu) String(vfpv3-fp16) Value(6)
+Enum(arm_fpu) String(vfpv3xd-fp16) Value(6)
EnumValue
-Enum(arm_fpu) String(vfpv3-d16) Value(7)
+Enum(arm_fpu) String(neon) Value(7)
EnumValue
-Enum(arm_fpu) String(vfpv3-d16-fp16) Value(8)
+Enum(arm_fpu) String(neon-fp16) Value(8)
EnumValue
-Enum(arm_fpu) String(vfpv3xd) Value(9)
+Enum(arm_fpu) String(vfpv4) Value(9)
EnumValue
-Enum(arm_fpu) String(vfpv3xd-fp16) Value(10)
+Enum(arm_fpu) String(vfpv4-d16) Value(10)
EnumValue
-Enum(arm_fpu) String(neon) Value(11)
+Enum(arm_fpu) String(fpv4-sp-d16) Value(11)
EnumValue
-Enum(arm_fpu) String(neon-fp16) Value(12)
+Enum(arm_fpu) String(neon-vfpv4) Value(12)
EnumValue
-Enum(arm_fpu) String(vfpv4) Value(13)
-
-EnumValue
-Enum(arm_fpu) String(vfpv4-d16) Value(14)
-
-EnumValue
-Enum(arm_fpu) String(fpv4-sp-d16) Value(15)
-
-EnumValue
-Enum(arm_fpu) String(neon-vfpv4) Value(16)
-
-EnumValue
-Enum(arm_fpu) String(vfp3) Value(17)
+Enum(arm_fpu) String(vfp3) Value(13)
Index: config/arm/arm.opt
===================================================================
--- config/arm/arm.opt (revision 188510)
+++ config/arm/arm.opt (working copy)
@@ -126,12 +126,6 @@ Enum(float_abi_type) String(softfp) Valu
EnumValue
Enum(float_abi_type) String(hard) Value(ARM_FLOAT_ABI_HARD)
-mfp=2
-Target RejectNegative Undocumented Alias(mfpu=, fpe2)
-
-mfp=3
-Target RejectNegative Undocumented Alias(mfpu=, fpe3)
-
mfp16-format=
Target RejectNegative Joined Enum(arm_fp16_format_type) Var(arm_fp16_format)
Init(ARM_FP16_FORMAT_NONE)
Specify the __fp16 floating-point format
@@ -149,16 +143,6 @@ Enum(arm_fp16_format_type) String(ieee)
EnumValue
Enum(arm_fp16_format_type) String(alternative)
Value(ARM_FP16_FORMAT_ALTERNATIVE)
-;; Now ignored.
-mfpe
-Target RejectNegative Mask(FPE) Undocumented
-
-mfpe=2
-Target RejectNegative Undocumented Alias(mfpu=, fpe2)
-
-mfpe=3
-Target RejectNegative Undocumented Alias(mfpu=, fpe3)
-
mfpu=
Target RejectNegative Joined Enum(arm_fpu) Var(arm_fpu_index)
Specify the name of the target floating point hardware/format
Index: config/arm/arm-fpus.def
===================================================================
--- config/arm/arm-fpus.def (revision 188510)
+++ config/arm/arm-fpus.def (working copy)
@@ -27,10 +27,6 @@
genopt.sh assumes no whitespace up to the first "," in each entry. */
-ARM_FPU("fpa", ARM_FP_MODEL_FPA, 0, VFP_NONE, false, false)
-ARM_FPU("fpe2", ARM_FP_MODEL_FPA, 2, VFP_NONE, false, false)
-ARM_FPU("fpe3", ARM_FP_MODEL_FPA, 3, VFP_NONE, false, false)
-ARM_FPU("maverick", ARM_FP_MODEL_MAVERICK, 0, VFP_NONE, false, false)
ARM_FPU("vfp", ARM_FP_MODEL_VFP, 2, VFP_REG_D16, false, false)
ARM_FPU("vfpv3", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, false)
ARM_FPU("vfpv3-fp16", ARM_FP_MODEL_VFP, 3, VFP_REG_D32, false, true)
