The current fallback option -march=armv9-a+sme pulls in an SVE2
dependency that isn't need in most tests.  Switch to -march=armv8-a+sme
so that we test SME without SVE enabled.

gcc/testsuite/ChangeLog:

        * g++.target/aarch64/sme/aarch64-sme-acle-asm.exp: Use
        -march=armv8-a+sme when SME isn't already enabled.
        * g++.target/aarch64/sme/aarch64-sme.exp: Ditto.
        * g++.target/aarch64/sme2/aarch64-sme2-acle-asm.exp: Ditto.
        * gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp: Ditto.
        * gcc.target/aarch64/sme/aarch64-sme.exp: Ditto.
        * gcc.target/aarch64/sme2/aarch64-sme2-acle-asm.exp: Ditto.


diff --git a/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme-acle-asm.exp 
b/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme-acle-asm.exp
index 
0058b7c111135a3107f915e260b68e3292b13a75..9c1e87a8520a4816a547b4a0b1878410ad3608c8
 100644
--- a/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme-acle-asm.exp
+++ b/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme-acle-asm.exp
@@ -34,7 +34,7 @@ dg-init
 if { [check_effective_target_aarch64_sme] } {
     set sme_flags ""
 } else {
-    set sme_flags "-march=armv9-a+sme"
+    set sme_flags "-march=armv8-a+sme"
 }
 
 # Turn off any codegen tweaks by default that may affect expected assembly.
diff --git a/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme.exp 
b/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme.exp
index 
c29c327bb72077fd2dde9329edd87b5354a8ccb9..ef54018cdb1deec8c708dd96e920fc7dfc6e2379
 100644
--- a/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme.exp
+++ b/gcc/testsuite/g++.target/aarch64/sme/aarch64-sme.exp
@@ -33,7 +33,7 @@ dg-init
 if { [check_effective_target_aarch64_sme] } {
     set sme_flags ""
 } else {
-    set sme_flags "-march=armv9-a+sme"
+    set sme_flags "-march=armv8-a+sme"
 }
 
 aarch64-with-arch-dg-options $sme_flags {
diff --git a/gcc/testsuite/g++.target/aarch64/sme2/aarch64-sme2-acle-asm.exp 
b/gcc/testsuite/g++.target/aarch64/sme2/aarch64-sme2-acle-asm.exp
index 
5f1ea41cc3fadd3515f4b10c4259be439d080acc..142b2a1c4364a6b03dead49d29e86587758605e0
 100644
--- a/gcc/testsuite/g++.target/aarch64/sme2/aarch64-sme2-acle-asm.exp
+++ b/gcc/testsuite/g++.target/aarch64/sme2/aarch64-sme2-acle-asm.exp
@@ -34,7 +34,7 @@ dg-init
 if { [check_effective_target_aarch64_sme2] } {
     set sme2_flags ""
 } else {
-    set sme2_flags "-march=armv9-a+sme2"
+    set sme2_flags "-march=armv8-a+sme2"
 }
 
 # Turn off any codegen tweaks by default that may affect expected assembly.
diff --git a/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp 
b/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp
index 
fbb1b953d7180a996d3744d0418195f57ed44604..aaea343437f19774c703120d606d9257ef7f6b3d
 100644
--- a/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp
+++ b/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme-acle-asm.exp
@@ -34,7 +34,7 @@ dg-init
 if { [check_effective_target_aarch64_sme] } {
     set sme_flags ""
 } else {
-    set sme_flags "-march=armv9-a+sme"
+    set sme_flags "-march=armv8-a+sme"
 }
 
 # Turn off any codegen tweaks by default that may affect expected assembly.
diff --git a/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme.exp 
b/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme.exp
index 
bca51dde73b41f3aaa2f0bce26834b1959683000..39fcc51289058edde9aed66cd85cd21ca1148019
 100644
--- a/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme.exp
+++ b/gcc/testsuite/gcc.target/aarch64/sme/aarch64-sme.exp
@@ -33,7 +33,7 @@ dg-init
 if { [check_effective_target_aarch64_sme] } {
     set sme_flags ""
 } else {
-    set sme_flags "-march=armv9-a+sme"
+    set sme_flags "-march=armv8-a+sme"
 }
 
 aarch64-with-arch-dg-options $sme_flags {
diff --git a/gcc/testsuite/gcc.target/aarch64/sme2/aarch64-sme2-acle-asm.exp 
b/gcc/testsuite/gcc.target/aarch64/sme2/aarch64-sme2-acle-asm.exp
index 
4d159a1c400046c3beff3795466b1e43ec0dae31..304c0886df60830c3ac78148249190ae736bbe74
 100644
--- a/gcc/testsuite/gcc.target/aarch64/sme2/aarch64-sme2-acle-asm.exp
+++ b/gcc/testsuite/gcc.target/aarch64/sme2/aarch64-sme2-acle-asm.exp
@@ -34,7 +34,7 @@ dg-init
 if { [check_effective_target_aarch64_sme2] } {
     set sme2_flags ""
 } else {
-    set sme2_flags "-march=armv9-a+sme2"
+    set sme2_flags "-march=armv8-a+sme2"
 }
 
 # Turn off any codegen tweaks by default that may affect expected assembly.

Reply via email to