From: Tamar Christina <tamar.christina@arm.com>
Date: Thu, 15 Feb 2018 17:08:14 +0000 (+0000)
Subject: Fix AArch32 build attributes for Armv8.4-A.
X-Git-Tag: users/ARM/embedded-binutils-2_30-branch-2018q2~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30a2e7bb17f5e6e1bebcae93bfd808fc5c8ff203;p=thirdparty%2Fbinutils-gdb.git

Fix AArch32 build attributes for Armv8.4-A.

backported from master.

The build attribute number for Armv8.4-A is currently incorrectly set to that of Armv8-M.
This patch fixes that by setting it as part of the Armv8-A family and adds a test for it.

gas/
2018-02-16  Tamar Christina  <tamar.christina@arm.com>

	* config/tc-arm.c (cpu_arch_ver): Renumber ARM_ARCH_V8_4A.
	* testsuite/gas/arm/attr-march-armv8_4-a.d: New.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e981564e291..232d2469e4c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-16  Tamar Christina  <tamar.christina@arm.com>
+
+	* config/tc-arm.c (cpu_arch_ver): Renumber ARM_ARCH_V8_4A.
+	* testsuite/gas/arm/attr-march-armv8_4-a.d: New.
+
 2018-02-14  Max Filippov  <jcmvbkbc@gmail.com>
 
 	Backport from mainline
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index c07362ae7d7..4d82338d6e3 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -26930,7 +26930,7 @@ static const cpu_arch_ver_table cpu_arch_ver[] =
     {16, ARM_ARCH_V8M_BASE},
     {17, ARM_ARCH_V8M_MAIN},
     {15, ARM_ARCH_V8R},
-    {16, ARM_ARCH_V8_4A},
+    {14, ARM_ARCH_V8_4A},
     {-1, ARM_ARCH_NONE}
 };
 
diff --git a/gas/testsuite/gas/arm/attr-march-armv8_4-a.d b/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
new file mode 100644
index 00000000000..af3e52b4bb9
--- /dev/null
+++ b/gas/testsuite/gas/arm/attr-march-armv8_4-a.d
@@ -0,0 +1,17 @@
+# name: attributes for -march=armv8.4-a
+# source: blank.s
+# as: -march=armv8.4-a
+# readelf: -A
+# This test is only valid on EABI based ports.
+# target: *-*-*eabi* *-*-nacl*
+
+Attribute Section: aeabi
+File Attributes
+  Tag_CPU_name: "8.4-A"
+  Tag_CPU_arch: v8
+  Tag_CPU_arch_profile: Application
+  Tag_ARM_ISA_use: Yes
+  Tag_THUMB_ISA_use: Thumb-2
+  Tag_Advanced_SIMD_arch: NEON for ARMv8.1
+  Tag_MPextension_use: Allowed
+  Tag_Virtualization_use: TrustZone and Virtualization Extensions