From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id A023739AF4FB; Thu, 19 Aug 2021 10:10:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A023739AF4FB Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] Fortran: Add OpenMP's nothing directive support (con't) X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: 2d81c6dfa6fd7895e056ce9590ce059833ee80e1 X-Git-Newrev: a8c53aeac4a0c10aa738a482d8610e797df36a03 Message-Id: <20210819101056.A023739AF4FB@sourceware.org> Date: Thu, 19 Aug 2021 10:10:56 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Aug 2021 10:10:56 -0000 https://gcc.gnu.org/g:a8c53aeac4a0c10aa738a482d8610e797df36a03 commit a8c53aeac4a0c10aa738a482d8610e797df36a03 Author: Tobias Burnus Date: Thu Aug 19 12:02:17 2021 +0200 Fortran: Add OpenMP's nothing directive support (con't) Fix directory to enable -fopenmp processing. gcc/testsuite/ PR testsuite/101963 * gfortran.dg/nothing-1.f90: Moved to ... * gfortran.dg/gomp/nothing-1.f90: ... here. * gfortran.dg/nothing-2.f90: Moved to ... * gfortran.dg/gomp/nothing-2.f90: ... here; avoid $ issue in $OMP in dg-error. (cherry picked from commit f0fca213bc52644ba896da622b35842a6157bd98) Diff: --- gcc/testsuite/ChangeLog.omp | 12 ++++++++++++ gcc/testsuite/gfortran.dg/{ => gomp}/nothing-1.f90 | 0 gcc/testsuite/gfortran.dg/{ => gomp}/nothing-2.f90 | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 1a3c8e65783..888162ba077 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,15 @@ +2021-08-19 Tobias Burnus + + Backported from master: + 2021-08-18 Tobias Burnus + + PR testsuite/101963 + * gfortran.dg/nothing-1.f90: Moved to ... + * gfortran.dg/gomp/nothing-1.f90: ... here. + * gfortran.dg/nothing-2.f90: Moved to ... + * gfortran.dg/gomp/nothing-2.f90: ... here; + avoid $ issue in $OMP in dg-error. + 2021-08-18 Tobias Burnus Backported from master: diff --git a/gcc/testsuite/gfortran.dg/nothing-1.f90 b/gcc/testsuite/gfortran.dg/gomp/nothing-1.f90 similarity index 100% rename from gcc/testsuite/gfortran.dg/nothing-1.f90 rename to gcc/testsuite/gfortran.dg/gomp/nothing-1.f90 diff --git a/gcc/testsuite/gfortran.dg/nothing-2.f90 b/gcc/testsuite/gfortran.dg/gomp/nothing-2.f90 similarity index 75% rename from gcc/testsuite/gfortran.dg/nothing-2.f90 rename to gcc/testsuite/gfortran.dg/gomp/nothing-2.f90 index 74a4a5a22b0..554d4ef99ca 100644 --- a/gcc/testsuite/gfortran.dg/nothing-2.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/nothing-2.f90 @@ -3,5 +3,5 @@ pure subroutine foo end subroutine subroutine bar - !$omp nothing foo ! { dg-error "Unexpected junk after $OMP NOTHING statement" } + !$omp nothing foo ! { dg-error "Unexpected junk after .OMP NOTHING statement" } end