[OG10] merge GCC 10 into branch; cherry-pick two OpenMP patches

[OG10] merge GCC 10 into branch; cherry-pick two OpenMP patches

[Tobias Burnus]

OG10 = devel/omp/gcc-10 – a GCC 10 branch with some additional OpenMP/OpenACC/offloading patches

Commits:
* 16052969a54db5df3d37fdcc81acba6ed1ec8c6a
   moved OG10 ChangeLog items to ChangeLog.omp
* 612fee635bbb1198bc550c9c328330cae3259ed5
   Merged origin/releases/gcc-10 into branch
* f99ec65aea0d432b98a160035bebb6be23b9acfe
   Backport of 'OpenMP: Support 'if (simd:/cancel:' in Fortran'
* c0db5b424d33577e633895c9c430bc1626336fb5
   Backport of 'Fortran: Fix OpenMP's 'if(simd:' etc. conditions'

Thanks,

Tobias

-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter

Re: [OG10] merge GCC 10 into branch; cherry-pick two OpenMP patches

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 506 bytes --]

On 8/21/20 9:55 AM, Tobias Burnus wrote:
> * c0db5b424d33577e633895c9c430bc1626336fb5
>   Backport of 'Fortran: Fix OpenMP's 'if(simd:' etc. conditions'

Missed that OG10 has changed the warning to an error;
this could be also something for the trunk, matching C/C++
which does print an error ...

Tobias

-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter

[-- Attachment #2: committed.diff --]
[-- Type: text/x-patch, Size: 2204 bytes --]

commit 091fd5dae659b16428ea5ec782d91fa5295991ff
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Fri Aug 21 13:28:06 2020 +0200

    Update dg-* in gfortran.dg/gomp/pr67500.f90
    
    Contrary to GCC 11, OG10 uses an error instead of a warning,
    cf. commit 271c7fef548a86676d304b1eb2be5c0d47280bd6.
    
    gcc/testsuite/
            * gfortran.dg/gomp/pr67500.f90: Change dg-warning to
            dg-error.

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 07ff35ad086..5eeea5afabd 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,8 @@
+2020-08-21  Tobias Burnus  <tobias@codesourcery.com>
+
+	* gfortran.dg/gomp/pr67500.f90: Change dg-warning to
+	dg-error.
+
 2020-08-21  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gfortran.dg/gomp/pr67500.f90 b/gcc/testsuite/gfortran.dg/gomp/pr67500.f90
index 1cecdc48578..11ed69f10a7 100644
--- a/gcc/testsuite/gfortran.dg/gomp/pr67500.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/pr67500.f90
@@ -10,11 +10,11 @@ subroutine f2
 end
 
 subroutine f3 (i)
-  !$omp declare simd simdlen(-2)   ! { dg-warning "INTEGER expression of SIMDLEN clause at .1. must be positive" }
+  !$omp declare simd simdlen(-2)   ! { dg-error "INTEGER expression of SIMDLEN clause at .1. must be positive" }
 end subroutine
 
 subroutine f4
-  !$omp declare simd simdlen(0)	   ! { dg-warning "INTEGER expression of SIMDLEN clause at .1. must be positive" }
+  !$omp declare simd simdlen(0)	   ! { dg-error "INTEGER expression of SIMDLEN clause at .1. must be positive" }
 end
 
 subroutine foo(p, d, n)
@@ -31,11 +31,11 @@ subroutine foo(p, d, n)
   do i = 1, 16
   end do
 
-  !$omp simd safelen(-2)    ! { dg-warning "INTEGER expression of SAFELEN clause at .1. must be positive" }
+  !$omp simd safelen(-2)    ! { dg-error "INTEGER expression of SAFELEN clause at .1. must be positive" }
   do i = 1, 16
   end do
 
-  !$omp simd safelen(0)     ! { dg-warning "INTEGER expression of SAFELEN clause at .1. must be positive" }
+  !$omp simd safelen(0)     ! { dg-error "INTEGER expression of SAFELEN clause at .1. must be positive" }
   do i = 1, 16
   end do