arm: remove options to select the FPA Remove the command-line options to choose the FPA (or FPE - an emulated FPA). From this point on it should be impossible to assemble the old FPA instructions.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 12610fd..73d9f8e 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c
@@ -31215,14 +31215,7 @@ {"marmv5t", &legacy_cpu, ARM_ARCH_V5T, N_("use -march=armv5t")}, {"mv5e", &legacy_cpu, ARM_ARCH_V5TE, N_("use -march=armv5te")}, {"marmv5e", &legacy_cpu, ARM_ARCH_V5TE, N_("use -march=armv5te")}, - - /* Floating point variants -- don't add any more to this list either. */ - {"mfpe-old", &legacy_fpu, FPU_ARCH_FPE, N_("use -mfpu=fpe")}, - {"mfpa10", &legacy_fpu, FPU_ARCH_FPA, N_("use -mfpu=fpa10")}, - {"mfpa11", &legacy_fpu, FPU_ARCH_FPA, N_("use -mfpu=fpa11")}, - {"mno-fpu", &legacy_fpu, ARM_ARCH_NONE, - N_("use either -mfpu=softfpa or -mfpu=softvfp")}, - + {"mno-fpu", &legacy_fpu, ARM_ARCH_NONE, N_("use -mfpu=softvfp")}, {NULL, NULL, ARM_ARCH_NONE, NULL} }; @@ -32187,13 +32180,6 @@ static const struct arm_option_fpu_value_table arm_fpus[] = { {"softfpa", FPU_NONE}, - {"fpe", FPU_ARCH_FPE}, - {"fpe2", FPU_ARCH_FPE}, - {"fpe3", FPU_ARCH_FPA}, /* Third release supports LFM/SFM. */ - {"fpa", FPU_ARCH_FPA}, - {"fpa10", FPU_ARCH_FPA}, - {"fpa11", FPU_ARCH_FPA}, - {"arm7500fe", FPU_ARCH_FPA}, {"softvfp", FPU_ARCH_SOFTVFP}, {"softvfp+vfp", FPU_ARCH_VFP_V2}, {"vfp", FPU_ARCH_VFP_V2},
diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi index 067ed4d..6d98c62 100644 --- a/gas/doc/c-arm.texi +++ b/gas/doc/c-arm.texi
@@ -492,13 +492,6 @@ assembler will issue an error message if an attempt is made to assemble an instruction which will not execute on the target floating point unit. The following format options are recognized: -@code{softfpa}, -@code{fpe}, -@code{fpe2}, -@code{fpe3}, -@code{fpa}, -@code{fpa10}, -@code{fpa11}, @code{arm7500fe}, @code{softvfp}, @code{softvfp+vfp}, @@ -539,7 +532,7 @@ The default is dependent on the processor selected. For Architecture 5 or later, the default is to assemble for VFP instructions; for earlier -architectures the default is to assemble for FPA instructions. +architectures the default is to assemble for no floating point. @cindex @code{-mfp16-format=} command-line option @item -mfp16-format=@var{format}
diff --git a/include/opcode/arm.h b/include/opcode/arm.h index c921f76..ddc199e 100644 --- a/include/opcode/arm.h +++ b/include/opcode/arm.h
@@ -249,9 +249,6 @@ /* Deprecated. */ #define FPU_ARCH_SOFTVFP ARM_FEATURE_COPROC (FPU_ENDIAN_PURE) -#define FPU_ARCH_FPE ARM_FEATURE_COPROC (FPU_FPA_EXT_V1) -#define FPU_ARCH_FPA ARM_FEATURE_COPROC (FPU_FPA) - #define FPU_ARCH_VFP_V1xD ARM_FEATURE_COPROC (FPU_VFP_V1xD) #define FPU_ARCH_VFP_V1 ARM_FEATURE_COPROC (FPU_VFP_V1) #define FPU_ARCH_VFP_V2 ARM_FEATURE_COPROC (FPU_VFP_V2)