From cef0fd0ec8a68d6c2eb7e69fc6cf9cb8de5ca079 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 17 Dec 2013 16:21:07 +0100 Subject: [PATCH] Fix description of OpenMP parallel directive in the C and C++ front ends. gcc/c/ * c-parser.c (c_parser_omp_parallel): Fix description. gcc/cp/ * parser.c (cp_parser_omp_parallel): Fix description. From-SVN: r206052 --- gcc/c/ChangeLog | 4 ++++ gcc/c/c-parser.c | 13 ++++++++++--- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 12 ++++++++---- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 17ca2c5d8dd..9db78c6baa6 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,7 @@ +2013-12-17 Thomas Schwinge + + * c-parser.c (c_parser_omp_parallel): Fix description. + 2013-12-11 Balaji V. Iyer * c-objc-common.h (LANG_HOOKS_CILKPLUS_FRAME_CLEANUP): Remove. diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index c78d26909b4..28f53c166d4 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -12032,9 +12032,16 @@ c_parser_omp_sections (location_t loc, c_parser *parser, } /* OpenMP 2.5: - # pragma parallel parallel-clause new-line - # pragma parallel for parallel-for-clause new-line - # pragma parallel sections parallel-sections-clause new-line + # pragma omp parallel parallel-clause[optseq] new-line + structured-block + # pragma omp parallel for parallel-for-clause[optseq] new-line + structured-block + # pragma omp parallel sections parallel-sections-clause[optseq] new-line + structured-block + + OpenMP 4.0: + # pragma omp parallel for simd parallel-for-simd-clause[optseq] new-line + structured-block LOC is the location of the #pragma token. */ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5cb02e220c9..d44ff7c6c04 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2013-12-17 Thomas Schwinge + + * parser.c (cp_parser_omp_parallel): Fix description. + 2013-12-12 Jason Merrill PR c++/58954 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index dd027342178..9f8ad39dfe1 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -29512,12 +29512,16 @@ cp_parser_omp_sections (cp_parser *parser, cp_token *pragma_tok, } /* OpenMP 2.5: - # pragma parallel parallel-clause new-line - # pragma parallel for parallel-for-clause new-line - # pragma parallel sections parallel-sections-clause new-line + # pragma omp parallel parallel-clause[optseq] new-line + structured-block + # pragma omp parallel for parallel-for-clause[optseq] new-line + structured-block + # pragma omp parallel sections parallel-sections-clause[optseq] new-line + structured-block OpenMP 4.0: - # pragma parallel for simd parallel-for-simd-clause new-line */ + # pragma omp parallel for simd parallel-for-simd-clause[optseq] new-line + structured-block */ #define OMP_PARALLEL_CLAUSE_MASK \ ( (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_IF) \ -- 2.30.2