From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id C71D8382FDAA; Tue, 30 Aug 2022 19:54:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C71D8382FDAA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661889256; bh=ykyMfGuBuQ6PlNtCwJUN0YviKGOIxq7aTFLzacF2MoE=; h=From:To:Subject:Date:From; b=hOTPM6dkkC6ZbQ/Gdfn95j6bQUctcIGVCLm4IxkuFfIeYRWXx95++m/x1F6R5U8fl xVP3kLuLEe1tKnFMc2zT+sOObulkVoxGOjxtKMolgnYgTqMLeCMwKjdrT2LnbGZDTs o2V0hyv76wuboR8bo/BeolxdyG8tBOK/l5aA2osU= 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-12] Fortran: Fix OpenMP clause name in error message X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: b0256655fb402f87c921cd782b873dd301760ebd X-Git-Newrev: 44d5246bae8013e34f0fb2ff500d93e27f14f91f Message-Id: <20220830195416.C71D8382FDAA@sourceware.org> Date: Tue, 30 Aug 2022 19:54:16 +0000 (GMT) List-Id: https://gcc.gnu.org/g:44d5246bae8013e34f0fb2ff500d93e27f14f91f commit 44d5246bae8013e34f0fb2ff500d93e27f14f91f Author: Tobias Burnus Date: Tue Aug 30 21:51:36 2022 +0200 Fortran: Fix OpenMP clause name in error message gcc/fortran/ChangeLog: * openmp.cc (gfc_check_omp_requires): Fix clause name in error. Co-authored-by: Chung-Lin Tang (cherry picked from commit 8af266501795dd76d05faef498dbd3472a01b305) Diff: --- gcc/fortran/ChangeLog.omp | 8 ++++++++ gcc/fortran/openmp.cc | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index b7ccae31907..f623b7201bb 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,3 +1,11 @@ +2022-08-30 Tobias Burnus + + Backport from mainline: + 2022-05-27 Tobias Burnus + Chung-Lin Tang + + * openmp.cc (gfc_check_omp_requires): Fix clause name in error. + 2022-08-23 Tobias Burnus Backport from mainline: diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index 771aa83979b..5b30238a8bb 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -6135,7 +6135,7 @@ gfc_check_omp_requires (gfc_namespace *ns, int ref_omp_requires) if ((ref_omp_requires & OMP_REQ_REVERSE_OFFLOAD) && !(ns->omp_requires & OMP_REQ_REVERSE_OFFLOAD)) gfc_error ("Program unit at %L has OpenMP device constructs/routines " - "but does not set !$OMP REQUIRES REVERSE_OFFSET but other " + "but does not set !$OMP REQUIRES REVERSE_OFFLOAD but other " "program units do", &ns->proc_name->declared_at); if ((ref_omp_requires & OMP_REQ_UNIFIED_ADDRESS) && !(ns->omp_requires & OMP_REQ_UNIFIED_ADDRESS))