CORE-V: Remove versioning support for XCV Extensions

* bfd/elfxx-riscv.c: Implement default versioning for XCV as 1.0. * gas/testsuite/gas/riscv: Updated all XCV tests to remove explicit call of versioning in march string. * ld/testsuite/gas/riscv: Updated all XCV tests to remove explicit call of versioning in march string. Signed-off-by: Nandni Jamnadas <nandni.jamnadas@embecosm.com>
openhwgroup · Jun 29, 2023 · 9b12078 · 9b12078
1 parent 712116d
commit 9b12078
Show file tree

Hide file tree

Showing 606 changed files with 613 additions and 606 deletions.
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
@@ -1317,6 +1317,14 @@ static struct riscv_supported_ext riscv_supported_vendor_x_ext[] =
   {"xtheadmemidx",	ISA_SPEC_CLASS_DRAFT,	1, 0, 0 },
   {"xtheadmempair",	ISA_SPEC_CLASS_DRAFT,	1, 0, 0 },
   {"xtheadsync",	ISA_SPEC_CLASS_DRAFT,	1, 0, 0 },
+  {"xcvhwlp",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvmac",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvalu",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvmem",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvbi",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvelw",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvsimd",		ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
+  {"xcvbitmanip",	ISA_SPEC_CLASS_DRAFT,	1, 0,  0 },
   {NULL, 0, 0, 0, 0}
 };
 

diff --git a/gas/testsuite/gas/riscv/cv-alu-abs.d b/gas/testsuite/gas/riscv/cv-alu-abs.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addn.d b/gas/testsuite/gas/riscv/cv-alu-addn.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addnr.d b/gas/testsuite/gas/riscv/cv-alu-addnr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addrn.d b/gas/testsuite/gas/riscv/cv-alu-addrn.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addrnr.d b/gas/testsuite/gas/riscv/cv-alu-addrnr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addun.d b/gas/testsuite/gas/riscv/cv-alu-addun.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addunr.d b/gas/testsuite/gas/riscv/cv-alu-addunr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addurn.d b/gas/testsuite/gas/riscv/cv-alu-addurn.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-addurnr.d b/gas/testsuite/gas/riscv/cv-alu-addurnr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-clip.d b/gas/testsuite/gas/riscv/cv-alu-clip.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-clipr.d b/gas/testsuite/gas/riscv/cv-alu-clipr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-clipu.d b/gas/testsuite/gas/riscv/cv-alu-clipu.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-clipur.d b/gas/testsuite/gas/riscv/cv-alu-clipur.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-extbs.d b/gas/testsuite/gas/riscv/cv-alu-extbs.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-extbz.d b/gas/testsuite/gas/riscv/cv-alu-extbz.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-exths.d b/gas/testsuite/gas/riscv/cv-alu-exths.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-exthz.d b/gas/testsuite/gas/riscv/cv-alu-exthz.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-01.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-01.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-01.s
 #error_output: cv-alu-fail-operand-01.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-02.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-02.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-02.s
 #error_output: cv-alu-fail-operand-02.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-03.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-03.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-03.s
 #error_output: cv-alu-fail-operand-03.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-04.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-04.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-04.s
 #error_output: cv-alu-fail-operand-04.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-05.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-05.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-05.s
 #error_output: cv-alu-fail-operand-05.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-06.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-06.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-06.s
 #error_output: cv-alu-fail-operand-06.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-fail-operand-07.d b/gas/testsuite/gas/riscv/cv-alu-fail-operand-07.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #source: cv-alu-fail-operand-07.s
 #error_output: cv-alu-fail-operand-07.l
diff --git a/gas/testsuite/gas/riscv/cv-alu-max.d b/gas/testsuite/gas/riscv/cv-alu-max.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-maxu.d b/gas/testsuite/gas/riscv/cv-alu-maxu.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-min.d b/gas/testsuite/gas/riscv/cv-alu-min.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-minu.d b/gas/testsuite/gas/riscv/cv-alu-minu.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-slet.d b/gas/testsuite/gas/riscv/cv-alu-slet.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-sletu.d b/gas/testsuite/gas/riscv/cv-alu-sletu.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-subn.d b/gas/testsuite/gas/riscv/cv-alu-subn.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-subnr.d b/gas/testsuite/gas/riscv/cv-alu-subnr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-subrn.d b/gas/testsuite/gas/riscv/cv-alu-subrn.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-subrnr.d b/gas/testsuite/gas/riscv/cv-alu-subrnr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-subun.d b/gas/testsuite/gas/riscv/cv-alu-subun.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-subunr.d b/gas/testsuite/gas/riscv/cv-alu-subunr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-suburn.d b/gas/testsuite/gas/riscv/cv-alu-suburn.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-alu-suburnr.d b/gas/testsuite/gas/riscv/cv-alu-suburnr.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvalu1p0
+#as: -march=rv32i_xcvalu
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-bclr-fail.d b/gas/testsuite/gas/riscv/cv-bclr-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bclr-fail.s
 #error_output: cv-bclr-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-bclr-pass.d b/gas/testsuite/gas/riscv/cv-bclr-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bclr-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-bclrr-fail.d b/gas/testsuite/gas/riscv/cv-bclrr-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bclrr-fail.s
 #error_output: cv-bclrr-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-bclrr-pass.d b/gas/testsuite/gas/riscv/cv-bclrr-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bclrr-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-bi-beqimm.d b/gas/testsuite/gas/riscv/cv-bi-beqimm.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbi1p0
