diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f16_indices_1.c
index 2174d6e..46fa753 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float16x4x2_t
 f_vld2_lane_f16 (float16_t * p, float16x4x2_t v)
 {
   float16x4x2_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2_lane_f16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2_lane_f16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f32_indices_1.c
index 04be713..d1895f0 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float32x2x2_t
 f_vld2_lane_f32 (float32_t * p, float32x2x2_t v)
 {
   float32x2x2_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2_lane_f32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2_lane_f32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f64_indices_1.c
index a03d165..19dd5f4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_f64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 float64x1x2_t
 f_vld2_lane_f64 (float64_t * p, float64x1x2_t v)
 {
   float64x1x2_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld2_lane_f64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld2_lane_f64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_p8_indices_1.c
index 3a7aeb3..df3ce8c 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_p8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 poly8x8x2_t
 f_vld2_lane_p8 (poly8_t * p, poly8x8x2_t v)
 {
   poly8x8x2_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2_lane_p8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2_lane_p8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s16_indices_1.c
index 0b6314c..ad56c8b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int16x4x2_t
 f_vld2_lane_s16 (int16_t * p, int16x4x2_t v)
 {
   int16x4x2_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2_lane_s16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2_lane_s16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s32_indices_1.c
index 3314780..8b7455d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int32x2x2_t
 f_vld2_lane_s32 (int32_t * p, int32x2x2_t v)
 {
   int32x2x2_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2_lane_s32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2_lane_s32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s64_indices_1.c
index 351ba40..de0a2c1 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int64x1x2_t
 f_vld2_lane_s64 (int64_t * p, int64x1x2_t v)
 {
   int64x1x2_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld2_lane_s64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld2_lane_s64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s8_indices_1.c
index 1db7462..ad414a5 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_s8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int8x8x2_t
 f_vld2_lane_s8 (int8_t * p, int8x8x2_t v)
 {
   int8x8x2_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2_lane_s8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2_lane_s8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u16_indices_1.c
index b65ae56..a80b54d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint16x4x2_t
 f_vld2_lane_u16 (uint16_t * p, uint16x4x2_t v)
 {
   uint16x4x2_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2_lane_u16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2_lane_u16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u32_indices_1.c
index 4990ed0..76db072 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint32x2x2_t
 f_vld2_lane_u32 (uint32_t * p, uint32x2x2_t v)
 {
   uint32x2x2_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2_lane_u32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2_lane_u32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u64_indices_1.c
index 09ff01c..3539a3f 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint64x1x2_t
 f_vld2_lane_u64 (uint64_t * p, uint64x1x2_t v)
 {
   uint64x1x2_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld2_lane_u64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld2_lane_u64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u8_indices_1.c
index d0c40a1..20e8465 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2_lane_u8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint8x8x2_t
 f_vld2_lane_u8 (uint8_t * p, uint8x8x2_t v)
 {
   uint8x8x2_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2_lane_u8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2_lane_u8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f16_indices_1.c
index 83ae82c..f921d32 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float16x8x2_t
 f_vld2q_lane_f16 (float16_t * p, float16x8x2_t v)
 {
   float16x8x2_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2q_lane_f16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2q_lane_f16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f32_indices_1.c
index 84853f3..0c3c947 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float32x4x2_t
 f_vld2q_lane_f32 (float32_t * p, float32x4x2_t v)
 {
   float32x4x2_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2q_lane_f32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2q_lane_f32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f64_indices_1.c
index 4f106bc..5d2eb2d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_f64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 float64x2x2_t
 f_vld2q_lane_f64 (float64_t * p, float64x2x2_t v)
 {
   float64x2x2_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2q_lane_f64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2q_lane_f64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_p8_indices_1.c
index 04eab14..b48aca4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_p8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 poly8x16x2_t
 f_vld2q_lane_p8 (poly8_t * p, poly8x16x2_t v)
 {
   poly8x16x2_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld2q_lane_p8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld2q_lane_p8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s16_indices_1.c
index 048517d..c3062c9 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int16x8x2_t
 f_vld2q_lane_s16 (int16_t * p, int16x8x2_t v)
 {
   int16x8x2_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2q_lane_s16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2q_lane_s16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s32_indices_1.c
index 620bafb..bfb4f0a 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int32x4x2_t
 f_vld2q_lane_s32 (int32_t * p, int32x4x2_t v)
 {
   int32x4x2_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2q_lane_s32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2q_lane_s32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s64_indices_1.c
index e182c6d..84d453a 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int64x2x2_t
 f_vld2q_lane_s64 (int64_t * p, int64x2x2_t v)
 {
   int64x2x2_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2q_lane_s64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2q_lane_s64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s8_indices_1.c
index a58538e..ec37d1b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_s8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int8x16x2_t
 f_vld2q_lane_s8 (int8_t * p, int8x16x2_t v)
 {
   int8x16x2_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld2q_lane_s8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld2q_lane_s8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u16_indices_1.c
index cf6e9a1..3588131 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint16x8x2_t
 f_vld2q_lane_u16 (uint16_t * p, uint16x8x2_t v)
 {
   uint16x8x2_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2q_lane_u16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld2q_lane_u16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u32_indices_1.c
index 6945cf0..7f27214 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint32x4x2_t
 f_vld2q_lane_u32 (uint32_t * p, uint32x4x2_t v)
 {
   uint32x4x2_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2q_lane_u32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld2q_lane_u32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u64_indices_1.c
index 84f0959..828f7d3 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint64x2x2_t
 f_vld2q_lane_u64 (uint64_t * p, uint64x2x2_t v)
 {
   uint64x2x2_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2q_lane_u64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld2q_lane_u64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u8_indices_1.c
index 82ecfe2..08fe749 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld2q_lane_u8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint8x16x2_t
 f_vld2q_lane_u8 (uint8_t * p, uint8x16x2_t v)
 {
   uint8x16x2_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld2q_lane_u8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld2q_lane_u8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f16_indices_1.c
index 21b7861..d068d79 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float16x4x3_t
 f_vld3_lane_f16 (float16_t * p, float16x4x3_t v)
 {
   float16x4x3_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3_lane_f16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3_lane_f16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f32_indices_1.c
index 4db8b7c..6d13e2b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float32x2x3_t
 f_vld3_lane_f32 (float32_t * p, float32x2x3_t v)
 {
   float32x2x3_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3_lane_f32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3_lane_f32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f64_indices_1.c
index 7465976..63d5551 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_f64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 float64x1x3_t
 f_vld3_lane_f64 (float64_t * p, float64x1x3_t v)
 {
   float64x1x3_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld3_lane_f64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld3_lane_f64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_p8_indices_1.c
index 712c67c..a6a9666 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_p8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 poly8x8x3_t
 f_vld3_lane_p8 (poly8_t * p, poly8x8x3_t v)
 {
   poly8x8x3_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3_lane_p8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3_lane_p8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s16_indices_1.c
index 22e11d3..69fd90d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int16x4x3_t
 f_vld3_lane_s16 (int16_t * p, int16x4x3_t v)
 {
   int16x4x3_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3_lane_s16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3_lane_s16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s32_indices_1.c
index ed4f50b..01816e8 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int32x2x3_t
 f_vld3_lane_s32 (int32_t * p, int32x2x3_t v)
 {
   int32x2x3_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3_lane_s32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3_lane_s32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s64_indices_1.c
index ae7b35e..f2a6dbd 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int64x1x3_t
 f_vld3_lane_s64 (int64_t * p, int64x1x3_t v)
 {
   int64x1x3_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld3_lane_s64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld3_lane_s64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s8_indices_1.c
index 320ef37..5d5f845 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_s8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int8x8x3_t
 f_vld3_lane_s8 (int8_t * p, int8x8x3_t v)
 {
   int8x8x3_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3_lane_s8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3_lane_s8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u16_indices_1.c
index a00253a..8be04ed 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint16x4x3_t
 f_vld3_lane_u16 (uint16_t * p, uint16x4x3_t v)
 {
   uint16x4x3_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3_lane_u16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3_lane_u16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u32_indices_1.c
index d53ead3..bf890d3 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint32x2x3_t
 f_vld3_lane_u32 (uint32_t * p, uint32x2x3_t v)
 {
   uint32x2x3_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3_lane_u32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3_lane_u32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u64_indices_1.c
index e9b4427..926718e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint64x1x3_t
 f_vld3_lane_u64 (uint64_t * p, uint64x1x3_t v)
 {
   uint64x1x3_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld3_lane_u64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld3_lane_u64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u8_indices_1.c
index 3afff9f..d129bba 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3_lane_u8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint8x8x3_t
 f_vld3_lane_u8 (uint8_t * p, uint8x8x3_t v)
 {
   uint8x8x3_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3_lane_u8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3_lane_u8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f16_indices_1.c
index 95ec391..ed4d7d5 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float16x8x3_t
 f_vld3q_lane_f16 (float16_t * p, float16x8x3_t v)
 {
   float16x8x3_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3q_lane_f16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3q_lane_f16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f32_indices_1.c
index e38799c..0c276c4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float32x4x3_t
 f_vld3q_lane_f32 (float32_t * p, float32x4x3_t v)
 {
   float32x4x3_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3q_lane_f32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3q_lane_f32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f64_indices_1.c
index c84c6c8..2c666c6 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_f64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 float64x2x3_t
 f_vld3q_lane_f64 (float64_t * p, float64x2x3_t v)
 {
   float64x2x3_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3q_lane_f64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3q_lane_f64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_p8_indices_1.c
index 1dea0d4..2041472 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_p8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 poly8x16x3_t
 f_vld3q_lane_p8 (poly8_t * p, poly8x16x3_t v)
 {
   poly8x16x3_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld3q_lane_p8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld3q_lane_p8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s16_indices_1.c
index 03f59f0..7b7b2b6 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int16x8x3_t
 f_vld3q_lane_s16 (int16_t * p, int16x8x3_t v)
 {
   int16x8x3_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3q_lane_s16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3q_lane_s16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s32_indices_1.c
index 57315ba..c8db256 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int32x4x3_t
 f_vld3q_lane_s32 (int32_t * p, int32x4x3_t v)
 {
   int32x4x3_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3q_lane_s32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3q_lane_s32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s64_indices_1.c
index fff4f80..e350971 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int64x2x3_t
 f_vld3q_lane_s64 (int64_t * p, int64x2x3_t v)
 {
   int64x2x3_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3q_lane_s64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3q_lane_s64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s8_indices_1.c
index 9c340e0..1b1c682 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_s8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int8x16x3_t
 f_vld3q_lane_s8 (int8_t * p, int8x16x3_t v)
 {
   int8x16x3_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld3q_lane_s8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld3q_lane_s8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u16_indices_1.c
index 3dfaacb..adbc42f 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint16x8x3_t
 f_vld3q_lane_u16 (uint16_t * p, uint16x8x3_t v)
 {
   uint16x8x3_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3q_lane_u16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld3q_lane_u16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u32_indices_1.c
index 9d4ed46..c79388a 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint32x4x3_t
 f_vld3q_lane_u32 (uint32_t * p, uint32x4x3_t v)
 {
   uint32x4x3_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3q_lane_u32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld3q_lane_u32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u64_indices_1.c
index ca188a8..7513140 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint64x2x3_t
 f_vld3q_lane_u64 (uint64_t * p, uint64x2x3_t v)
 {
   uint64x2x3_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3q_lane_u64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld3q_lane_u64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u8_indices_1.c
index 5ca835e..5fec76e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld3q_lane_u8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint8x16x3_t
 f_vld3q_lane_u8 (uint8_t * p, uint8x16x3_t v)
 {
   uint8x16x3_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld3q_lane_u8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld3q_lane_u8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f16_indices_1.c
index bd7ecf0..b5d5adf 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float16x4x4_t
 f_vld4_lane_f16 (float16_t * p, float16x4x4_t v)
 {
   float16x4x4_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4_lane_f16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4_lane_f16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f32_indices_1.c
index f956ee6..183036f 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float32x2x4_t
 f_vld4_lane_f32 (float32_t * p, float32x2x4_t v)
 {
   float32x2x4_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4_lane_f32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4_lane_f32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f64_indices_1.c
index 52763b4..655c27f 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_f64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 float64x1x4_t
 f_vld4_lane_f64 (float64_t * p, float64x1x4_t v)
 {
   float64x1x4_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld4_lane_f64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld4_lane_f64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_p8_indices_1.c
index 8f9d3ee..7bc5140 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_p8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 poly8x8x4_t
 f_vld4_lane_p8 (poly8_t * p, poly8x8x4_t v)
 {
   poly8x8x4_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4_lane_p8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4_lane_p8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s16_indices_1.c
index 53f51a0..5881a89 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int16x4x4_t
 f_vld4_lane_s16 (int16_t * p, int16x4x4_t v)
 {
   int16x4x4_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4_lane_s16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4_lane_s16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s32_indices_1.c
index 7b8396e..02282d9 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int32x2x4_t
 f_vld4_lane_s32 (int32_t * p, int32x2x4_t v)
 {
   int32x2x4_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4_lane_s32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4_lane_s32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s64_indices_1.c
index 8cc138e..162b5c4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int64x1x4_t
 f_vld4_lane_s64 (int64_t * p, int64x1x4_t v)
 {
   int64x1x4_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld4_lane_s64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld4_lane_s64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s8_indices_1.c
index 1c3bcf3..4949410 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_s8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int8x8x4_t
 f_vld4_lane_s8 (int8_t * p, int8x8x4_t v)
 {
   int8x8x4_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4_lane_s8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4_lane_s8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u16_indices_1.c
index 2ac73af..16d54e9 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint16x4x4_t
 f_vld4_lane_u16 (uint16_t * p, uint16x4x4_t v)
 {
   uint16x4x4_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4_lane_u16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4_lane_u16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u32_indices_1.c
index e37e038..c65bd30 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint32x2x4_t
 f_vld4_lane_u32 (uint32_t * p, uint32x2x4_t v)
 {
   uint32x2x4_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4_lane_u32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4_lane_u32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u64_indices_1.c
index 96f0bb8..e8f2884 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint64x1x4_t
 f_vld4_lane_u64 (uint64_t * p, uint64x1x4_t v)
 {
   uint64x1x4_t res;
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld4_lane_u64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   res = vld4_lane_u64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u8_indices_1.c
index e8de335..cb7f487 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4_lane_u8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint8x8x4_t
 f_vld4_lane_u8 (uint8_t * p, uint8x8x4_t v)
 {
   uint8x8x4_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4_lane_u8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4_lane_u8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f16_indices_1.c
index c27559f..e9947d4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float16x8x4_t
 f_vld4q_lane_f16 (float16_t * p, float16x8x4_t v)
 {
   float16x8x4_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4q_lane_f16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4q_lane_f16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f32_indices_1.c
index 93d5730..8d7d03e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 float32x4x4_t
 f_vld4q_lane_f32 (float32_t * p, float32x4x4_t v)
 {
   float32x4x4_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4q_lane_f32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4q_lane_f32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f64_indices_1.c
index 062e0eb..d0ce4e5 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_f64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 float64x2x4_t
 f_vld4q_lane_f64 (float64_t * p, float64x2x4_t v)
 {
   float64x2x4_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4q_lane_f64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4q_lane_f64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_p8_indices_1.c
index 32ae95b..bb1cb31 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_p8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 poly8x16x4_t
 f_vld4q_lane_p8 (poly8_t * p, poly8x16x4_t v)
 {
   poly8x16x4_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld4q_lane_p8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld4q_lane_p8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s16_indices_1.c
index f4a7225..d96fe0e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int16x8x4_t
 f_vld4q_lane_s16 (int16_t * p, int16x8x4_t v)
 {
   int16x8x4_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4q_lane_s16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4q_lane_s16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s32_indices_1.c
index 45dd197..446ff43 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 int32x4x4_t
 f_vld4q_lane_s32 (int32_t * p, int32x4x4_t v)
 {
   int32x4x4_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4q_lane_s32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4q_lane_s32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s64_indices_1.c
index 5a01d05..df02f39 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int64x2x4_t
 f_vld4q_lane_s64 (int64_t * p, int64x2x4_t v)
 {
   int64x2x4_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4q_lane_s64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4q_lane_s64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s8_indices_1.c
index db66917..d7573c1 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_s8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 int8x16x4_t
 f_vld4q_lane_s8 (int8_t * p, int8x16x4_t v)
 {
   int8x16x4_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld4q_lane_s8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld4q_lane_s8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u16_indices_1.c
index 5a27639..05be38b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u16_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint16x8x4_t
 f_vld4q_lane_u16 (uint16_t * p, uint16x8x4_t v)
 {
   uint16x8x4_t res;
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4q_lane_u16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   res = vld4q_lane_u16 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u32_indices_1.c
index 5d8a570..572c6d0 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u32_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 uint32x4x4_t
 f_vld4q_lane_u32 (uint32_t * p, uint32x4x4_t v)
 {
   uint32x4x4_t res;
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4q_lane_u32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   res = vld4q_lane_u32 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u64_indices_1.c
index 92b4c51..a6828df 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u64_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint64x2x4_t
 f_vld4q_lane_u64 (uint64_t * p, uint64x2x4_t v)
 {
   uint64x2x4_t res;
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4q_lane_u64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   res = vld4q_lane_u64 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u8_indices_1.c
index 293416d..8b5eb43 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vld4q_lane_u8_indices_1.c
@@ -2,16 +2,15 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 uint8x16x4_t
 f_vld4q_lane_u8 (uint8_t * p, uint8x16x4_t v)
 {
   uint8x16x4_t res;
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld4q_lane_u8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   res = vld4q_lane_u8 (p, v, -1);
   return res;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f16_indices_1.c
index dbf5241..93d6e5c 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_f16 (float16_t * p, float16x4x2_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2_lane_f16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2_lane_f16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f32_indices_1.c
index 1a39625..a0ea45b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_f32 (float32_t * p, float32x2x2_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2_lane_f32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2_lane_f32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f64_indices_1.c
index 3674715..2eca26f 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_f64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2_lane_f64 (float64_t * p, float64x1x2_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst2_lane_f64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst2_lane_f64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_p8_indices_1.c
index 770fe9d..3692d7d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_p8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_p8 (poly8_t * p, poly8x8x2_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2_lane_p8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2_lane_p8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s16_indices_1.c
index ac89d03..94ac769 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_s16 (int16_t * p, int16x4x2_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2_lane_s16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2_lane_s16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s32_indices_1.c
index 4bbceb6..3ef5687 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_s32 (int32_t * p, int32x2x2_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2_lane_s32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2_lane_s32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s64_indices_1.c
index da60b9b..1e3c202 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2_lane_s64 (int64_t * p, int64x1x2_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst2_lane_s64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst2_lane_s64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s8_indices_1.c
index b5bf3d6..a96b1b4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_s8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_s8 (int8_t * p, int8x8x2_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2_lane_s8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2_lane_s8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u16_indices_1.c
index bfdc5c0..970be4a 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_u16 (uint16_t * p, uint16x4x2_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2_lane_u16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2_lane_u16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u32_indices_1.c
index e32c6ff..4c8e2f1 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_u32 (uint32_t * p, uint32x2x2_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2_lane_u32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2_lane_u32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u64_indices_1.c
index 03546bd..dfb0de2 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2_lane_u64 (uint64_t * p, uint64x1x2_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst2_lane_u64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst2_lane_u64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u8_indices_1.c
index 74da14c..4877ea2 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2_lane_u8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2_lane_u8 (uint8_t * p, uint8x8x2_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2_lane_u8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2_lane_u8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f16_indices_1.c
index e3c0296..729314e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2q_lane_f16 (float16_t * p, float16x8x2_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2q_lane_f16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2q_lane_f16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f32_indices_1.c
index 246c60c..75f7dd6 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2q_lane_f32 (float32_t * p, float32x4x2_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2q_lane_f32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2q_lane_f32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f64_indices_1.c
index a102921..9a23056 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_f64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2q_lane_f64 (float64_t * p, float64x2x2_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2q_lane_f64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2q_lane_f64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_p8_indices_1.c
index 8966b53..c3f2433 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_p8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2q_lane_p8 (poly8_t * p, poly8x16x2_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst2q_lane_p8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst2q_lane_p8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s16_indices_1.c
index 19d22a1..82ae1e4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2q_lane_s16 (int16_t * p, int16x8x2_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2q_lane_s16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2q_lane_s16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s32_indices_1.c
index bbb772c..27208bd 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2q_lane_s32 (int32_t * p, int32x4x2_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2q_lane_s32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2q_lane_s32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s64_indices_1.c
index 6efc681..a66d55b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2q_lane_s64 (int64_t * p, int64x2x2_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2q_lane_s64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2q_lane_s64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s8_indices_1.c
index 7c0eb49..7a3338b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_s8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2q_lane_s8 (int8_t * p, int8x16x2_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst2q_lane_s8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst2q_lane_s8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u16_indices_1.c
index b079a34..999ee70 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2q_lane_u16 (uint16_t * p, uint16x8x2_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2q_lane_u16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst2q_lane_u16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u32_indices_1.c
index b919e2b..fd4422d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst2q_lane_u32 (uint32_t * p, uint32x4x2_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2q_lane_u32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst2q_lane_u32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u64_indices_1.c
index 7d31d65..78863b5 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2q_lane_u64 (uint64_t * p, uint64x2x2_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2q_lane_u64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst2q_lane_u64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u8_indices_1.c
index 9c35ce9..e7463e1 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst2q_lane_u8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst2q_lane_u8 (uint8_t * p, uint8x16x2_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst2q_lane_u8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst2q_lane_u8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f16_indices_1.c
index 406dfd4..1f262a1 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_f16 (float16_t * p, float16x4x3_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3_lane_f16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3_lane_f16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f32_indices_1.c
index 1d7a57e..0cec880 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_f32 (float32_t * p, float32x2x3_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3_lane_f32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3_lane_f32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f64_indices_1.c
index 5e9b9ea..d63aa1f 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_f64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3_lane_f64 (float64_t * p, float64x1x3_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst3_lane_f64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst3_lane_f64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_p8_indices_1.c
index 7599a19..0122b75 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_p8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_p8 (poly8_t * p, poly8x8x3_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3_lane_p8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3_lane_p8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s16_indices_1.c
index f8b856d..2c57d2b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_s16 (int16_t * p, int16x4x3_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3_lane_s16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3_lane_s16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s32_indices_1.c
index 7fbf2e89..c0b3a5b 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_s32 (int32_t * p, int32x2x3_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3_lane_s32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3_lane_s32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s64_indices_1.c
index 801dcc0..2c2d043 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3_lane_s64 (int64_t * p, int64x1x3_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst3_lane_s64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst3_lane_s64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s8_indices_1.c
index 1623326..b93d69a 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_s8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_s8 (int8_t * p, int8x8x3_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3_lane_s8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3_lane_s8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u16_indices_1.c
index 7304da6..ce6025d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_u16 (uint16_t * p, uint16x4x3_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3_lane_u16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3_lane_u16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u32_indices_1.c
index 4c1c4b7..5696034 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_u32 (uint32_t * p, uint32x2x3_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3_lane_u32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3_lane_u32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u64_indices_1.c
index adc8fb2..9a36915 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3_lane_u64 (uint64_t * p, uint64x1x3_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst3_lane_u64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst3_lane_u64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u8_indices_1.c
index 8a55b55..9004f3d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3_lane_u8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3_lane_u8 (uint8_t * p, uint8x8x3_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3_lane_u8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3_lane_u8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f16_indices_1.c
index 4e8b24c..6c24a5e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3q_lane_f16 (float16_t * p, float16x8x3_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3q_lane_f16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3q_lane_f16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f32_indices_1.c
index 8a081fe..d1ffc04 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3q_lane_f32 (float32_t * p, float32x4x3_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3q_lane_f32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3q_lane_f32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f64_indices_1.c
index 2d867f2..e165f2a 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_f64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3q_lane_f64 (float64_t * p, float64x2x3_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3q_lane_f64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3q_lane_f64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_p8_indices_1.c
index 295f6b6..7fb3c96 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_p8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3q_lane_p8 (poly8_t * p, poly8x16x3_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst3q_lane_p8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst3q_lane_p8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s16_indices_1.c
index 160c90c..de8ae54 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3q_lane_s16 (int16_t * p, int16x8x3_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3q_lane_s16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3q_lane_s16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s32_indices_1.c
index 0324f3c..6502bcf 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3q_lane_s32 (int32_t * p, int32x4x3_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3q_lane_s32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3q_lane_s32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s64_indices_1.c
index b565126..c6d8236 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3q_lane_s64 (int64_t * p, int64x2x3_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3q_lane_s64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3q_lane_s64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s8_indices_1.c
index 5e35bb9..2b48619 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_s8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3q_lane_s8 (int8_t * p, int8x16x3_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst3q_lane_s8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst3q_lane_s8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u16_indices_1.c
index 9eaae3b..6d68051 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3q_lane_u16 (uint16_t * p, uint16x8x3_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3q_lane_u16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst3q_lane_u16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u32_indices_1.c
index 62339fc..78b28a0 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst3q_lane_u32 (uint32_t * p, uint32x4x3_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3q_lane_u32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst3q_lane_u32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u64_indices_1.c
index 39044cc..fe4f52e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3q_lane_u64 (uint64_t * p, uint64x2x3_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3q_lane_u64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst3q_lane_u64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u8_indices_1.c
index bf48dbb..74e49db 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst3q_lane_u8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst3q_lane_u8 (uint8_t * p, uint8x16x3_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst3q_lane_u8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst3q_lane_u8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f16_indices_1.c
index 0fe6511..6ada55e 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_f16 (float16_t * p, float16x4x4_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4_lane_f16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4_lane_f16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f32_indices_1.c
index 7f04512..00a8a50 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_f32 (float32_t * p, float32x2x4_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4_lane_f32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4_lane_f32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f64_indices_1.c
index ddee219..7cb45ca 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_f64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4_lane_f64 (float64_t * p, float64x1x4_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst4_lane_f64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst4_lane_f64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_p8_indices_1.c
index 14491ac..8b7fef3 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_p8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_p8 (poly8_t * p, poly8x8x4_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4_lane_p8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4_lane_p8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s16_indices_1.c
index 8434a9b..e62691c 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_s16 (int16_t * p, int16x4x4_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4_lane_s16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4_lane_s16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s32_indices_1.c
index 53a4a46..ced39ca 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_s32 (int32_t * p, int32x2x4_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4_lane_s32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4_lane_s32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s64_indices_1.c
index 051c8eb..fe77b4d 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4_lane_s64 (int64_t * p, int64x1x4_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst4_lane_s64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst4_lane_s64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s8_indices_1.c
index 33967ac..b287a59 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_s8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_s8 (int8_t * p, int8x8x4_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4_lane_s8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4_lane_s8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u16_indices_1.c
index 8e358dd..2144dc4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_u16 (uint16_t * p, uint16x4x4_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4_lane_u16 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4_lane_u16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u32_indices_1.c
index 4f7899f..576036c 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_u32 (uint32_t * p, uint32x2x4_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4_lane_u32 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4_lane_u32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u64_indices_1.c
index 9fb06d1..b6040b7 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4_lane_u64 (uint64_t * p, uint64x1x4_t v)
 {
-  /* { dg-error "lane 1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst4_lane_u64 (p, v, 1);
-  /* { dg-error "lane -1 out of range 0 - 0" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 0" "" { target *-*-* } 0 } */
   vst4_lane_u64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u8_indices_1.c
index 3a18322..4ed80cf 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4_lane_u8_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4_lane_u8 (uint8_t * p, uint8x8x4_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4_lane_u8 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4_lane_u8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f16_indices_1.c
index 9a5f09a..7327c03 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4q_lane_f16 (float16_t * p, float16x8x4_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4q_lane_f16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4q_lane_f16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f32_indices_1.c
index 72f7d02..ca01289 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4q_lane_f32 (float32_t * p, float32x4x4_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4q_lane_f32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4q_lane_f32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f64_indices_1.c
index c5f721f..e2b7fb8 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_f64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4q_lane_f64 (float64_t * p, float64x2x4_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4q_lane_f64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4q_lane_f64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_p8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_p8_indices_1.c
index 3e57c95..fb8f4ca 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_p8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_p8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4q_lane_p8 (poly8_t * p, poly8x16x4_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst4q_lane_p8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst4q_lane_p8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s16_indices_1.c
index 5fcbc7f..4855b73 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4q_lane_s16 (int16_t * p, int16x8x4_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4q_lane_s16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4q_lane_s16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s32_indices_1.c
index c039c87..29a8a69 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4q_lane_s32 (int32_t * p, int32x4x4_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4q_lane_s32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4q_lane_s32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s64_indices_1.c
index 824a7e7..297cae8 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4q_lane_s64 (int64_t * p, int64x2x4_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4q_lane_s64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4q_lane_s64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s8_indices_1.c
index 0850c67..10c70cc 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_s8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4q_lane_s8 (int8_t * p, int8x16x4_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst4q_lane_s8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst4q_lane_s8 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u16_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u16_indices_1.c
index 6950a22..d0063ea 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u16_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u16_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4q_lane_u16 (uint16_t * p, uint16x8x4_t v)
 {
-  /* { dg-error "lane 8 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 8 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4q_lane_u16 (p, v, 8);
-  /* { dg-error "lane -1 out of range 0 - 7" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 7" "" { target *-*-* } 0 } */
   vst4q_lane_u16 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u32_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u32_indices_1.c
index 3c9a171..89b4c52 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u32_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u32_indices_1.c
@@ -2,14 +2,13 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 
 void
 f_vst4q_lane_u32 (uint32_t * p, uint32x4x4_t v)
 {
-  /* { dg-error "lane 4 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 4 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4q_lane_u32 (p, v, 4);
-  /* { dg-error "lane -1 out of range 0 - 3" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 3" "" { target *-*-* } 0 } */
   vst4q_lane_u32 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u64_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u64_indices_1.c
index 8543e58..ba697c4 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u64_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u64_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4q_lane_u64 (uint64_t * p, uint64x2x4_t v)
 {
-  /* { dg-error "lane 2 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 2 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4q_lane_u64 (p, v, 2);
-  /* { dg-error "lane -1 out of range 0 - 1" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 1" "" { target *-*-* } 0 } */
   vst4q_lane_u64 (p, v, -1);
   return;
 }
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u8_indices_1.c b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u8_indices_1.c
index ade4801..61f8ce2 100644
--- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u8_indices_1.c
+++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/vst4q_lane_u8_indices_1.c
@@ -2,15 +2,14 @@
 
 /* { dg-do compile } */
 /* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } } */
-/* { dg-excess-errors "" { xfail arm*-*-* } } */
 /* { dg-skip-if "" { arm*-*-* } } */
 
 void
 f_vst4q_lane_u8 (uint8_t * p, uint8x16x4_t v)
 {
-  /* { dg-error "lane 16 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane 16 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst4q_lane_u8 (p, v, 16);
-  /* { dg-error "lane -1 out of range 0 - 15" "" { xfail arm*-*-* } 0 } */
+  /* { dg-error "lane -1 out of range 0 - 15" "" { target *-*-* } 0 } */
   vst4q_lane_u8 (p, v, -1);
   return;
 }
