From ce9fad9878a28db62e2ce7dabbf250f7513e594d Mon Sep 17 00:00:00 2001
From: Andrew Carlotti <andrew.carlotti@arm.com>
Date: Fri, 12 Jan 2024 01:43:17 +0000
Subject: [PATCH] aarch64: Add +frintts flag for existing instructions

---
 gas/config/tc-aarch64.c                                       |  1 +
 gas/testsuite/gas/aarch64/armv8_5-a-flagm2.d                  | 11 +++++++++++
 gas/testsuite/gas/aarch64/armv8_5-a-flagm2.s                  |  3 +++
 .../gas/aarch64/{armv8_5-a-dp.d => armv8_5-a-frintts.d}       |  3 +--
 .../gas/aarch64/{armv8_5-a-dp.s => armv8_5-a-frintts.s}       |  2 --
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 gas/testsuite/gas/aarch64/armv8_5-a-flagm2.d
 create mode 100644 gas/testsuite/gas/aarch64/armv8_5-a-flagm2.s
 rename gas/testsuite/gas/aarch64/{armv8_5-a-dp.d => armv8_5-a-frintts.d} (94%)
 rename gas/testsuite/gas/aarch64/{armv8_5-a-dp.s => armv8_5-a-frintts.s} (94%)

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index b77b160fe1f..9df0e3b8d32 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -10288,6 +10288,7 @@ static const struct aarch64_option_cpu_value_table aarch64_features[] = {
   {"rcpc",		AARCH64_FEATURE (RCPC), AARCH64_NO_FEATURES},
   {"dotprod",		AARCH64_FEATURE (DOTPROD), AARCH64_FEATURE (SIMD)},
   {"sha2",		AARCH64_FEATURE (SHA2), AARCH64_FEATURE (FP)},
+  {"frintts",		AARCH64_FEATURE (FRINTTS), AARCH64_FEATURE (SIMD)},
   {"sb",		AARCH64_FEATURE (SB), AARCH64_NO_FEATURES},
   {"predres",		AARCH64_FEATURE (PREDRES), AARCH64_NO_FEATURES},
   {"predres2",		AARCH64_FEATURE (PREDRES2), AARCH64_FEATURE (PREDRES)},
diff --git a/gas/testsuite/gas/aarch64/armv8_5-a-flagm2.d b/gas/testsuite/gas/aarch64/armv8_5-a-flagm2.d
new file mode 100644
index 00000000000..83361e0c0b5
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/armv8_5-a-flagm2.d
@@ -0,0 +1,11 @@
+#as: -march=armv8.5-a
+# objdump: -d
+
+.*: .*
+
+
+Disassembly of section \.text:
+
+0+0 <func>:
+.*:	d500403f 	xaflag
+.*:	d500405f 	axflag
diff --git a/gas/testsuite/gas/aarch64/armv8_5-a-flagm2.s b/gas/testsuite/gas/aarch64/armv8_5-a-flagm2.s
new file mode 100644
index 00000000000..7e7929ceb63
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/armv8_5-a-flagm2.s
@@ -0,0 +1,3 @@
+func:
+	xaflag
+	axflag
diff --git a/gas/testsuite/gas/aarch64/armv8_5-a-dp.d b/gas/testsuite/gas/aarch64/armv8_5-a-frintts.d
similarity index 94%
rename from gas/testsuite/gas/aarch64/armv8_5-a-dp.d
rename to gas/testsuite/gas/aarch64/armv8_5-a-frintts.d
index d0667543f94..5bc98fc6ff9 100644
--- a/gas/testsuite/gas/aarch64/armv8_5-a-dp.d
+++ b/gas/testsuite/gas/aarch64/armv8_5-a-frintts.d
@@ -1,4 +1,5 @@
 #as: -march=armv8.5-a
+#as: -march=armv8-a+frintts
 # objdump: -d
 
 .*: .*
@@ -7,8 +8,6 @@
 Disassembly of section \.text:
 
 0+0 <func>:
-.*:	d500403f 	xaflag
-.*:	d500405f 	axflag
 .*:	1e284041 	frint32z	s1, s2
 .*:	1e684062 	frint32z	d2, d3
 .*:	1e28c041 	frint32x	s1, s2
diff --git a/gas/testsuite/gas/aarch64/armv8_5-a-dp.s b/gas/testsuite/gas/aarch64/armv8_5-a-frintts.s
similarity index 94%
rename from gas/testsuite/gas/aarch64/armv8_5-a-dp.s
rename to gas/testsuite/gas/aarch64/armv8_5-a-frintts.s
index ecc924460fd..96d800700a7 100644
--- a/gas/testsuite/gas/aarch64/armv8_5-a-dp.s
+++ b/gas/testsuite/gas/aarch64/armv8_5-a-frintts.s
@@ -13,7 +13,5 @@
 	.endr
 	.endm
 func:
-	xaflag
-	axflag
 	expand frint,0
 	expand frint,1
-- 
2.11.4.GIT