[pushed] testsuite: Fix g++.dg/gomp warnings for aarch64

[Richard Sandiford via Gcc-patches]

A couple of tweaks to make g++.dg/gomp clean on aarch64.

Tested on aarch64-linux-gnu & pushed.

Richard


gcc/testsuite/
        * g++.dg/gomp/attrs-10.C: Update warning strings for aarch64.
        * g++.dg/gomp/declare-simd-8.C: Add expected warning for aarch64.
---
 gcc/testsuite/g++.dg/gomp/attrs-10.C       | 6 +++---
 gcc/testsuite/g++.dg/gomp/declare-simd-8.C | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/g++.dg/gomp/attrs-10.C 
b/gcc/testsuite/g++.dg/gomp/attrs-10.C
index a78f892c237..ed0214a8de2 100644
--- a/gcc/testsuite/g++.dg/gomp/attrs-10.C
+++ b/gcc/testsuite/g++.dg/gomp/attrs-10.C
@@ -55,7 +55,7 @@ f4 (int l)
 
 int
 f5 (int l)
-{      // { dg-warning "GCC does not currently support mixed size types for 
'simd' functions" "" { target aarch64*-*-* } .-1 }
+{      // { dg-warning "GCC does not currently support simdlen 8 for type 
'int'" "" { target aarch64*-*-* } .-1 }
   return l + 4;
 }
 
@@ -78,7 +78,7 @@ f5 (int l)
 int
 f6 [[omp::sequence (directive (declare simd uniform (l) simdlen (8), 
notinbranch),
                    omp::directive (declare simd linear (l) simdlen (8) 
inbranch))]] (int l)
-{      // { dg-warning "GCC does not currently support mixed size types for 
'simd' functions" "" { target aarch64*-*-* } .-2 }
+{      // { dg-warning "GCC does not currently support simdlen 8 for type 
'int'" "" { target aarch64*-*-* } .-2 }
   return l + 5;
 }
 
@@ -124,7 +124,7 @@ f8 (int l)
 int
 f9 [[omp::directive (declare simd uniform (l) simdlen (8)),
      omp::directive (declare variant (f8) match (construct={parallel,for}))]] 
(int l)
-{      // { dg-warning "GCC does not currently support mixed size types for 
'simd' functions" "" { target aarch64*-*-* } .-2 }
+{      // { dg-warning "GCC does not currently support simdlen 8 for type 
'int'" "" { target aarch64*-*-* } .-2 }
   return l + 8;
 }
 
diff --git a/gcc/testsuite/g++.dg/gomp/declare-simd-8.C 
b/gcc/testsuite/g++.dg/gomp/declare-simd-8.C
index 01c91e89091..ef183136833 100644
--- a/gcc/testsuite/g++.dg/gomp/declare-simd-8.C
+++ b/gcc/testsuite/g++.dg/gomp/declare-simd-8.C
@@ -4,6 +4,7 @@ template <int N, typename T>
 struct S {
   #pragma omp declare simd aligned(a : N * 2) aligned(b) linear(ref(b): N)
   float foo (float *a, T *&b) { return *a + *b; }
+  // { dg-warning "GCC does not currently support mixed size types for 'simd' 
functions" "" { target aarch64*-*-* } .-1 }
 };
 
 S<16, float> s;
-- 
2.25.1