* [Patch, libgomp/Fortran] OpenMP .texi fixes
@ 2010-09-23 14:34 Tobias Burnus
2010-09-23 14:41 ` Jakub Jelinek
0 siblings, 1 reply; 2+ messages in thread
From: Tobias Burnus @ 2010-09-23 14:34 UTC (permalink / raw)
To: gcc patches, gfortran, Jakub Jelinek
[-- Attachment #1: Type: text/plain, Size: 97 bytes --]
Hi all,
when looking at the libgomp manual, I found some mistakes.
OK for the trunk?
Tobias
[-- Attachment #2: gomp-texi.diff --]
[-- Type: text/x-patch, Size: 4923 bytes --]
gcc/fortran/
2010-09-23 Tobias Burnus <burnus@net-b.de>
* intrinsic.texi (OpenMP modules): Add named constants of
OMP_LIB.
libgomp/
2010-09-23 Tobias Burnus <burnus@net-b.de>
* 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}:
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Patch, libgomp/Fortran] OpenMP .texi fixes
2010-09-23 14:34 [Patch, libgomp/Fortran] OpenMP .texi fixes Tobias Burnus
@ 2010-09-23 14:41 ` Jakub Jelinek
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Jelinek @ 2010-09-23 14:41 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc patches, gfortran
On Thu, Sep 23, 2010 at 10:49:43AM +0200, Tobias Burnus wrote:
> OK for the trunk?
Yes, thanks.
> gcc/fortran/
> 2010-09-23 Tobias Burnus <burnus@net-b.de>
>
> * intrinsic.texi (OpenMP modules): Add named constants of
> OMP_LIB.
>
> libgomp/
> 2010-09-23 Tobias Burnus <burnus@net-b.de>
>
> * 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).
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-23 8:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-23 14:34 [Patch, libgomp/Fortran] OpenMP .texi fixes Tobias Burnus
2010-09-23 14:41 ` Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).