From: tschwinge Date: Fri, 11 Oct 2013 10:42:42 +0000 (+0000) Subject: _OPENMP pre-processor checks, openmp_version Fortran instrinsic checks. X-Git-Tag: upstream/4.9.2~3778 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20e0f070ca341462cf2e43f605c3c387357d8155;p=platform%2Fupstream%2Flinaro-gcc.git _OPENMP pre-processor checks, openmp_version Fortran instrinsic checks. gcc/testsuite/ * c-c++-common/cpp/openmp-define-1.c: New file. * c-c++-common/cpp/openmp-define-2.c: Likewise. * c-c++-common/cpp/openmp-define-3.c: Likewise. * gfortran.dg/openmp-define-1.f90: Likewise. * gfortran.dg/openmp-define-2.f90: Likewise. * gfortran.dg/openmp-define-3.f90: Likewise. libgomp/ * testsuite/libgomp.fortran/openmp_version-1.f: New file. * testsuite/libgomp.fortran/openmp_version-2.f90: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203417 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b06697b..f182ad7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2013-10-11 Thomas Schwinge + * c-c++-common/cpp/openmp-define-1.c: New file. + * c-c++-common/cpp/openmp-define-2.c: Likewise. + * c-c++-common/cpp/openmp-define-3.c: Likewise. + * gfortran.dg/openmp-define-1.f90: Likewise. + * gfortran.dg/openmp-define-2.f90: Likewise. + * gfortran.dg/openmp-define-3.f90: Likewise. + * g++.dg/gomp/gomp.exp: Recurse into subdirectories when looking for test source files. * gcc.dg/gomp/gomp.exp: Likewise. diff --git a/gcc/testsuite/c-c++-common/cpp/openmp-define-1.c b/gcc/testsuite/c-c++-common/cpp/openmp-define-1.c new file mode 100644 index 0000000..0e7943a --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-1.c @@ -0,0 +1,6 @@ +/* { dg-require-effective-target fopenmp } */ +/* { dg-do preprocess } */ + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/c-c++-common/cpp/openmp-define-2.c b/gcc/testsuite/c-c++-common/cpp/openmp-define-2.c new file mode 100644 index 0000000..f777789 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-2.c @@ -0,0 +1,7 @@ +/* { dg-require-effective-target fopenmp } */ +/* { dg-options "-fno-openmp" } */ +/* { dg-do preprocess } */ + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c b/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c new file mode 100644 index 0000000..601a1c3 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c @@ -0,0 +1,11 @@ +/* { dg-require-effective-target fopenmp } */ +/* { dg-options "-fopenmp" } */ +/* { dg-do preprocess } */ + +#ifndef _OPENMP +# error _OPENMP not defined +#endif + +#if _OPENMP != 201307 +# error _OPENMP defined to wrong value +#endif diff --git a/gcc/testsuite/gfortran.dg/openmp-define-1.f90 b/gcc/testsuite/gfortran.dg/openmp-define-1.f90 new file mode 100644 index 0000000..d4ef1d1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/openmp-define-1.f90 @@ -0,0 +1,7 @@ +! { dg-require-effective-target fopenmp } +! { dg-options "-cpp" } +! { dg-do preprocess } + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/gfortran.dg/openmp-define-2.f90 b/gcc/testsuite/gfortran.dg/openmp-define-2.f90 new file mode 100644 index 0000000..651dae7 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/openmp-define-2.f90 @@ -0,0 +1,7 @@ +! { dg-require-effective-target fopenmp } +! { dg-options "-cpp -fno-openmp" } +! { dg-do preprocess } + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/gfortran.dg/openmp-define-3.f90 b/gcc/testsuite/gfortran.dg/openmp-define-3.f90 new file mode 100644 index 0000000..dfc45b1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/openmp-define-3.f90 @@ -0,0 +1,11 @@ +! { dg-require-effective-target fopenmp } +! { dg-options "-cpp -fopenmp" } +! { dg-do preprocess } + +#ifndef _OPENMP +# error _OPENMP not defined +#endif + +#if _OPENMP != 201107 +# error _OPENMP defined to wrong value +#endif diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9cc0df2..01df81d 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,8 @@ 2013-10-11 Thomas Schwinge + * testsuite/libgomp.fortran/openmp_version-1.f: New file. + * testsuite/libgomp.fortran/openmp_version-2.f90: Likewise. + * omp.h.in: Don't touch the user's namespace. 2013-10-11 Jakub Jelinek diff --git a/libgomp/testsuite/libgomp.fortran/openmp_version-1.f b/libgomp/testsuite/libgomp.fortran/openmp_version-1.f new file mode 100644 index 0000000..aaa8881 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/openmp_version-1.f @@ -0,0 +1,9 @@ +! { dg-do run } + + program main + implicit none + include "omp_lib.h" + + if (openmp_version .ne. 201107) call abort; + + end program main diff --git a/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 b/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 new file mode 100644 index 0000000..b2d1d26 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 @@ -0,0 +1,9 @@ +! { dg-do run } + +program main + use omp_lib + implicit none + + if (openmp_version .ne. 201107) call abort; + +end program main