From de60b080e3f8b105b2f69c56de3aeb996f4e81e6 Mon Sep 17 00:00:00 2001
From: Alfie Richards <alfie.richards@arm.com>
Date: Thu, 13 Feb 2025 16:52:28 +0000
Subject: [PATCH] aarch64: Remove FMV beta warning.

This patch removes the warning for target_version and target_clones in aarch64
as it is now spec compliant.

gcc/ChangeLog:

	* config/aarch64/aarch64.cc (aarch64_process_target_version_attr):
	Remove warning.
	* config/aarch64/aarch64.opt: Mark -Wno-experimental-fmv-target
	deprecated.
	* doc/invoke.texi: Ditto.

gcc/testsuite/ChangeLog:

	* g++.target/aarch64/mv-1.C: Remove option.
	* g++.target/aarch64/mv-and-mvc-error1.C: Ditto.
	* g++.target/aarch64/mv-and-mvc-error2.C: Ditto.
	* g++.target/aarch64/mv-and-mvc-error3.C: Ditto.
	* g++.target/aarch64/mv-and-mvc1.C: Ditto.
	* g++.target/aarch64/mv-and-mvc2.C: Ditto.
	* g++.target/aarch64/mv-and-mvc3.C: Ditto.
	* g++.target/aarch64/mv-and-mvc4.C: Ditto.
	* g++.target/aarch64/mv-error1.C: Ditto.
	* g++.target/aarch64/mv-error2.C: Ditto.
	* g++.target/aarch64/mv-error3.C: Ditto.
	* g++.target/aarch64/mv-error4.C: Ditto.
	* g++.target/aarch64/mv-error5.C: Ditto.
	* g++.target/aarch64/mv-error6.C: Ditto.
	* g++.target/aarch64/mv-error7.C: Ditto.
	* g++.target/aarch64/mv-error8.C: Ditto.
	* g++.target/aarch64/mv-pragma.C: Ditto.
	* g++.target/aarch64/mv-symbols1.C: Ditto.
	* g++.target/aarch64/mv-symbols10.C: Ditto.
	* g++.target/aarch64/mv-symbols11.C: Ditto.
	* g++.target/aarch64/mv-symbols12.C: Ditto.
	* g++.target/aarch64/mv-symbols13.C: Ditto.
	* g++.target/aarch64/mv-symbols2.C: Ditto.
	* g++.target/aarch64/mv-symbols3.C: Ditto.
	* g++.target/aarch64/mv-symbols4.C: Ditto.
	* g++.target/aarch64/mv-symbols5.C: Ditto.
	* g++.target/aarch64/mv-symbols6.C: Ditto.
	* g++.target/aarch64/mv-symbols7.C: Ditto.
	* g++.target/aarch64/mv-symbols8.C: Ditto.
	* g++.target/aarch64/mv-symbols9.C: Ditto.
	* g++.target/aarch64/mvc-error1.C: Ditto.
	* g++.target/aarch64/mvc-error2.C: Ditto.
	* g++.target/aarch64/mvc-symbols1.C: Ditto.
	* g++.target/aarch64/mvc-symbols2.C: Ditto.
	* g++.target/aarch64/mvc-symbols3.C: Ditto.
	* g++.target/aarch64/mvc-symbols4.C: Ditto.
	* g++.target/aarch64/mv-warning1.C: Removed.
	* g++.target/aarch64/mvc-warning1.C: Removed.
---
 gcc/config/aarch64/aarch64.cc                        | 9 ---------
 gcc/config/aarch64/aarch64.opt                       | 2 +-
 gcc/doc/invoke.texi                                  | 5 +----
 gcc/testsuite/g++.target/aarch64/mv-1.C              | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc-error1.C | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc-error2.C | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc-error3.C | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc2.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc3.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-and-mvc4.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error1.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error2.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error3.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error4.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error5.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error6.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error7.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-error8.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-pragma.C         | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols1.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols10.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols11.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols12.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols13.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols2.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols3.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols4.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols5.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols6.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols7.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols8.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-symbols9.C       | 1 -
 gcc/testsuite/g++.target/aarch64/mv-warning1.C       | 9 ---------
 gcc/testsuite/g++.target/aarch64/mvc-error1.C        | 1 -
 gcc/testsuite/g++.target/aarch64/mvc-error2.C        | 1 -
 gcc/testsuite/g++.target/aarch64/mvc-symbols1.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mvc-symbols2.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mvc-symbols3.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mvc-symbols4.C      | 1 -
 gcc/testsuite/g++.target/aarch64/mvc-warning1.C      | 1 -
 41 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 gcc/testsuite/g++.target/aarch64/mv-warning1.C

diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index 20ae37bdf7dc..7a99b7f51932 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -20460,15 +20460,6 @@ aarch64_parse_fmv_features (string_slice str, aarch64_feature_flags *isa_flags,
 static bool
 aarch64_process_target_version_attr (tree args)
 {
-  static bool issued_warning = false;
-  if (!issued_warning)
-    {
-      warning (OPT_Wexperimental_fmv_target,
-	       "Function Multi Versioning support is experimental, and the "
-	       "behavior is likely to change");
-      issued_warning = true;
-    }
-
   if (TREE_CODE (args) == TREE_LIST)
     {
       if (TREE_CHAIN (args))
diff --git a/gcc/config/aarch64/aarch64.opt b/gcc/config/aarch64/aarch64.opt
index 9ca753e6a886..8aae953e60d1 100644
--- a/gcc/config/aarch64/aarch64.opt
+++ b/gcc/config/aarch64/aarch64.opt
@@ -445,4 +445,4 @@ trailing destructive updates of the base register used by a pair.
 
 Wexperimental-fmv-target
 Target Var(warn_experimental_fmv) Warning Init(1)
-Warn about usage of experimental Function Multi Versioning.
+This option is deprecated.
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 2eab5140bc2a..be9242aa7e42 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -22533,10 +22533,7 @@ vector-length agnostic code.
 @opindex Wexperimental-fmv-target
 @opindex Wno-experimental-fmv-target
 @item -Wexperimental-fmv-target
-Warn about use of experimental Function Multi Versioning.
-The Arm C Language Extension specification for Function Multi Versioning
-is beta and subject to change. Any usage of FMV is caveated that future
-behavior change and incompatibility is likely.
+This option is deprecated.
 @end table
 
 @subsubsection @option{-march} and @option{-mcpu} Feature Modifiers
diff --git a/gcc/testsuite/g++.target/aarch64/mv-1.C b/gcc/testsuite/g++.target/aarch64/mv-1.C
index 93b8a1365873..5798e41d1559 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-1.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error1.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error1.C
index 98c3883324ee..3ae19e9cdebe 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error1.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) int
 foo () { return 3; } /* { dg-message "previous declaration of .int foo \\\[\\\[target_version\\(.dotprod.\\)\\\]\\\] \\(\\)." } */
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error2.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error2.C
index 5eaa124f3172..a1481f0c435f 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error2.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error2.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("default"))) int
 foo () { return 1; } /* { dg-message "old declaration .int foo \\\[\\\[target_version\\(.default.\\)\\\]\\\] \\(\\)." } */
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error3.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error3.C
index fee6dc45ee3d..c42575e1a05e 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error3.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc-error3.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 float foo () { return 1; } /* { dg-message ".float foo\\(\\). previously defined here" } */
 
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C
index 24b81f5f5f3d..47a1138051de 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc2.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc2.C
index 5939353d2d22..70e539734565 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc2.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc2.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc3.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc3.C
index fb1c596e9196..4fd69c839889 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc3.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc3.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_clones("dotprod", "sve+sve2")))
 int foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc4.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc4.C
index e198fecc4cc3..1d8a6f5d69f9 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-and-mvc4.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-and-mvc4.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("dotprod")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error1.C b/gcc/testsuite/g++.target/aarch64/mv-error1.C
index 806a84f0ab4e..98ef4a7aa878 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error1.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("default"))) int
 foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error2.C b/gcc/testsuite/g++.target/aarch64/mv-error2.C
