diff options
| -rw-r--r-- | gcc/c/c-parser.cc | 11 | ||||
| -rw-r--r-- | gcc/cp/parser.cc | 11 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/gomp/declare-target-2.c | 17 |
3 files changed, 32 insertions, 7 deletions
diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc index 678d914..7cc4d93c 100644 --- a/gcc/c/c-parser.cc +++ b/gcc/c/c-parser.cc @@ -22067,9 +22067,14 @@ c_parser_omp_declare_target (c_parser *parser) id = get_identifier ("omp declare target"); if (at2) { - error_at (OMP_CLAUSE_LOCATION (c), - "%qD specified both in declare target %<link%> and %<to%>" - " clauses", t); + if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER) + error_at (OMP_CLAUSE_LOCATION (c), + "%qD specified both in declare target %<link%> and %qs" + " clauses", t, OMP_CLAUSE_ENTER_TO (c) ? "to" : "enter"); + else + error_at (OMP_CLAUSE_LOCATION (c), + "%qD specified both in declare target %<link%> and " + "%<to%> or %<enter%> clauses", t); continue; } if (!at1) diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 9a9f859..b3a6c9a 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -45992,9 +45992,14 @@ handle_omp_declare_target_clause (tree c, tree t, int device_type) id = get_identifier ("omp declare target"); if (at2) { - error_at (OMP_CLAUSE_LOCATION (c), - "%qD specified both in declare target %<link%> and %<to%>" - " clauses", t); + if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER) + error_at (OMP_CLAUSE_LOCATION (c), + "%qD specified both in declare target %<link%> and %qs" + " clauses", t, OMP_CLAUSE_ENTER_TO (c) ? "to" : "enter"); + else + error_at (OMP_CLAUSE_LOCATION (c), + "%qD specified both in declare target %<link%> and " + "%<to%> or %<enter%> clauses", t); return false; } if (!at1) diff --git a/gcc/testsuite/c-c++-common/gomp/declare-target-2.c b/gcc/testsuite/c-c++-common/gomp/declare-target-2.c index 44fb14d..97602dc 100644 --- a/gcc/testsuite/c-c++-common/gomp/declare-target-2.c +++ b/gcc/testsuite/c-c++-common/gomp/declare-target-2.c @@ -10,7 +10,22 @@ int b; #pragma omp declare target enter (b) link (b) /* { dg-error "appears more than once on the same .declare target. directive" } */ int c; #pragma omp declare target (c) -#pragma omp declare target link (c) /* { dg-error "specified both in declare target" } */ +#pragma omp declare target link (c) /* { dg-error "specified both in declare target 'link' and 'to' or 'enter' clauses" } */ +int c2; +#pragma omp declare target to (c2) +#pragma omp declare target link (c2) /* { dg-error "specified both in declare target 'link' and 'to' or 'enter' clauses" } */ +int c3; +#pragma omp declare target enter (c3) +#pragma omp declare target link (c3) /* { dg-error "specified both in declare target 'link' and 'to' or 'enter' clauses" } */ +int c4; +#pragma omp declare target link (c4) +#pragma omp declare target (c4) /* { dg-error "specified both in declare target 'link' and 'enter' clauses" } */ +int c5; +#pragma omp declare target link (c5) +#pragma omp declare target to (c5) /* { dg-error "specified both in declare target 'link' and 'to' clauses" } */ +int c6; +#pragma omp declare target link (c6) +#pragma omp declare target enter (c6) /* { dg-error "specified both in declare target 'link' and 'enter' clauses" } */ int foo (void); #pragma omp declare target link (foo) /* { dg-error "is not a variable in clause" } */ struct S; |