mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-03 07:10:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

cpp.c (cpp_define_builtins): Define _OPENMP to 201511 instead of 201307.

Browse Source 
gcc/fortran/
	* cpp.c (cpp_define_builtins): Define _OPENMP to 201511 instead
	of 201307.
	* gfortran.texi: Mention partial OpenMP 4.5 support.
	* intrinsic.texi: Update for OpenMP 4.5.
gcc/testsuite/
	* gfortran.dg/openmp-define-3.f90: Expect 201511 instead of
	201307.
libgomp/
	* omp_lib.f90.in (openmp_version): Change to 201511 from 201307.
	* omp_lib.h.in (openmp_version): Likewise.
	* testsuite/libgomp.fortran/openmp_version-1.f: Expect 201511 instead
	of 201307.
	* testsuite/libgomp.fortran/openmp_version-2.f90: Likewise.

From-SVN: r242044
This commit is contained in:
Jakub Jelinek 2016-11-10 18:05:18 +01:00 committed by Jakub Jelinek
parent e93f30a65f
commit 8ebd1b3182
11 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,5 +1,10 @@
2016-11-10 Jakub Jelinek <jakub@redhat.com>
* cpp.c (cpp_define_builtins): Define _OPENMP to 201511 instead
of 201307.
* gfortran.texi: Mention partial OpenMP 4.5 support.
* intrinsic.texi: Update for OpenMP 4.5.
* openmp.c (gfc_free_omp_clauses): Free critical_name, grainsize,
hint, num_tasks, priority and if_exprs.
(gfc_match_omp_to_link, gfc_match_omp_depend_sink): New functions.

2
gcc/fortran/cpp.c
View File

@ -168,7 +168,7 @@ cpp_define_builtins (cpp_reader *pfile)
cpp_define (pfile, "_OPENACC=201306");
if (flag_openmp)
cpp_define (pfile, "_OPENMP=201307");
cpp_define (pfile, "_OPENMP=201511");
/* The defines below are necessary for the TARGET_* macros.

5
gcc/fortran/gfortran.texi
View File

@ -536,7 +536,8 @@ The current status of the support is can be found in the
and @ref{TS 18508 status} sections of the documentation.
Additionally, the GNU Fortran compilers supports the OpenMP specification
(version 4.0, @url{http://openmp.org/@/wp/@/openmp-specifications/}).
(version 4.0 and most of the features of the 4.5 version,
@url{http://openmp.org/@/wp/@/openmp-specifications/}).
There also is initial support for the OpenACC specification (targeting
version 2.0, @uref{http://www.openacc.org/}).
Note that this is an experimental feature, incomplete, and subject to
@ -1999,7 +2000,7 @@ and environment variables that influence run-time behavior.
GNU Fortran strives to be compatible to the
@uref{http://openmp.org/wp/openmp-specifications/,
OpenMP Application Program Interface v4.0}.
OpenMP Application Program Interface v4.5}.
To enable the processing of the OpenMP directive @code{!$omp} in
free-form source code; the @code{c$omp}, @code{*$omp} and @code{!$omp}

8
gcc/fortran/intrinsic.texi
View File

@ -14769,7 +14769,7 @@ with the following options: @code{-fno-unsafe-math-optimizations
@section OpenMP Modules @code{OMP_LIB} and @code{OMP_LIB_KINDS}
@table @asis
@item @emph{Standard}:
OpenMP Application Program Interface v4.0
OpenMP Application Program Interface v4.5
@end table
@ -14783,8 +14783,8 @@ the named constants defined in the modules are listed
below.
For details refer to the actual
@uref{http://www.openmp.org/mp-documents/OpenMP4.0.0.pdf,
OpenMP Application Program Interface v4.0}.
@uref{http://www.openmp.org/wp-content/uploads/openmp-4.5.pdf,
OpenMP Application Program Interface v4.5}.
@code{OMP_LIB_KINDS} provides the following scalar default-integer
named constants:
@ -14799,7 +14799,7 @@ named constants:
@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 v4.0 the value is @code{201307}.
of the OpenMP version; for OpenMP v4.5 the value is @code{201511}.
The following scalar integer named constants of the
kind @code{omp_sched_kind}:

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2016-11-10 Jakub Jelinek <jakub@redhat.com>
* gfortran.dg/openmp-define-3.f90: Expect 201511 instead of
201307.
* g++.dg/cpp1z/noexcept-type14.C: New test.
* g++.dg/asan/asan_test.C: Remove -Wno-c++1z-compat from dg-options.

2
gcc/testsuite/gfortran.dg/openmp-define-3.f90
View File

@ -6,6 +6,6 @@
# error _OPENMP not defined
#endif
#if _OPENMP != 201307
#if _OPENMP != 201511
# error _OPENMP defined to wrong value
#endif

6
libgomp/ChangeLog
View File

@ -1,5 +1,11 @@
2016-11-10 Jakub Jelinek <jakub@redhat.com>
* omp_lib.f90.in (openmp_version): Change to 201511 from 201307.
* omp_lib.h.in (openmp_version): Likewise.
* testsuite/libgomp.fortran/openmp_version-1.f: Expect 201511 instead
of 201307.
* testsuite/libgomp.fortran/openmp_version-2.f90: Likewise.
* testsuite/libgomp.fortran/examples-4/declare_target-1.f90
(fib_wrapper): Add map(from: x) clause.
* testsuite/libgomp.fortran/examples-4/declare_target-2.f90

2
libgomp/omp_lib.f90.in
View File

@ -59,7 +59,7 @@
module omp_lib
use omp_lib_kinds
implicit none
integer, parameter :: openmp_version = 201307
integer, parameter :: openmp_version = 201511
interface
subroutine omp_init_lock (svar)

2
libgomp/omp_lib.h.in
View File

@ -58,7 +58,7 @@
parameter (omp_lock_hint_contended = 2)
parameter (omp_lock_hint_nonspeculative = 4)
parameter (omp_lock_hint_speculative = 8)
parameter (openmp_version = 201307)
parameter (openmp_version = 201511)
external omp_init_lock, omp_init_nest_lock
external omp_init_lock_with_hint

2
libgomp/testsuite/libgomp.fortran/openmp_version-1.f
View File

@ -4,6 +4,6 @@
implicit none
include "omp_lib.h"
if (openmp_version .ne. 201307) call abort;
if (openmp_version .ne. 201511) call abort;
end program main

2
libgomp/testsuite/libgomp.fortran/openmp_version-2.f90
View File

@ -4,6 +4,6 @@ program main
use omp_lib
implicit none
if (openmp_version .ne. 201307) call abort;
if (openmp_version .ne. 201511) call abort;
end program main