atomic-5.C (f1): Adjust expected lines of read-only variable messages.

	* g++.dg/gomp/atomic-5.C (f1): Adjust expected lines of read-only
	variable messages.

	* testsuite/libgomp.c-c++-common/taskloop-reduction-1.c (S): Change
	type of s and t members from unsigned long int to
	unsigned long long int.

From-SVN: r265887

diff --git a/gcc/testsuite/ChangeLog.gomp b/gcc/testsuite/ChangeLog.gomp
index 1d9aa43977098fad07d849c9db3acc2f3bd0558a..1dc5d8bb8e4d1216fdd0931646624509f2588f6a 100644 (file)
--- a/gcc/testsuite/ChangeLog.gomp
+++ b/gcc/testsuite/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2018-11-07  Jakub Jelinek  <jakub@redhat.com>
+
+       * g++.dg/gomp/atomic-5.C (f1): Adjust expected lines of read-only
+       variable messages.
+
 2018-10-25  Jakub Jelinek  <jakub@redhat.com>
 
        * g++.dg/gomp/for-6.C: Change expected library call.

diff --git a/gcc/testsuite/g++.dg/gomp/atomic-5.C b/gcc/testsuite/g++.dg/gomp/atomic-5.C
index b9b132d8708c4a5f91b736a23c8b2b5258eadad7..78f6344361be0ad7378442cc383959f06c131c49 100644 (file)
--- a/gcc/testsuite/g++.dg/gomp/atomic-5.C
+++ b/gcc/testsuite/g++.dg/gomp/atomic-5.C
@@ -12,12 +12,12 @@ void f1(void)
     x = x + 1;
   #pragma omp atomic
     x = 1;             /* { dg-error "invalid form" } */
-  #pragma omp atomic
+  #pragma omp atomic   /* { dg-error "read-only variable" } */
     ++y;               /* { dg-error "read-only variable" } */
-  #pragma omp atomic
+  #pragma omp atomic   /* { dg-error "read-only variable" } */
     y--;               /* { dg-error "read-only variable" } */
-  #pragma omp atomic
-    y += 1;            /* { dg-error "read-only variable" } */
+  #pragma omp atomic   /* { dg-error "read-only variable" } */
+    y += 1;
   #pragma omp atomic
     bar();             /* { dg-error "invalid operator" } */
   #pragma omp atomic

diff --git a/libgomp/ChangeLog.gomp b/libgomp/ChangeLog.gomp
index 0f459346aeeadf175f12004e972f711fbd609e47..34ac5a8b625595354f42baaf3c2a490ead0d6c4e 100644 (file)
--- a/libgomp/ChangeLog.gomp
+++ b/libgomp/ChangeLog.gomp
@@ -1,5 +1,9 @@
 2018-11-07  Jakub Jelinek  <jakub@redhat.com>
 
+       * testsuite/libgomp.c-c++-common/taskloop-reduction-1.c (S): Change
+       type of s and t members from unsigned long int to
+       unsigned long long int.
+
        * libgomp_g.h (GOMP_loop_start, GOMP_loop_ordered_start,
        GOMP_loop_doacross_start, GOMP_loop_ull_start,
        GOMP_loop_ull_ordered_start, GOMP_loop_ull_doacross_start,

diff --git a/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c b/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c
index 907d9bb4c590f1f05bc6ae998b8d82cb1e83a96a..4b978291e78bd45f52dae5271694e232122b03e5 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c
@@ -4,7 +4,7 @@ extern
 #endif
 void abort (void);
 
-struct S { unsigned long int s, t; };
+struct S { unsigned long long int s, t; };
 
 void
 rbar (struct S *p, struct S *o)