[gomp5] Merge from trunk

Message ID 20181107204451.GH11625@tucnak
State New
Headers show
Series
  • [gomp5] Merge from trunk
Related show

Commit Message

Jakub Jelinek Nov. 7, 2018, 8:44 p.m.
Hi!

I've merged trunk into gomp-5_0-branch.  atomic-5.C testcase needed some
adjustments for recent C++ FE changes and the taskloop-reduction-1.c
testcase wasn't correct for 32-bit targets.

Tested on x86_64-linux and on i686-linux (the latter libgomp only),
committed to gomp-5_0-branch.

2018-11-07  Jakub Jelinek  <jakub@redhat.com>

	* 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.


	Jakub

Patch

--- gcc/testsuite/g++.dg/gomp/atomic-5.C	(revision 265885)
+++ gcc/testsuite/g++.dg/gomp/atomic-5.C	(working copy)
@@ -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
--- libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c	(revision 265885)
+++ libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c	(working copy)
@@ -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)