aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-11-07 21:43:16 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2018-11-07 21:43:16 +0100
commita16bd40a1e2745ae59dd8c34a9471f8f7c170fce (patch)
tree12b370fdd8e32b8f92bd358c937091aabb565747
parentc3bd406f92e7b698948d159002fa33fd077b74ea (diff)
downloadgcc-a16bd40a1e2745ae59dd8c34a9471f8f7c170fce.zip
gcc-a16bd40a1e2745ae59dd8c34a9471f8f7c170fce.tar.gz
gcc-a16bd40a1e2745ae59dd8c34a9471f8f7c170fce.tar.bz2
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
-rw-r--r--gcc/testsuite/ChangeLog.gomp5
-rw-r--r--gcc/testsuite/g++.dg/gomp/atomic-5.C8
-rw-r--r--libgomp/ChangeLog.gomp4
-rw-r--r--libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c2
4 files changed, 14 insertions, 5 deletions
diff --git a/gcc/testsuite/ChangeLog.gomp b/gcc/testsuite/ChangeLog.gomp
index 1d9aa43..1dc5d8b 100644
--- 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 b9b132d..78f6344 100644
--- 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 0f45934..34ac5a8 100644
--- 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 907d9bb..4b97829 100644
--- 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)