index afc14f459c3a..bc252ecb375b 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error2.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error2.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) float
 foo () { return 3; } /* { dg-message ".float foo \\\[\\\[target_version\\(.dotprod.\\)\\\]\\\] \\(\\). previously defined here" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error3.C b/gcc/testsuite/g++.target/aarch64/mv-error3.C
index cc6414882639..cc762179c4d2 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error3.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error3.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) float
 foo () { return 3; }
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error4.C b/gcc/testsuite/g++.target/aarch64/mv-error4.C
index a6b57a73c3ed..44d3195590d2 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error4.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error4.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("test"))) float
 foo () { return 3; } /* { dg-error "invalid feature modifier .test. of value .test. in .target_version. attribute" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error5.C b/gcc/testsuite/g++.target/aarch64/mv-error5.C
index 3d2c73446beb..0475938fab3b 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error5.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error5.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("sve+sve2"))) int
 foo();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error6.C b/gcc/testsuite/g++.target/aarch64/mv-error6.C
index 8ea267504802..ed5980b0ec07 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error6.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error6.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("sve+sve2"))) int
 foo () {
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error7.C b/gcc/testsuite/g++.target/aarch64/mv-error7.C
index c1b58edca11d..97496a981680 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error7.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error7.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) int
 foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error8.C b/gcc/testsuite/g++.target/aarch64/mv-error8.C
index 0b6b38ce1000..e5c261a5d10f 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-error8.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-error8.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) int
 foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-pragma.C b/gcc/testsuite/g++.target/aarch64/mv-pragma.C
index 6e5929328bbf..545d0735438d 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-pragma.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-pragma.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 #pragma GCC target ("+sve")
 
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols1.C b/gcc/testsuite/g++.target/aarch64/mv-symbols1.C
index 73cde42fa343..53e0abcd9b43 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols1.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 int foo ()
 {
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols10.C b/gcc/testsuite/g++.target/aarch64/mv-symbols10.C
index 92d4ab617d85..b83e00be94d7 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols10.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols10.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("default"))) void
 foo (int a = 3);
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols11.C b/gcc/testsuite/g++.target/aarch64/mv-symbols11.C
index dadde22622ea..19ab82de7053 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols11.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols11.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("default"))) int
 foo () { return 1; }
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols12.C b/gcc/testsuite/g++.target/aarch64/mv-symbols12.C
index d78ee4b91c5c..a5e54bbf0413 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols12.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols12.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 int foo () {
   return 1;
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols13.C b/gcc/testsuite/g++.target/aarch64/mv-symbols13.C
index 997b9bad6d6c..01b8b6c768b0 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols13.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols13.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 int foo () {
   return 1;
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols2.C b/gcc/testsuite/g++.target/aarch64/mv-symbols2.C
index 55f2d48f5e47..7c8e1bcbed1a 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols2.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols2.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols3.C b/gcc/testsuite/g++.target/aarch64/mv-symbols3.C
index 6ba02a2aae9f..2e8a27f05222 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols3.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols3.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols4.C b/gcc/testsuite/g++.target/aarch64/mv-symbols4.C
index cc013c478489..04cac9d118a3 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols4.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols4.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols5.C b/gcc/testsuite/g++.target/aarch64/mv-symbols5.C
index 1396ca379e48..faa67909c643 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols5.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols5.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_version("default")))
 int foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols6.C b/gcc/testsuite/g++.target/aarch64/mv-symbols6.C
index 2b67bcb47a4e..7e54158f1c80 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols6.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols6.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("default"))) int
 foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols7.C b/gcc/testsuite/g++.target/aarch64/mv-symbols7.C
index 3998adb54a74..a312caf651e1 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols7.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols7.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) int
 foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols8.C b/gcc/testsuite/g++.target/aarch64/mv-symbols8.C
index 5983bbd69251..29382ae56d8f 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols8.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols8.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_version ("dotprod"))) int
 foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-symbols9.C b/gcc/testsuite/g++.target/aarch64/mv-symbols9.C
index bfad9bb5850b..e46d9db2649d 100644
--- a/gcc/testsuite/g++.target/aarch64/mv-symbols9.C
+++ b/gcc/testsuite/g++.target/aarch64/mv-symbols9.C
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 int
 foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mv-warning1.C b/gcc/testsuite/g++.target/aarch64/mv-warning1.C
deleted file mode 100644
index 6346c1673a2e..000000000000
--- a/gcc/testsuite/g++.target/aarch64/mv-warning1.C
+++ /dev/null
@@ -1,9 +0,0 @@
-/* { dg-do compile } */
-/* { dg-require-ifunc "" } */
-/* { dg-options "-O0" } */
-
-__attribute__((target_version("default")))
-int foo () { return 1; }/* { dg-warning "Function Multi Versioning support is experimental, and the behavior is likely to change" } */
-
-__attribute__((target_version("rng")))
-int foo () { return 1; }
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-error1.C b/gcc/testsuite/g++.target/aarch64/mvc-error1.C
index 0843fa2e3f6c..cfc550af550c 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-error1.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-error1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_clones ("default, dotprod"))) float
 foo (); /* { dg-message "previous declaration of .float foo \\\[\\\[target_clones\\(.default., .dotprod.\\)\\\]\\\] \\(\\)." } */
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-error2.C b/gcc/testsuite/g++.target/aarch64/mvc-error2.C
index 752a9c06573a..b253c805390b 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-error2.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-error2.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__ ((target_clones ("default, dotprod"))) float
 foo () { return 3; } /* { dg-message "previous declaration" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-symbols1.C b/gcc/testsuite/g++.target/aarch64/mvc-symbols1.C
index 983194d74af2..2dd7c79f16cf 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-symbols1.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-symbols1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_clones("default", "dotprod", "sve+sve2")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-symbols2.C b/gcc/testsuite/g++.target/aarch64/mvc-symbols2.C
index 58a797947cea..75b9c126dd8c 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-symbols2.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-symbols2.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_clones("default", "dotprod", "sve+sve2")))
 int foo ()
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-symbols3.C b/gcc/testsuite/g++.target/aarch64/mvc-symbols3.C
index 2a315d2db5cf..baea04ef5ec6 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-symbols3.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-symbols3.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_clones("default", "dotprod", "sve+sve2")))
 int foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-symbols4.C b/gcc/testsuite/g++.target/aarch64/mvc-symbols4.C
index 9c8a7bd37f27..6c86ae61e5fa 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-symbols4.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-symbols4.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_clones("default", "dotprod", "sve+sve2")))
 int foo ();
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-warning1.C b/gcc/testsuite/g++.target/aarch64/mvc-warning1.C
index 289ba64c4fc0..d394e768eb06 100644
--- a/gcc/testsuite/g++.target/aarch64/mvc-warning1.C
+++ b/gcc/testsuite/g++.target/aarch64/mvc-warning1.C
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-ifunc "" } */
 /* { dg-options "-O0" } */
-/* { dg-additional-options "-Wno-experimental-fmv-target" } */
 
 __attribute__((target_clones("default", "dotprod", "sve+sve2")))
 int foo () {
-- 
2.47.3