From patchwork Thu Sep 23 08:49:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 65515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id F2F18B70EF for ; Thu, 23 Sep 2010 18:50:01 +1000 (EST) Received: (qmail 28702 invoked by alias); 23 Sep 2010 08:49:56 -0000 Received: (qmail 28676 invoked by uid 22791); 23 Sep 2010 08:49:54 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mx02.qsc.de (HELO mx02.qsc.de) (213.148.130.14) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Sep 2010 08:49:47 +0000 Received: from [192.168.178.22] (port-92-204-109-183.dynamic.qsc.de [92.204.109.183]) by mx02.qsc.de (Postfix) with ESMTP id 3CABD1E936; Thu, 23 Sep 2010 10:49:44 +0200 (CEST) Message-ID: <4C9B14A7.8060203@net-b.de> Date: Thu, 23 Sep 2010 10:49:43 +0200 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100914 SUSE/3.1.4 Thunderbird/3.1.4 MIME-Version: 1.0 To: gcc patches , gfortran , Jakub Jelinek Subject: [Patch, libgomp/Fortran] OpenMP .texi fixes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi all, when looking at the libgomp manual, I found some mistakes. OK for the trunk? Tobias gcc/fortran/ 2010-09-23 Tobias Burnus * intrinsic.texi (OpenMP modules): Add named constants of OMP_LIB. libgomp/ 2010-09-23 Tobias Burnus * libgomp.texi (omp_get_nested, omp_set_nested, omp_set_dynamic): Change Fortran datatype to LOGICAL. (omp_set_lock, omp_test_lock, omp_unset_lock, omp_set_nested_lock, omp_unset_nested_lock): Use intent(inout) instead of intent(out). Index: gcc/fortran/intrinsic.texi =================================================================== --- gcc/fortran/intrinsic.texi (revision 164548) +++ gcc/fortran/intrinsic.texi (working copy) @@ -12773,7 +12789,7 @@ a form of two Fortran 90 modules, named @code{OMP_LIB_KINDS}, and in a form of a Fortran @code{include} file named @file{omp_lib.h}. The procedures provided by @code{OMP_LIB} can be found in the @ref{Top,,Introduction,libgomp,GNU OpenMP runtime library} manual, -the named constants defined in the @code{OMP_LIB_KINDS} module are listed +the named constants defined in the modules are listed below. For details refer to the actual @@ -12790,3 +12806,18 @@ named constants: @item @code{omp_nest_lock_kind} @item @code{omp_sched_kind} @end table + +@code{OMP_LIB} provides the scalar default-integer +named constant @code{openmp_version} with a value of the form +@var{yyyymm}, where @code{yyyy} is the year and @var{mm} the month +of the OpenMP version; for OpenMP v3.0 the value is @code{200805}. + +And the following scalar integer named constants of the +kind @code{omp_sched_kind}: + +@table @asis +@item @code{omp_sched_static} +@item @code{omp_sched_dynamic} +@item @code{omp_sched_guided} +@item @code{omp_sched_auto} +@end table Index: libgomp/libgomp.texi =================================================================== --- libgomp/libgomp.texi (revision 164548) +++ libgomp/libgomp.texi (working copy) @@ -362,7 +362,7 @@ disabled by default. @item @emph{Fortran}: @multitable @columnfractions .20 .80 -@item @emph{Interface}: @tab @code{integer function omp_get_nested()} +@item @emph{Interface}: @tab @code{logical function omp_get_nested()} @end multitable @item @emph{See also}: @@ -583,7 +583,7 @@ adjustment of team sizes and @code{false @item @emph{Fortran}: @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_set_dynamic(set)} -@item @tab @code{integer, intent(in) :: set} +@item @tab @code{logical, intent(in) :: set} @end multitable @item @emph{See also}: @@ -639,7 +639,7 @@ dynamic adjustment of team sizes and @co @item @emph{Fortran}: @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_set_nested(set)} -@item @tab @code{integer, intent(in) :: set} +@item @tab @code{logical, intent(in) :: set} @end multitable @item @emph{See also}: @@ -756,7 +756,7 @@ a deadlock occurs. @item @emph{Fortran}: @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_set_lock(lock)} -@item @tab @code{integer(omp_lock_kind), intent(out) :: lock} +@item @tab @code{integer(omp_lock_kind), intent(inout) :: lock} @end multitable @item @emph{See also}: @@ -787,7 +787,7 @@ does not block if the lock is not availa @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_test_lock(lock)} @item @tab @code{logical(omp_logical_kind) :: omp_test_lock} -@item @tab @code{integer(omp_lock_kind), intent(out) :: lock} +@item @tab @code{integer(omp_lock_kind), intent(inout) :: lock} @end multitable @item @emph{See also}: @@ -817,7 +817,7 @@ again, set the lock for itself. @item @emph{Fortran}: @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_unset_lock(lock)} -@item @tab @code{integer(omp_lock_kind), intent(out) :: lock} +@item @tab @code{integer(omp_lock_kind), intent(inout) :: lock} @end multitable @item @emph{See also}: @@ -899,7 +899,7 @@ nesting count for the lock in incremente @item @emph{Fortran}: @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_set_nest_lock(lock)} -@item @tab @code{integer(omp_nest_lock_kind), intent(out) :: lock} +@item @tab @code{integer(omp_nest_lock_kind), intent(inout) :: lock} @end multitable @item @emph{See also}: @@ -961,7 +961,7 @@ one of them is chosen to, again, set the @item @emph{Fortran}: @multitable @columnfractions .20 .80 @item @emph{Interface}: @tab @code{subroutine omp_unset_nest_lock(lock)} -@item @tab @code{integer(omp_nest_lock_kind), intent(out) :: lock} +@item @tab @code{integer(omp_nest_lock_kind), intent(inout) :: lock} @end multitable @item @emph{See also}: