https://gcc.gnu.org/g:a28df11276647da16316d0621cb69ff5f878cd91
commit r14-9920-ga28df11276647da16316d0621cb69ff5f878cd91
Author: Andrew Carlotti <andrew.carlo...@arm.com>
Date: Wed Apr 3 23:37:16 2024 +0100
aarch64: Fix typo and make rdma/rdm alias for FMV
gcc/ChangeLog:
* config/aarch64/aarch64-option-extensions.def:
Fix "rmd"->"rdm", and add FMV to "rdma".
* config/aarch64/aarch64.cc (FEAT_RDMA): Define as FEAT_RDM.
Diff:
---
gcc/config/aarch64/aarch64-option-extensions.def | 5 +++--
gcc/config/aarch64/aarch64.cc | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gcc/config/aarch64/aarch64-option-extensions.def
b/gcc/config/aarch64/aarch64-option-extensions.def
index 0078dd09288..b7b307b24ea 100644
--- a/gcc/config/aarch64/aarch64-option-extensions.def
+++ b/gcc/config/aarch64/aarch64-option-extensions.def
@@ -117,9 +117,10 @@ AARCH64_OPT_FMV_EXTENSION("sm4", SM4, (SIMD), (), (), "sm3
sm4")
/* An explicit +rdma implies +simd, but +rdma+nosimd still enables scalar
RDMA instructions. */
-AARCH64_OPT_EXTENSION("rdma", RDMA, (), (SIMD), (), "asimdrdm")
+AARCH64_OPT_FMV_EXTENSION("rdma", RDMA, (), (SIMD), (), "asimdrdm")
-AARCH64_FMV_FEATURE("rmd", RDM, (RDMA))
+/* rdm is an alias for rdma. */
+AARCH64_FMV_FEATURE("rdm", RDM, (RDMA))
AARCH64_OPT_FMV_EXTENSION("crc", CRC, (), (), (), "crc32")
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index 91481f9fada..a2e3d208d76 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -19695,6 +19695,10 @@ typedef struct
#define AARCH64_FMV_FEATURE(NAME, FEAT_NAME, C) \
{NAME, 1ULL << FEAT_##FEAT_NAME, ::feature_deps::fmv_deps_##FEAT_NAME},
+/* The "rdma" alias uses a different FEAT_NAME to avoid a duplicate
+ feature_deps name. */
+#define FEAT_RDMA FEAT_RDM
+
/* FMV features are listed in priority order, to make it easier to sort target
strings. */
static aarch64_fmv_feature_datum aarch64_fmv_feature_data[] = {
