From: Andre Vieira <andre.simoesdiasvieira@arm.com>
Date: Wed, 8 Oct 2025 10:30:56 +0000 (+0100)
Subject: aarch64, gas: Relax Armv9.6-A mandatory feature set
X-Git-Tag: binutils-2_45_1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b04018789433311fb806bdd26294b9843689ba9;p=thirdparty%2Fbinutils-gdb.git

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

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

(cherry picked from commit 94861aa1c05d18f9d870cf4ed6782877b796ec7c)
---

diff --git a/gas/testsuite/gas/aarch64/fprcvt.d b/gas/testsuite/gas/aarch64/fprcvt.d
index f44690bf486..91298584d00 100644
--- 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 128e35033bc..f401cb4fc30 100644
--- 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 4425dd46a45..7a0fb3b64a6 100644
--- a/include/opcode/aarch64.h
+++ b/include/opcode/aarch64.h
@@ -477,10 +477,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) \