[ARM] Update bfd's Tag_CPU_arch knowledge

BFD's bfd_get_mach () function returns a bfd specific value representing
the architecture of the target which is populated from the Tag_CPU_arch
build attribute value of that target. Among other users of that
interfacem, objdump which uses it to print the architecture version of
the binary being examinated and to decide what instruction is available
if run with "-m arm" via its own mapping from bfd_mach_arm_X values to
feature bits available.

However, both BFD and objdump's most recent known architecture is
Armv5TE. When encountering a newer architecture bfd_get_mach will return
bfd_mach_arm_unknown. This is unfortunate since objdump uses that value
to allow all instructions on all architectures which is already what it
does by default, making the "-m arm" trick useless.

This patch updates BFD and objdump's knowledge of Arm architecture
versions up to the latest Armv8-M Baseline and Mainline, Armv8-R and
Armv8.4-A architectures. Since several architecture versions (eg. 8.X-A)
share the same Tag_CPU_arch build attribute value and
bfd_mach_arm values, the mapping from bfd machine value to feature bits
need to return the most featureful feature bits that would yield the
given bfd machine value otherwise some instruction would not disassemble
under "-m arm" mode. The patch rework that mapping to make this clearer
and simplify writing the mapping rules. In particular, for simplicity
all FPU instructions are allowed in all cases.

Finally, the patch also rewrite the cpu_arch_ver table in GAS to use the
TAG_CPU_ARCH_X macros rather than hardcode their value.

2018-07-02  Thomas Preud'homme  <thomas.preudhomme@arm.com>

bfd/
	* archures.c (bfd_mach_arm_5TEJ, bfd_mach_arm_6, bfd_mach_arm_6KZ,
	bfd_mach_arm_6T2, bfd_mach_arm_6K, bfd_mach_arm_7, bfd_mach_arm_6M,
	bfd_mach_arm_6SM, bfd_mach_arm_7EM, bfd_mach_arm_8, bfd_mach_arm_8R,
	bfd_mach_arm_8M_BASE, bfd_mach_arm_8M_MAIN): Define.
	* bfd-in2.h: Regenerate.
	* cpu-arm.c (arch_info_struct): Add entries for above new
	bfd_mach_arm values.
	* elf32-arm.c (bfd_arm_get_mach_from_attributes): Add Tag_CPU_arch to
	bfd_mach_arm mapping logic for pre Armv4 and Armv5TEJ and later
	architectures.  Force assert failure for any new Tag_CPU_arch value.

gas/
	* config/tc-arm.c (cpu_arch_ver): Use symbolic TAG_CPU_ARCH macros
	rather than hardcode their values.

ld/
	* arm-dis.c (select_arm_features): Fix typo in heading comment.  Allow
	all FPU features and add mapping from new bfd_mach_arm values to
	allowed CPU feature bits.

opcodes/
	* testsuite/ld-arm/tls-descrelax-be8.d: Add architecture version in
	expected result.
	* testsuite/ld-arm/tls-descrelax-v7.d: Likewise.
	* testsuite/ld-arm/tls-longplt-lib.d: Likewise.
	* testsuite/ld-arm/tls-longplt.d: Likewise.

