svn merge -r136352:136430 svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-3_0-branch/tuples-gomp-3_0-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tuples-gomp-3_0-branch@136436 138bc75d-0d04-0410-961f-82ee72b054a4

9 files changed, 23 insertions, 11 deletions

diff --git a/gcc/ChangeLog.gomp b/gcc/ChangeLog.gomp
index 39b9d8176af..51109cf460b 100644
--- a/gcc/ChangeLog.gomp
+++ b/gcc/ChangeLog.gomp
@@ -1,3 +1,9 @@
+2008-06-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-typeck.c (c_finish_omp_parallel, c_begin_omp_task,
+	c_finish_omp_task): Add comments.
+	* c-omp.c (c_finish_omp_for): Update comment.
+
 2008-06-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* gimplify.c (gimplify_omp_for): Allow POINTER_PLUS_EXPR
diff --git a/gcc/c-omp.c b/gcc/c-omp.c
index 54d73113f70..1da71d27b9c 100644
--- a/gcc/c-omp.c
+++ b/gcc/c-omp.c
@@ -210,10 +210,11 @@ check_omp_for_incr_expr (tree exp, tree decl)
 }
 
 /* Validate and emit code for the OpenMP directive #pragma omp for.
-   INIT, COND, INCR, BODY and PRE_BODY are the five basic elements
-   of the loop (initialization expression, controlling predicate, increment
-   expression, body of the loop and statements to go before the loop).
-   DECL is the iteration variable.  */
+   DECLV is a vector of iteration variables, for each collapsed loop.
+   INITV, CONDV and INCRV are vectors containing initialization
+   expressions, controlling predicates and increment expressions.
+   BODY is the body of the loop and PRE_BODY statements that go before
+   the loop.  */
 
 tree
 c_finish_omp_for (location_t locus, tree declv, tree initv, tree condv,
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 533e9411ba5..23880d16a43 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -8681,6 +8681,8 @@ c_begin_omp_parallel (void)
   return block;
 }
 
+/* Generate OMP_PARALLEL, with CLAUSES and BLOCK as its compound statement.  */
+
 tree
 c_finish_omp_parallel (tree clauses, tree block)
 {
@@ -8696,6 +8698,8 @@ c_finish_omp_parallel (tree clauses, tree block)
   return add_stmt (stmt);
 }
 
+/* Like c_begin_compound_stmt, except force the retention of the BLOCK.  */
+
 tree
 c_begin_omp_task (void)
 {
@@ -8707,6 +8711,8 @@ c_begin_omp_task (void)
   return block;
 }
 
+/* Generate OMP_TASK, with CLAUSES and BLOCK as its compound statement.  */
+
 tree
 c_finish_omp_task (tree clauses, tree block)
 {
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 569360f79b3..28f1cc24dfd 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -397,14 +397,14 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, int mask)
 	      if (p)
 		{
 		  gfc_error (p);
-                  collapse = 1;
+		  collapse = 1;
 		}
 	      else if (collapse <= 0)
 		{
 		  gfc_error ("COLLAPSE clause argument not constant positive integer at %C");
 		  collapse = 1;
 		}
-              c->collapse = collapse;
+	      c->collapse = collapse;
 	      gfc_free_expr (cexpr);
 	      continue;
 	    }
diff --git a/gcc/testsuite/g++.dg/gomp/for-16.C b/gcc/testsuite/g++.dg/gomp/for-16.C
index 2b4b23c96a7..dbbed8fe505 100644
--- a/gcc/testsuite/g++.dg/gomp/for-16.C
+++ b/gcc/testsuite/g++.dg/gomp/for-16.C
@@ -12,7 +12,7 @@ void foo ()
 #pragma omp for
   for (int l = 0; l < 10; ); // { dg-error "missing increment expression" }
 #pragma omp for
-  for (int m = 0; m < 10; m *= 3); // { dg-error "invalid increment expression" } 
+  for (int m = 0; m < 10; m *= 3); // { dg-error "invalid increment expression" }
 #pragma omp for
   for (T n = 0; ; n++); // { dg-error "missing controlling predicate" }
 #pragma omp for
diff --git a/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90 b/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90
index aa6f2c5204f..5c1581454b2 100644
--- a/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/sharing-3.f90
@@ -5,7 +5,7 @@ subroutine foo (vara, varb, varc, vard, n)
   integer :: n, vara(n), varb(*), varc(:), vard(6), vare(6)
   vare(:) = 0
   !$omp parallel default(none) shared(vara, varb, varc, vard, vare)
-    !$omp master   
+    !$omp master
       vara(1) = 1
       varb(1) = 1
       varc(1) = 1
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 22e0170425b..ea2a9391c1a 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -2037,7 +2037,6 @@ remove_useless_stmts_1 (gimple_stmt_iterator *gsi, struct rus_data *data)
           }
           break;
 
-
         default:
           data->last_was_goto = false;
           gsi_next (gsi);
diff --git a/libgomp/config/linux/lock.c b/libgomp/config/linux/lock.c
index 7c478693077..a2e07d320fd 100644
--- a/libgomp/config/linux/lock.c
+++ b/libgomp/config/linux/lock.c
@@ -234,7 +234,7 @@ gomp_test_nest_lock_25 (omp_nest_lock_25_t *lock)
 
 omp_lock_symver (omp_init_lock)
 omp_lock_symver (omp_destroy_lock)
-omp_lock_symver (omp_set_lock) 
+omp_lock_symver (omp_set_lock)
 omp_lock_symver (omp_unset_lock)
 omp_lock_symver (omp_test_lock)
 omp_lock_symver (omp_init_nest_lock)
diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
index c9ceb0bde44..66180122c1e 100644
--- a/libgomp/libgomp.h
+++ b/libgomp/libgomp.h
@@ -339,7 +339,7 @@ struct gomp_thread
   /* This semaphore is used for ordered loops.  */
   gomp_sem_t release;
 
-  /* user pthread thread pool */ 
+  /* user pthread thread pool */
   struct gomp_thread_pool *thread_pool;
 };