From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 10 Mar 2023 10:08:23 +0000 (+0100)
Subject: Arm64/gas: drop redundant feature prereqs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36ba37c085438d23de2289ea17b56e7b91d1c5c5;p=binutils-gdb.git

Arm64/gas: drop redundant feature prereqs

Logic exists to deal with prereqs or prereqs, and in many cases
transitive prereqs are already not spelled out explicitly. Drop further
ones:
- FP is already a prereq to F16,
- SIMD and F16 are already prereqs to COMPNUM, and
- SVE2 and BFLOAT16 are already prereqs to SME.
---

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 0b84f500e15..c1736c2c684 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -10108,14 +10108,11 @@ static const struct aarch64_option_cpu_value_table aarch64_features[] = {
   {"fp16",		AARCH64_FEATURE (AARCH64_FEATURE_F16, 0),
 			AARCH64_FEATURE (AARCH64_FEATURE_FP, 0)},
   {"fp16fml",		AARCH64_FEATURE (AARCH64_FEATURE_F16_FML, 0),
-			AARCH64_FEATURE (AARCH64_FEATURE_FP
-					 | AARCH64_FEATURE_F16, 0)},
+			AARCH64_FEATURE (AARCH64_FEATURE_F16, 0)},
   {"profile",		AARCH64_FEATURE (AARCH64_FEATURE_PROFILE, 0),
 			AARCH64_ARCH_NONE},
   {"sve",		AARCH64_FEATURE (AARCH64_FEATURE_SVE, 0),
-			AARCH64_FEATURE (AARCH64_FEATURE_F16
-					 | AARCH64_FEATURE_SIMD
-					 | AARCH64_FEATURE_COMPNUM, 0)},
+			AARCH64_FEATURE (AARCH64_FEATURE_COMPNUM, 0)},
   {"tme",		AARCH64_FEATURE (AARCH64_FEATURE_TME, 0),
 			AARCH64_ARCH_NONE},
   {"compnum",		AARCH64_FEATURE (AARCH64_FEATURE_COMPNUM, 0),
@@ -10160,13 +10157,9 @@ static const struct aarch64_option_cpu_value_table aarch64_features[] = {
 			AARCH64_FEATURE (AARCH64_FEATURE_SVE2
 					 | AARCH64_FEATURE_BFLOAT16, 0)},
   {"sme-f64",		AARCH64_FEATURE (AARCH64_FEATURE_SME_F64, 0),
-			AARCH64_FEATURE (AARCH64_FEATURE_SME
-					 | AARCH64_FEATURE_SVE2
-					 | AARCH64_FEATURE_BFLOAT16, 0)},
+			AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
   {"sme-i64",		AARCH64_FEATURE (AARCH64_FEATURE_SME_I64, 0),
-			AARCH64_FEATURE (AARCH64_FEATURE_SME
-					 | AARCH64_FEATURE_SVE2
-					 | AARCH64_FEATURE_BFLOAT16, 0)},
+			AARCH64_FEATURE (AARCH64_FEATURE_SME, 0)},
   {"bf16",		AARCH64_FEATURE (AARCH64_FEATURE_BFLOAT16, 0),
 			AARCH64_FEATURE (AARCH64_FEATURE_FP, 0)},
   {"i8mm",		AARCH64_FEATURE (AARCH64_FEATURE_I8MM, 0),