2 files changed, 47 insertions, 42 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9a28648..47fa7ae 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2018-07-02  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
+	* config/tc-arm.c (cpu_arch_ver): Use symbolic TAG_CPU_ARCH macros
+	rather than hardcode their values.
+
+2018-07-02  Thomas Preud'homme  <thomas.preudhomme@arm.com>
+
 	* NEWS: Use command-line consistently when used in a compount word.
 	* doc/as.texi: Likewise.
 	* doc/c-aarch64.texi: Likewise.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 6a9a655..ef814ff 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -26984,30 +26984,30 @@ typedef struct
    stable when new architectures are added.  */
 static const cpu_arch_ver_table cpu_arch_ver[] =
 {
-    {0, ARM_ARCH_V1},
-    {0, ARM_ARCH_V2},
-    {0, ARM_ARCH_V2S},
-    {0, ARM_ARCH_V3},
-    {0, ARM_ARCH_V3M},
-    {1, ARM_ARCH_V4xM},
-    {1, ARM_ARCH_V4},
-    {2, ARM_ARCH_V4TxM},
-    {2, ARM_ARCH_V4T},
-    {3, ARM_ARCH_V5xM},
-    {3, ARM_ARCH_V5},
-    {3, ARM_ARCH_V5TxM},
-    {3, ARM_ARCH_V5T},
-    {4, ARM_ARCH_V5TExP},
-    {4, ARM_ARCH_V5TE},
-    {5, ARM_ARCH_V5TEJ},
-    {6, ARM_ARCH_V6},
-    {7, ARM_ARCH_V6Z},
-    {7, ARM_ARCH_V6KZ},
-    {9, ARM_ARCH_V6K},
-    {8, ARM_ARCH_V6T2},
-    {8, ARM_ARCH_V6KT2},
-    {8, ARM_ARCH_V6ZT2},
-    {8, ARM_ARCH_V6KZT2},
+    {TAG_CPU_ARCH_PRE_V4,   ARM_ARCH_V1},
+    {TAG_CPU_ARCH_PRE_V4,   ARM_ARCH_V2},
+    {TAG_CPU_ARCH_PRE_V4,   ARM_ARCH_V2S},
+    {TAG_CPU_ARCH_PRE_V4,   ARM_ARCH_V3},
+    {TAG_CPU_ARCH_PRE_V4,   ARM_ARCH_V3M},
+    {TAG_CPU_ARCH_V4,	    ARM_ARCH_V4xM},
+    {TAG_CPU_ARCH_V4,	    ARM_ARCH_V4},
+    {TAG_CPU_ARCH_V4T,	    ARM_ARCH_V4TxM},
+    {TAG_CPU_ARCH_V4T,	    ARM_ARCH_V4T},
+    {TAG_CPU_ARCH_V5T,	    ARM_ARCH_V5xM},
+    {TAG_CPU_ARCH_V5T,	    ARM_ARCH_V5},
+    {TAG_CPU_ARCH_V5T,	    ARM_ARCH_V5TxM},
+    {TAG_CPU_ARCH_V5T,	    ARM_ARCH_V5T},
+    {TAG_CPU_ARCH_V5TE,	    ARM_ARCH_V5TExP},
+    {TAG_CPU_ARCH_V5TE,	    ARM_ARCH_V5TE},
+    {TAG_CPU_ARCH_V5TEJ,    ARM_ARCH_V5TEJ},
+    {TAG_CPU_ARCH_V6,	    ARM_ARCH_V6},
+    {TAG_CPU_ARCH_V6KZ,	    ARM_ARCH_V6Z},
+    {TAG_CPU_ARCH_V6KZ,	    ARM_ARCH_V6KZ},
+    {TAG_CPU_ARCH_V6K,	    ARM_ARCH_V6K},
+    {TAG_CPU_ARCH_V6T2,	    ARM_ARCH_V6T2},
+    {TAG_CPU_ARCH_V6T2,	    ARM_ARCH_V6KT2},
+    {TAG_CPU_ARCH_V6T2,	    ARM_ARCH_V6ZT2},
+    {TAG_CPU_ARCH_V6T2,	    ARM_ARCH_V6KZT2},
 
     /* When assembling a file with only ARMv6-M or ARMv6S-M instruction, GNU as
        always selected build attributes to match those of ARMv6-M
@@ -27016,24 +27016,24 @@ static const cpu_arch_ver_table cpu_arch_ver[] =
        would be selected when fully respecting chronology of architectures.
        It is thus necessary to make a special case of ARMv6-M and ARMv6S-M and
        move them before ARMv7 architectures.  */
-    {11, ARM_ARCH_V6M},
-    {12, ARM_ARCH_V6SM},
-
-    {10, ARM_ARCH_V7},
-    {10, ARM_ARCH_V7A},
-    {10, ARM_ARCH_V7R},
-    {10, ARM_ARCH_V7M},
-    {10, ARM_ARCH_V7VE},
-    {13, ARM_ARCH_V7EM},
-    {14, ARM_ARCH_V8A},
-    {14, ARM_ARCH_V8_1A},
-    {14, ARM_ARCH_V8_2A},
-    {14, ARM_ARCH_V8_3A},
-    {16, ARM_ARCH_V8M_BASE},
-    {17, ARM_ARCH_V8M_MAIN},
-    {15, ARM_ARCH_V8R},
-    {14, ARM_ARCH_V8_4A},
-    {-1, ARM_ARCH_NONE}
+    {TAG_CPU_ARCH_V6_M,	    ARM_ARCH_V6M},
+    {TAG_CPU_ARCH_V6S_M,    ARM_ARCH_V6SM},
+
+    {TAG_CPU_ARCH_V7,	    ARM_ARCH_V7},
+    {TAG_CPU_ARCH_V7,	    ARM_ARCH_V7A},
+    {TAG_CPU_ARCH_V7,	    ARM_ARCH_V7R},
+    {TAG_CPU_ARCH_V7,	    ARM_ARCH_V7M},
+    {TAG_CPU_ARCH_V7,	    ARM_ARCH_V7VE},
+    {TAG_CPU_ARCH_V7E_M,    ARM_ARCH_V7EM},
+    {TAG_CPU_ARCH_V8,	    ARM_ARCH_V8A},
+    {TAG_CPU_ARCH_V8,	    ARM_ARCH_V8_1A},
+    {TAG_CPU_ARCH_V8,	    ARM_ARCH_V8_2A},
+    {TAG_CPU_ARCH_V8,	    ARM_ARCH_V8_3A},
+    {TAG_CPU_ARCH_V8M_BASE, ARM_ARCH_V8M_BASE},
+    {TAG_CPU_ARCH_V8M_MAIN, ARM_ARCH_V8M_MAIN},
+    {TAG_CPU_ARCH_V8R,	    ARM_ARCH_V8R},
+    {TAG_CPU_ARCH_V8,	    ARM_ARCH_V8_4A},
+    {-1,		    ARM_ARCH_NONE}
 };
 
 /* Set an attribute if it has not already been set by the user.  */