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 d542941b2d9..1944bd28bfb 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -20078,15 +20078,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 f32d56d4ffa..0871ec6fd84 100644
--- a/gcc/config/aarch64/aarch64.opt
+++ b/gcc/config/aarch64/aarch64.opt
@@ -434,4 +434,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 b3f7f0479cc..28fc1309886 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -21927,10 +21927,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 93b8a136587..5798e41d155 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 00d3826f757..22ba1c73e2c 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 definition" } */
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 bf8a4112a21..d3e652bba8e 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" } */
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 3233a98d1ad..d431279b4cb 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 "previous definition" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C b/gcc/testsuite/g++.target/aarch64/mv-and-mvc1.C
index 0e2e746f20e..6e8838139e0 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 6929b153c47..8c186f37f65 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 b25b6214f4c..927a0ada683 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 c122c9fe3ab..3bef71e4258 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 0b9642c9ab6..ed89f153728 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 167af4ad380..f79d17fcca0 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 "previously defined here" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mv-error3.C b/gcc/testsuite/g++.target/aarch64/mv-error3.C
index cc641488263..cc762179c4d 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 a6b57a73c3e..44d3195590d 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 3d2c73446be..0475938fab3 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 8ea26750480..ed5980b0ec0 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 c1b58edca11..97496a98168 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 0b6b38ce100..e5c261a5d10 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 6e5929328bb..545d0735438 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 73cde42fa34..53e0abcd9b4 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 92d4ab617d8..b83e00be94d 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 dadde22622e..19ab82de705 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 d78ee4b91c5..a5e54bbf041 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 997b9bad6d6..01b8b6c768b 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 55f2d48f5e4..7c8e1bcbed1 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 6ba02a2aae9..2e8a27f0522 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 cc013c47848..04cac9d118a 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 1396ca379e4..faa67909c64 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 e53d88d8bf3..cbd665ea8ef 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 3998adb54a7..a312caf651e 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 5983bbd6925..29382ae56d8 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 bfad9bb5850..e46d9db2649 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 6346c1673a2..00000000000
--- 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 db6f5a40b39..118a6c85b1f 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 definition" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-error2.C b/gcc/testsuite/g++.target/aarch64/mvc-error2.C
index 157086d439d..c4affd72098 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 definition" } */
diff --git a/gcc/testsuite/g++.target/aarch64/mvc-symbols1.C b/gcc/testsuite/g++.target/aarch64/mvc-symbols1.C
index 983194d74af..2dd7c79f16c 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 58a797947ce..75b9c126dd8 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 2a315d2db5c..baea04ef5ec 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 9c8a7bd37f2..6c86ae61e5f 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 b6fb2840ab6..bc86f024d84 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 () {
