aarch64, gas: Relax Armv9.6-A mandatory feature set

Remove FPRCVT and SVE2p2 from the set of mandatory features for Armv9.6-A.

diff --git a/gas/testsuite/gas/aarch64/fprcvt.d b/gas/testsuite/gas/aarch64/fprcvt.d
index f44690bf4860b0b4357496b2450d52e8ded19bb1..91298584d004ba2d977c760d72e14486f49186da 100644 (file)
--- a/gas/testsuite/gas/aarch64/fprcvt.d
+++ b/gas/testsuite/gas/aarch64/fprcvt.d
@@ -1,6 +1,5 @@
 #name: FPRCVT instructions
 #as: -march=armv8-a+fprcvt
-#as: -march=armv9.6-a
 #objdump: -dr
 
 .*:     file format .*

diff --git a/gas/testsuite/gas/aarch64/sve2p2.d b/gas/testsuite/gas/aarch64/sve2p2.d
index 128e35033bc80b7edb62e5dd1c2658cf2bab74c2..f401cb4fc30f6d258f047db83938b60a7d1c0fde 100644 (file)
--- a/gas/testsuite/gas/aarch64/sve2p2.d
+++ b/gas/testsuite/gas/aarch64/sve2p2.d
@@ -1,6 +1,5 @@
 #as: -march=armv8-a+sve2p2
 #as: -march=armv8-a+sme2p2
-#as: -march=armv9.6-a
 #objdump: -dr
 
 .*:     file format .*

diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h
index 9408d00dde0a1f2524e078bfe1b5d804610914b1..2b3c57d51676141c5a9e2e80fbf96cd7d2e23c3d 100644 (file)
--- a/include/opcode/aarch64.h
+++ b/include/opcode/aarch64.h
@@ -397,10 +397,8 @@ static_assert ((AA64_REPLICATE (REP_PLUS, AA64_REPVAL,
                                        )
 #define AARCH64_ARCH_V9_6A_FEATURES(X) (AARCH64_FEATBIT (X, V9_6A)     \
                                         | AARCH64_FEATBIT (X, CMPBR)   \
-                                        | AARCH64_FEATBIT (X, FPRCVT)  \
                                         | AARCH64_FEATBIT (X, LSUI)    \
-                                        | AARCH64_FEATBIT (X, OCCMO)   \
-                                        | AARCH64_FEATBIT (X, SVE2p2))
+                                        | AARCH64_FEATBIT (X, OCCMO))
 
 /* Architectures are the sum of the base and extensions.  */
 #define AARCH64_ARCH_V8A(X)    (AARCH64_FEATBIT (X, V8) \