summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-16 15:33:42 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-12-16 15:33:42 +0000
commita5291c821e0123f14b80cf014442d2d0d20ea86e (patch)
tree0e9df71ca786e936bfff5917c0b74e17d5369cbd
parent82185f8c09730756abb602bb0c3b0019aa171830 (diff)
downloadppe42-gcc-a5291c821e0123f14b80cf014442d2d0d20ea86e.tar.gz
ppe42-gcc-a5291c821e0123f14b80cf014442d2d0d20ea86e.zip
PR libgomp/59337
* openmp.c (resolve_omp_atomic): Adjust error message. * gfortran.dg/gomp/pr59337.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206017 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/openmp.c2
-rw-r--r--gcc/testsuite/ChangeLog5
3 files changed, 11 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a7d2ff8a8a4..4f3a8e16a0e 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR libgomp/59337
+ * openmp.c (resolve_omp_atomic): Adjust error message.
+
2013-12-15 Janus Weil <janus@gcc.gnu.org>
PR fortran/59493
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 6c4dccbed10..f4b8d908f92 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -1279,7 +1279,7 @@ resolve_omp_atomic (gfc_code *code)
alt_op = INTRINSIC_EQV;
break;
default:
- gfc_error ("!$OMP ATOMIC assignment operator must be "
+ gfc_error ("!$OMP ATOMIC assignment operator must be binary "
"+, *, -, /, .AND., .OR., .EQV. or .NEQV. at %L",
&expr2->where);
return;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e7c54bc2898..1e0db5b8539 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2013-12-16 Jakub Jelinek <jakub@redhat.com>
+ PR libgomp/59337
+ * gfortran.dg/gomp/pr59337.f90: New test.
+
+2013-12-16 Jakub Jelinek <jakub@redhat.com>
+
PR middle-end/58956
PR middle-end/59470
* gcc.target/i386/pr59470.c: New test.
OpenPOWER on IntegriCloud