+#as: -march=rv32i_xcvbi
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-bi-bneimm.d b/gas/testsuite/gas/riscv/cv-bi-bneimm.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbi1p0
+#as: -march=rv32i_xcvbi
 #objdump: -d
 
 .*:[ 	]+file format .*

diff --git a/gas/testsuite/gas/riscv/cv-bi-fail-operand-01.d b/gas/testsuite/gas/riscv/cv-bi-fail-operand-01.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbi1p0
+#as: -march=rv32i_xcvbi
 #source: cv-bi-fail-operand-01.s
 #error_output: cv-bi-fail-operand-01.l
diff --git a/gas/testsuite/gas/riscv/cv-bi-fail-operand-02.d b/gas/testsuite/gas/riscv/cv-bi-fail-operand-02.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbi1p0
+#as: -march=rv32i_xcvbi
 #source: cv-bi-fail-operand-02.s
 #error_output: cv-bi-fail-operand-02.l
diff --git a/gas/testsuite/gas/riscv/cv-bi-fail-operand-03.d b/gas/testsuite/gas/riscv/cv-bi-fail-operand-03.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbi1p0
+#as: -march=rv32i_xcvbi
 #source: cv-bi-fail-operand-03.s
 #error_output: cv-bi-fail-operand-03.l
diff --git a/gas/testsuite/gas/riscv/cv-bitmanip-march-xcvbitmanip.d b/gas/testsuite/gas/riscv/cv-bitmanip-march-xcvbitmanip.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bitmanip-march-xcvbitmanip.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-bitrev-fail.d b/gas/testsuite/gas/riscv/cv-bitrev-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bitrev-fail.s
 #error_output: cv-bitrev-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-bitrev-pass.d b/gas/testsuite/gas/riscv/cv-bitrev-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bitrev-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-bset-fail.d b/gas/testsuite/gas/riscv/cv-bset-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bset-fail.s
 #error_output: cv-bset-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-bset-pass.d b/gas/testsuite/gas/riscv/cv-bset-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bset-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-bsetr-fail.d b/gas/testsuite/gas/riscv/cv-bsetr-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bsetr-fail.s
 #error_output: cv-bsetr-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-bsetr-pass.d b/gas/testsuite/gas/riscv/cv-bsetr-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-bsetr-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-clb-fail.d b/gas/testsuite/gas/riscv/cv-clb-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-clb-fail.s
 #error_output: cv-clb-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-clb-pass.d b/gas/testsuite/gas/riscv/cv-clb-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-clb-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-cnt-fail.d b/gas/testsuite/gas/riscv/cv-cnt-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-cnt-fail.s
 #error_output: cv-cnt-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-cnt-pass.d b/gas/testsuite/gas/riscv/cv-cnt-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-cnt-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-elw-fail.d b/gas/testsuite/gas/riscv/cv-elw-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvelw1p0
+#as: -march=rv32i_xcvelw
 #source: cv-elw-fail.s
 #error_output: cv-elw-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-elw-pass.d b/gas/testsuite/gas/riscv/cv-elw-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvelw1p0
+#as: -march=rv32i_xcvelw
 #source: cv-elw-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-extract-fail.d b/gas/testsuite/gas/riscv/cv-extract-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extract-fail.s
 #error_output: cv-extract-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-extract-pass.d b/gas/testsuite/gas/riscv/cv-extract-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extract-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-extractr-fail.d b/gas/testsuite/gas/riscv/cv-extractr-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extractr-fail.s
 #error_output: cv-extractr-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-extractr-pass.d b/gas/testsuite/gas/riscv/cv-extractr-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extractr-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-extractu-fail.d b/gas/testsuite/gas/riscv/cv-extractu-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extractu-fail.s
 #error_output: cv-extractu-fail.l
diff --git a/gas/testsuite/gas/riscv/cv-extractu-pass.d b/gas/testsuite/gas/riscv/cv-extractu-pass.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extractu-pass.s
 #objdump: -d
 

diff --git a/gas/testsuite/gas/riscv/cv-extractur-fail.d b/gas/testsuite/gas/riscv/cv-extractur-fail.d
@@ -1,3 +1,3 @@
-#as: -march=rv32i_xcvbitmanip1p0
+#as: -march=rv32i_xcvbitmanip
 #source: cv-extractur-fail.s
 #error_output: cv-extractur-fail.l