diff options
| -rw-r--r-- | gcc/c/c-parser.cc | 3 | ||||
| -rw-r--r-- | gcc/cp/parser.cc | 3 | ||||
| -rw-r--r-- | gcc/fortran/parse.cc | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/interop-1.f90 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/gomp/requires-8.f90 | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 6a46577..a681438 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -25492,6 +25492,9 @@ c_parser_omp_declare_target (c_parser *parser) int device_type = 0; bool indirect = false; bool only_device_type_or_indirect = true; + if (flag_openmp) + omp_requires_mask + = (enum omp_requires) (omp_requires_mask | OMP_REQUIRES_TARGET_USED); if (c_parser_next_token_is (parser, CPP_NAME) || (c_parser_next_token_is (parser, CPP_COMMA) && c_parser_peek_2nd_token (parser)->type == CPP_NAME)) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 83ae38a..6d3be94 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -49571,6 +49571,9 @@ cp_parser_omp_declare_target (cp_parser *parser, cp_token *pragma_tok) int device_type = 0; bool indirect = false; bool only_device_type_or_indirect = true; + if (flag_openmp) + omp_requires_mask + = (enum omp_requires) (omp_requires_mask | OMP_REQUIRES_TARGET_USED); if (cp_lexer_next_token_is (parser->lexer, CPP_NAME) || (cp_lexer_next_token_is (parser->lexer, CPP_COMMA) && cp_lexer_nth_token_is (parser->lexer, 2, CPP_NAME))) diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc index e749bbd..9e06dbf 100644 --- a/gcc/fortran/parse.cc +++ b/gcc/fortran/parse.cc @@ -1345,8 +1345,12 @@ decode_omp_directive (void) switch (ret) { - /* Set omp_target_seen; exclude ST_OMP_DECLARE_TARGET. - FIXME: Get clarification, cf. OpenMP Spec Issue #3240. */ + /* For the constraints on clauses with the global requirement property, + we set omp_target_seen. This included all clauses that take the + DEVICE clause, (BEGIN) DECLARE_TARGET and procedures run the device + (which effectively is implied by the former). */ + case ST_OMP_DECLARE_TARGET: + case ST_OMP_INTEROP: case ST_OMP_TARGET: case ST_OMP_TARGET_DATA: case ST_OMP_TARGET_ENTER_DATA: diff --git a/gcc/testsuite/gfortran.dg/gomp/interop-1.f90 b/gcc/testsuite/gfortran.dg/gomp/interop-1.f90 index 8c99fc9..b7d2164 100644 --- a/gcc/testsuite/gfortran.dg/gomp/interop-1.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/interop-1.f90 @@ -17,7 +17,7 @@ module m integer (omp_interop_fr_kind), parameter :: omp_ifr_hsa = 7 end module m -subroutine sub1 +subroutine sub1 ! { dg-error "Program unit at .1. has OpenMP device constructs/routines but does not set !.OMP REQUIRES REVERSE_OFFLOAD but other program units do" } !$omp interop integer :: y ! { dg-error "Unexpected data declaration statement" } end subroutine sub1 diff --git a/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 b/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 index 583c5a5..3b0a7d8 100644 --- a/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/requires-8.f90 @@ -17,9 +17,9 @@ contains end subroutine foo end module m -subroutine bar +subroutine bar ! { dg-error "has OpenMP device constructs/routines but does not set !.OMP REQUIRES REVERSE_OFFLOAD but other program units do" } !use m - !$omp requires unified_shared_memory ! Possibly OK - needs OpenMP Lang Spec clarification (-> #3240) + !$omp requires unified_shared_memory !$omp declare target end subroutine bar |