diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 41bcfb8dee2..12e8f7cfc84 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -121,13 +121,13 @@ static bool out_of_range_p (offsetT value, offsetT bits) # define FPU_DEFAULT FPU_ARCH_FPA # elif defined (TE_NetBSD) # ifdef OBJ_ELF -# define FPU_DEFAULT FPU_ARCH_VFP /* Soft-float, but VFP order. */ +# define FPU_DEFAULT FPU_ARCH_SOFTVFP /* Soft-float, but VFP order. */ # else /* Legacy a.out format. */ # define FPU_DEFAULT FPU_ARCH_FPA /* Soft-float, but FPA order. */ # endif # elif defined (TE_VXWORKS) -# define FPU_DEFAULT FPU_ARCH_VFP /* Soft-float, VFP order. */ +# define FPU_DEFAULT FPU_ARCH_SOFTVFP /* Soft-float, VFP order. */ # else /* For backwards compatibility, default to FPA. */ # define FPU_DEFAULT FPU_ARCH_FPA @@ -31966,65 +31966,103 @@ static const struct arm_arch_option_table arm_archs[] = ARM_ARCH_OPT ("armv4xm", ARM_ARCH_V4xM, FPU_ARCH_FPA), ARM_ARCH_OPT ("armv4t", ARM_ARCH_V4T, FPU_ARCH_FPA), ARM_ARCH_OPT ("armv4txm", ARM_ARCH_V4TxM, FPU_ARCH_FPA), - ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_VFP), - ARM_ARCH_OPT ("armv5t", ARM_ARCH_V5T, FPU_ARCH_VFP), - ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_VFP), - ARM_ARCH_OPT2 ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv5texp", ARM_ARCH_V5TExP, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv5tej", ARM_ARCH_V5TEJ, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6", ARM_ARCH_V6, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6j", ARM_ARCH_V6, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6k", ARM_ARCH_V6K, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6z", ARM_ARCH_V6Z, FPU_ARCH_VFP, armv5te), + ARM_ARCH_OPT ("armv5", ARM_ARCH_V5, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT ("armv5t", ARM_ARCH_V5T, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT ("armv5txm", ARM_ARCH_V5TxM, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT2 ("armv5te", ARM_ARCH_V5TE, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv5texp", ARM_ARCH_V5TExP, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv5tej", ARM_ARCH_V5TEJ, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6", ARM_ARCH_V6, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6j", ARM_ARCH_V6, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6k", ARM_ARCH_V6K, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6z", ARM_ARCH_V6Z, FPU_ARCH_SOFTVFP, + armv5te), /* The official spelling of this variant is ARMv6KZ, the name "armv6zk" is kept to preserve existing behaviour. */ - ARM_ARCH_OPT2 ("armv6kz", ARM_ARCH_V6KZ, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6zk", ARM_ARCH_V6KZ, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6t2", ARM_ARCH_V6T2, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6kt2", ARM_ARCH_V6KT2, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6zt2", ARM_ARCH_V6ZT2, FPU_ARCH_VFP, armv5te), + ARM_ARCH_OPT2 ("armv6kz", ARM_ARCH_V6KZ, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6zk", ARM_ARCH_V6KZ, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6t2", ARM_ARCH_V6T2, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6kt2", ARM_ARCH_V6KT2, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6zt2", ARM_ARCH_V6ZT2, FPU_ARCH_SOFTVFP, + armv5te), /* The official spelling of this variant is ARMv6KZ, the name "armv6zkt2" is kept to preserve existing behaviour. */ - ARM_ARCH_OPT2 ("armv6kzt2", ARM_ARCH_V6KZT2, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT2 ("armv6zkt2", ARM_ARCH_V6KZT2, FPU_ARCH_VFP, armv5te), - ARM_ARCH_OPT ("armv6-m", ARM_ARCH_V6M, FPU_ARCH_VFP), - ARM_ARCH_OPT ("armv6s-m", ARM_ARCH_V6SM, FPU_ARCH_VFP), - ARM_ARCH_OPT2 ("armv7", ARM_ARCH_V7, FPU_ARCH_VFP, armv7), + ARM_ARCH_OPT2 ("armv6kzt2", ARM_ARCH_V6KZT2, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT2 ("armv6zkt2", ARM_ARCH_V6KZT2, FPU_ARCH_SOFTVFP, + armv5te), + ARM_ARCH_OPT ("armv6-m", ARM_ARCH_V6M, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT ("armv6s-m", ARM_ARCH_V6SM, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT2 ("armv7", ARM_ARCH_V7, FPU_ARCH_SOFTVFP, + armv7), /* The official spelling of the ARMv7 profile variants is the dashed form. Accept the non-dashed form for compatibility with old toolchains. */ - ARM_ARCH_OPT2 ("armv7a", ARM_ARCH_V7A, FPU_ARCH_VFP, armv7a), - ARM_ARCH_OPT2 ("armv7ve", ARM_ARCH_V7VE, FPU_ARCH_VFP, armv7ve), - ARM_ARCH_OPT2 ("armv7r", ARM_ARCH_V7R, FPU_ARCH_VFP, armv7r), - ARM_ARCH_OPT ("armv7m", ARM_ARCH_V7M, FPU_ARCH_VFP), - ARM_ARCH_OPT2 ("armv7-a", ARM_ARCH_V7A, FPU_ARCH_VFP, armv7a), - ARM_ARCH_OPT2 ("armv7-r", ARM_ARCH_V7R, FPU_ARCH_VFP, armv7r), - ARM_ARCH_OPT ("armv7-m", ARM_ARCH_V7M, FPU_ARCH_VFP), - ARM_ARCH_OPT2 ("armv7e-m", ARM_ARCH_V7EM, FPU_ARCH_VFP, armv7em), - ARM_ARCH_OPT ("armv8-m.base", ARM_ARCH_V8M_BASE, FPU_ARCH_VFP), - ARM_ARCH_OPT2 ("armv8-m.main", ARM_ARCH_V8M_MAIN, FPU_ARCH_VFP, + ARM_ARCH_OPT2 ("armv7a", ARM_ARCH_V7A, FPU_ARCH_SOFTVFP, + armv7a), + ARM_ARCH_OPT2 ("armv7ve", ARM_ARCH_V7VE, FPU_ARCH_SOFTVFP, + armv7ve), + ARM_ARCH_OPT2 ("armv7r", ARM_ARCH_V7R, FPU_ARCH_SOFTVFP, + armv7r), + ARM_ARCH_OPT ("armv7m", ARM_ARCH_V7M, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT2 ("armv7-a", ARM_ARCH_V7A, FPU_ARCH_SOFTVFP, + armv7a), + ARM_ARCH_OPT2 ("armv7-r", ARM_ARCH_V7R, FPU_ARCH_SOFTVFP, + armv7r), + ARM_ARCH_OPT ("armv7-m", ARM_ARCH_V7M, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT2 ("armv7e-m", ARM_ARCH_V7EM, FPU_ARCH_SOFTVFP, + armv7em), + ARM_ARCH_OPT ("armv8-m.base", ARM_ARCH_V8M_BASE, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT2 ("armv8-m.main", ARM_ARCH_V8M_MAIN, FPU_ARCH_SOFTVFP, armv8m_main), - ARM_ARCH_OPT2 ("armv8.1-m.main", ARM_ARCH_V8_1M_MAIN, FPU_ARCH_VFP, + ARM_ARCH_OPT2 ("armv8.1-m.main", ARM_ARCH_V8_1M_MAIN, FPU_ARCH_SOFTVFP, armv8_1m_main), - ARM_ARCH_OPT2 ("armv8-a", ARM_ARCH_V8A, FPU_ARCH_VFP, armv8a), - ARM_ARCH_OPT2 ("armv8.1-a", ARM_ARCH_V8_1A, FPU_ARCH_VFP, armv81a), - ARM_ARCH_OPT2 ("armv8.2-a", ARM_ARCH_V8_2A, FPU_ARCH_VFP, armv82a), - ARM_ARCH_OPT2 ("armv8.3-a", ARM_ARCH_V8_3A, FPU_ARCH_VFP, armv82a), - ARM_ARCH_OPT2 ("armv8-r", ARM_ARCH_V8R, FPU_ARCH_VFP, armv8r), - ARM_ARCH_OPT2 ("armv8.4-a", ARM_ARCH_V8_4A, FPU_ARCH_VFP, armv84a), - ARM_ARCH_OPT2 ("armv8.5-a", ARM_ARCH_V8_5A, FPU_ARCH_VFP, armv85a), - ARM_ARCH_OPT2 ("armv8.6-a", ARM_ARCH_V8_6A, FPU_ARCH_VFP, armv86a), - ARM_ARCH_OPT2 ("armv8.7-a", ARM_ARCH_V8_7A, FPU_ARCH_VFP, armv87a), - ARM_ARCH_OPT2 ("armv8.8-a", ARM_ARCH_V8_8A, FPU_ARCH_VFP, armv88a), - ARM_ARCH_OPT2 ("armv8.9-a", ARM_ARCH_V8_9A, FPU_ARCH_VFP, armv89a), - ARM_ARCH_OPT2 ("armv9-a", ARM_ARCH_V9A, FPU_ARCH_VFP, armv9a), - ARM_ARCH_OPT2 ("armv9.1-a", ARM_ARCH_V9_1A, FPU_ARCH_VFP, armv91a), - ARM_ARCH_OPT2 ("armv9.2-a", ARM_ARCH_V9_2A, FPU_ARCH_VFP, armv92a), - ARM_ARCH_OPT2 ("armv9.3-a", ARM_ARCH_V9_2A, FPU_ARCH_VFP, armv93a), - ARM_ARCH_OPT2 ("armv9.4-a", ARM_ARCH_V9_4A, FPU_ARCH_VFP, armv94a), - ARM_ARCH_OPT2 ("armv9.5-a", ARM_ARCH_V9_5A, FPU_ARCH_VFP, armv95a), - ARM_ARCH_OPT ("xscale", ARM_ARCH_XSCALE, FPU_ARCH_VFP), - ARM_ARCH_OPT ("iwmmxt", ARM_ARCH_IWMMXT, FPU_ARCH_VFP), - ARM_ARCH_OPT ("iwmmxt2", ARM_ARCH_IWMMXT2, FPU_ARCH_VFP), + ARM_ARCH_OPT2 ("armv8-a", ARM_ARCH_V8A, FPU_ARCH_SOFTVFP, + armv8a), + ARM_ARCH_OPT2 ("armv8.1-a", ARM_ARCH_V8_1A, FPU_ARCH_SOFTVFP, + armv81a), + ARM_ARCH_OPT2 ("armv8.2-a", ARM_ARCH_V8_2A, FPU_ARCH_SOFTVFP, + armv82a), + ARM_ARCH_OPT2 ("armv8.3-a", ARM_ARCH_V8_3A, FPU_ARCH_SOFTVFP, + armv82a), + ARM_ARCH_OPT2 ("armv8-r", ARM_ARCH_V8R, FPU_ARCH_SOFTVFP, + armv8r), + ARM_ARCH_OPT2 ("armv8.4-a", ARM_ARCH_V8_4A, FPU_ARCH_SOFTVFP, + armv84a), + ARM_ARCH_OPT2 ("armv8.5-a", ARM_ARCH_V8_5A, FPU_ARCH_SOFTVFP, + armv85a), + ARM_ARCH_OPT2 ("armv8.6-a", ARM_ARCH_V8_6A, FPU_ARCH_SOFTVFP, + armv86a), + ARM_ARCH_OPT2 ("armv8.7-a", ARM_ARCH_V8_7A, FPU_ARCH_SOFTVFP, + armv87a), + ARM_ARCH_OPT2 ("armv8.8-a", ARM_ARCH_V8_8A, FPU_ARCH_SOFTVFP, + armv88a), + ARM_ARCH_OPT2 ("armv8.9-a", ARM_ARCH_V8_9A, FPU_ARCH_SOFTVFP, + armv89a), + ARM_ARCH_OPT2 ("armv9-a", ARM_ARCH_V9A, FPU_ARCH_SOFTVFP, + armv9a), + ARM_ARCH_OPT2 ("armv9.1-a", ARM_ARCH_V9_1A, FPU_ARCH_SOFTVFP, + armv91a), + ARM_ARCH_OPT2 ("armv9.2-a", ARM_ARCH_V9_2A, FPU_ARCH_SOFTVFP, + armv92a), + ARM_ARCH_OPT2 ("armv9.3-a", ARM_ARCH_V9_2A, FPU_ARCH_SOFTVFP, + armv93a), + ARM_ARCH_OPT2 ("armv9.4-a", ARM_ARCH_V9_4A, FPU_ARCH_SOFTVFP, + armv94a), + ARM_ARCH_OPT2 ("armv9.5-a", ARM_ARCH_V9_5A, FPU_ARCH_SOFTVFP, + armv95a), + ARM_ARCH_OPT ("xscale", ARM_ARCH_XSCALE, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT ("iwmmxt", ARM_ARCH_IWMMXT, FPU_ARCH_SOFTVFP), + ARM_ARCH_OPT ("iwmmxt2", ARM_ARCH_IWMMXT2, FPU_ARCH_SOFTVFP), { NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE, NULL } }; #undef ARM_ARCH_OPT @@ -32147,7 +32185,7 @@ static const struct arm_option_fpu_value_table arm_fpus[] = {"fpa10", FPU_ARCH_FPA}, {"fpa11", FPU_ARCH_FPA}, {"arm7500fe", FPU_ARCH_FPA}, - {"softvfp", FPU_ARCH_VFP}, + {"softvfp", FPU_ARCH_SOFTVFP}, {"softvfp+vfp", FPU_ARCH_VFP_V2}, {"vfp", FPU_ARCH_VFP_V2}, {"vfp9", FPU_ARCH_VFP_V2}, diff --git a/gas/config/te-armeabi.h b/gas/config/te-armeabi.h index 546e72ed188..f23509798c6 100644 --- a/gas/config/te-armeabi.h +++ b/gas/config/te-armeabi.h @@ -18,7 +18,7 @@ 02110-1301, USA. */ /* The EABI requires the use of VFP. */ -#define FPU_DEFAULT FPU_ARCH_VFP +#define FPU_DEFAULT FPU_ARCH_SOFTVFP #define EABI_DEFAULT EF_ARM_EABI_VER5 #define LOCAL_LABELS_DOLLAR 1 diff --git a/gas/config/te-armfbsdvfp.h b/gas/config/te-armfbsdvfp.h index a3b15f1d7d5..c13d46dc059 100644 --- a/gas/config/te-armfbsdvfp.h +++ b/gas/config/te-armfbsdvfp.h @@ -19,4 +19,4 @@ #include "te-armfbsdeabi.h" -#define FPU_DEFAULT FPU_ARCH_VFP +#define FPU_DEFAULT FPU_ARCH_SOFTVFP diff --git a/gas/config/te-armlinuxeabi.h b/gas/config/te-armlinuxeabi.h index 617c9414419..e7647c67d23 100644 --- a/gas/config/te-armlinuxeabi.h +++ b/gas/config/te-armlinuxeabi.h @@ -20,5 +20,5 @@ #include "te-linux.h" /* The EABI requires the use of VFP. */ -#define FPU_DEFAULT FPU_ARCH_VFP +#define FPU_DEFAULT FPU_ARCH_SOFTVFP #define EABI_DEFAULT EF_ARM_EABI_VER5 diff --git a/gas/config/te-nacl.h b/gas/config/te-nacl.h index ebcbd4da760..7678d4b3241 100644 --- a/gas/config/te-nacl.h +++ b/gas/config/te-nacl.h @@ -24,7 +24,7 @@ /* These are for ARM but don't hurt other CPU targets. They match the settings from te-armeabi.h; NaCl/ARM is based on EABI. */ -#define FPU_DEFAULT FPU_ARCH_VFP +#define FPU_DEFAULT FPU_ARCH_SOFTVFP #define EABI_DEFAULT EF_ARM_EABI_VER5 #include "obj-format.h" diff --git a/include/opcode/arm.h b/include/opcode/arm.h index faa793c447e..c921f76ec7d 100644 --- a/include/opcode/arm.h +++ b/include/opcode/arm.h @@ -247,7 +247,7 @@ #define FPU_FPA (FPU_FPA_EXT_V1 | FPU_FPA_EXT_V2) /* Deprecated. */ -#define FPU_ARCH_VFP ARM_FEATURE_COPROC (FPU_ENDIAN_PURE) +#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)