aarch64 testsuite: Merge exts_sve2 into exts

Now that we support enabling +sme without +sve2, we no longer need to
include armv9-a when checking assembler support for SME extensions.
Merge exts_sve2 back into exts, and remove the separate handling for
exts_sve2.  This is a partial revert of r16-2660-g9793ffce933234.

gcc/testsuite/ChangeLog:

	* lib/target-supports.exp: Merge exts_sve2 handling into exts.

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index de72ffea4cf24ffac03b18de7b644838abc85b6c..e7165e2e1b8c76d3a615abb30560266c1d6151f9 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -12758,11 +12758,6 @@ set exts {
     "fp" "fp8" "fp8dot2" "fp8dot4" "fp8fma" "i8mm" "ls64" "lse" "lut"
     "sb" "simd" "sve-b16b16" "sve" "sve2" "sve-sm4" "sve-aes" "sve-bitperm"
     "sve-sha3" "f8f16mm" "f8f32mm" "sve-f16f32mm"
-}
-
-# We don't support SME without SVE2, so we'll use armv9 as the base
-# archiecture for SME and the features that require it.
-set exts_sve2 {
     "sme-f8f16" "sme-f8f32"
     "sme-b16b16" "sme-f16f16" "sme-i16i64" "sme" "sme2" "sme2p1"
     "ssve-fp8dot2" "ssve-fp8dot4" "ssve-fp8fma" "sve-bfscale" "sme-lutv2"
@@ -12782,20 +12777,6 @@ foreach { aarch64_ext } $exts {
     }]
 }
 
-foreach { aarch64_ext } $exts_sve2 {
-    eval [string map [list FUNC $aarch64_ext] {
-       proc check_effective_target_aarch64_asm_FUNC_ok { } {
-         if { [istarget aarch64*-*-*] } {
-               return [check_no_compiler_messages aarch64_FUNC_assembler object {
-                       __asm__ (".arch_extension FUNC");
-               } "-march=armv9-a+FUNC"]
-         } else {
-               return 0
-         }
-       }
-    }]
-}
-
 proc check_effective_target_aarch64_sysreg_guarding_ok { } {
     if { [istarget aarch64*-*-*] && [check_effective_target_elf] } {
        return [check_no_compiler_messages aarch64_assembler object {