diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2015-12-23 12:01:18 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2015-12-23 12:01:18 +0100 |
| commit | c7b48c8ae5a68e227e0e917ce32533b8d571bf9b (patch) | |
| tree | 35d28c7390d3ab361c0b04f4531b9f00b23c98a4 /gcc/c | |
| parent | e013d90cf66c85f64106cf0a4a3398cadb4812e1 (diff) | |
| download | gcc-c7b48c8ae5a68e227e0e917ce32533b8d571bf9b.zip gcc-c7b48c8ae5a68e227e0e917ce32533b8d571bf9b.tar.gz gcc-c7b48c8ae5a68e227e0e917ce32533b8d571bf9b.tar.bz2 | |
Merge OMP_CLAUSE_USE_DEVICE into OMP_CLAUSE_USE_DEVICE_PTR
gcc/c/
* c-parser.c (c_parser_oacc_clause_use_device): Merge function
into...
(c_parser_omp_clause_use_device_ptr): ... this function. Adjust
all users.
gcc/
* tree-core.h (enum omp_clause_code): Merge OMP_CLAUSE_USE_DEVICE
into OMP_CLAUSE_USE_DEVICE_PTR. Adjust all users.
From-SVN: r231926
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/c/c-parser.c | 16 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 1 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index f99f426..7b275d8 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,10 @@ +2015-12-23 Thomas Schwinge <thomas@codesourcery.com> + + * c-parser.c (c_parser_oacc_clause_use_device): Merge function + into... + (c_parser_omp_clause_use_device_ptr): ... this function. Adjust + all users. + 2015-12-22 Marek Polacek <polacek@redhat.com> PR c/69002 diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 353e3da..8e754d0 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -11395,7 +11395,10 @@ c_parser_omp_clause_defaultmap (c_parser *parser, tree list) return list; } -/* OpenMP 4.5: +/* OpenACC 2.0: + use_device ( variable-list ) + + OpenMP 4.5: use_device_ptr ( variable-list ) */ static tree @@ -11730,15 +11733,6 @@ c_parser_oacc_clause_tile (c_parser *parser, tree list) return c; } -/* OpenACC 2.0: - use_device ( variable-list ) */ - -static tree -c_parser_oacc_clause_use_device (c_parser *parser, tree list) -{ - return c_parser_omp_var_list_parens (parser, OMP_CLAUSE_USE_DEVICE, list); -} - /* OpenACC: wait ( int-expr-list ) */ @@ -13058,7 +13052,7 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask, c_name = "tile"; break; case PRAGMA_OACC_CLAUSE_USE_DEVICE: - clauses = c_parser_oacc_clause_use_device (parser, clauses); + clauses = c_parser_omp_clause_use_device_ptr (parser, clauses); c_name = "use_device"; break; case PRAGMA_OACC_CLAUSE_VECTOR: diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 928fcd5..7406bd4 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -13125,7 +13125,6 @@ c_finish_omp_clauses (tree clauses, bool is_omp, bool declare_simd) bitmap_set_bit (&map_head, DECL_UID (t)); goto check_dup_generic; - case OMP_CLAUSE_USE_DEVICE: case OMP_CLAUSE_IS_DEVICE_PTR: case OMP_CLAUSE_USE_DEVICE_PTR: t = OMP_CLAUSE_DECL (c); |