Formatting fixes.

From-SVN: r265892

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index bc9198917efa1c9da1b880eff3afc1f70ea2b69c..624d5a34c63bb8931bc1707cefaec6f127637eb7 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -11244,7 +11244,7 @@ c_parser_pragma (c_parser *parser, enum pragma_context context, bool *if_p)
 
     case PRAGMA_OMP_REQUIRES:
       c_parser_omp_requires (parser);
-      return false;     
+      return false;
 
     case PRAGMA_OMP_ORDERED:
       return c_parser_omp_ordered (parser, context, if_p);
@@ -14115,7 +14115,7 @@ c_parser_omp_iterators (c_parser *parser)
 
    OpenMP 5.0:
    depend ( depend-modifier , depend-kind: variable-list )
-   
+
    depend-kind:
      in | out | inout | mutexinoutset | depobj
 

diff --git a/gcc/fortran/types.def b/gcc/fortran/types.def
index 7ba23bac34c027b5b7a4b62e35f86ebd36896980..0eabc3f4d993e39f5e9356e7603a2abb161b34be 100644 (file)
--- a/gcc/fortran/types.def
+++ b/gcc/fortran/types.def
@@ -153,7 +153,7 @@ DEF_FUNCTION_TYPE_3 (BT_FN_UINT_UINT_PTR_PTR, BT_UINT, BT_UINT, BT_PTR, BT_PTR)
 DEF_FUNCTION_TYPE_4 (BT_FN_VOID_OMPFN_PTR_UINT_UINT,
                      BT_VOID, BT_PTR_FN_VOID_PTR, BT_PTR, BT_UINT, BT_UINT)
 DEF_FUNCTION_TYPE_4 (BT_FN_UINT_OMPFN_PTR_UINT_UINT,
-                     BT_UINT, BT_PTR_FN_VOID_PTR, BT_PTR, BT_UINT, BT_UINT)
+                    BT_UINT, BT_PTR_FN_VOID_PTR, BT_PTR, BT_UINT, BT_UINT)
 DEF_FUNCTION_TYPE_4 (BT_FN_VOID_PTR_WORD_WORD_PTR,
                     BT_VOID, BT_PTR, BT_WORD, BT_WORD, BT_PTR)
 DEF_FUNCTION_TYPE_4 (BT_FN_VOID_SIZE_VPTR_PTR_INT, BT_VOID, BT_SIZE,

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 8d2c27bc8ec1fe4af17ed61ed48ce3d694444c5a..ca78d7abe26ba9dd14d635d3298dc023f2020e6a 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -1871,7 +1871,7 @@ scan_omp_parallel (gimple_stmt_iterator *gsi, omp_context *outer_ctx)
        c; c = omp_find_clause (OMP_CLAUSE_CHAIN (c), OMP_CLAUSE_REDUCTION))
     if (OMP_CLAUSE_REDUCTION_TASK (c))
       {
-        tree type = build_pointer_type (pointer_sized_int_node);
+       tree type = build_pointer_type (pointer_sized_int_node);
        tree temp = create_tmp_var (type);
        tree c = build_omp_clause (UNKNOWN_LOCATION, OMP_CLAUSE__REDUCTEMP_);
        if (outer_ctx)
@@ -3942,7 +3942,7 @@ lower_rec_input_clauses (tree clauses, gimple_seq *ilist, gimple_seq *dlist,
                        }
                    }
                }
-              else if (OMP_CLAUSE_REDUCTION_OMP_ORIG_REF (c))
+             else if (OMP_CLAUSE_REDUCTION_OMP_ORIG_REF (c))
                reduction_omp_orig_ref = true;
              break;
            case OMP_CLAUSE__REDUCTEMP_:
@@ -4137,7 +4137,7 @@ lower_rec_input_clauses (tree clauses, gimple_seq *ilist, gimple_seq *dlist,
                        cnt = task_reduction_cntorig - 1;
                      x = build4 (ARRAY_REF, ptr_type_node, tskred_avar,
                                  size_int (cnt), NULL_TREE, NULL_TREE);
-                 
+
                      gimple *g = gimple_build_assign (xv, x);
                      gimple_seq_add_stmt (ilist, g);
                    }

diff --git a/gcc/testsuite/c-c++-common/gomp/nontemporal-1.c b/gcc/testsuite/c-c++-common/gomp/nontemporal-1.c
index b7e252239f5ccc72f9d3c3c5dd2b75fa901410ea..7f1f18245ddd3e7e363b950d5e21b1948f20de12 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/nontemporal-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/nontemporal-1.c
@@ -10,8 +10,8 @@ foo (void)
   int i;
   #pragma omp simd nontemporal (a, b)
   for (i = 0; i < N; ++i)
-    a[i] = b[i] + c[i]; 
+    a[i] = b[i] + c[i];
   #pragma omp simd nontemporal (d)
   for (i = 0; i < N; ++i)
-    d[i] = 2 * c[i]; 
+    d[i] = 2 * c[i];
 }

diff --git a/libgomp/testsuite/libgomp.c++/depend-iterator-1.C b/libgomp/testsuite/libgomp.c++/depend-iterator-1.C
index e995057f68628e2ac60e5f7bbbcdc17f1cd79eef..2cff5e84334f2e2bae6aa8f0f9aabb499d274a31 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/depend-iterator-1.C
+++ b/libgomp/testsuite/libgomp.c++/depend-iterator-1.C
@@ -85,14 +85,14 @@ bar ()
       else
        arr[i] = arr[i] + 2;
     #pragma omp task depend (iterator (unsigned n=begu:endu:step2, unsigned int o = 512: 1024U: (unsigned char) 128), inout : \
-                            foo (5, n + 128, o)[0]) 
+                            foo (5, n + 128, o)[0])
     for (i = 0; i < 64; i++)
       if (arr[i] != i + 3)
        abort ();
       else
        arr[i] = arr[i] + 4;
     #pragma omp task depend (iterator (int unsigned p=endu:begu:step,unsigned q= 1025U:513U:(signed char) -128), in : \
-                            foo (6, p + 128, q)[0]) 
+                            foo (6, p + 128, q)[0])
     for (i = 0; i < 64; i++)
       if (arr[i] != i + 7)
        abort ();
@@ -127,14 +127,14 @@ baz (A beg, A end, A step, D begu, D endu, A step2)
       else
        arr[i] = arr[i] + 2;
     #pragma omp task depend (iterator (D n=begu:endu:step2, D o = 512: 1024U:(E) 128), inout : \
-                            foo (5, n + 128, o)[0]) 
+                            foo (5, n + 128, o)[0])
     for (i = 0; i < 64; i++)
       if (arr[i] != i + 3)
        abort ();
       else
        arr[i] = arr[i] + 4;
     #pragma omp task depend (iterator (D p=endu:begu:step,D q= 1025U:513U:(F) -128), in : \
-                            foo (6, p + 128, q)[0]) 
+                            foo (6, p + 128, q)[0])
     for (i = 0; i < 64; i++)
       if (arr[i] != i + 7)
        abort ();

diff --git a/libgomp/testsuite/libgomp.c++/task-reduction-11.C b/libgomp/testsuite/libgomp.c++/task-reduction-11.C
index 5c939cb88ac933da6268e7a94019b1cd2504f4db..542bdd64da1c000f9992a05bff264faff865adfc 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/task-reduction-11.C
+++ b/libgomp/testsuite/libgomp.c++/task-reduction-11.C
@@ -163,7 +163,7 @@ test (T &n)
        }
     }
     if (d[0] != 1LL << (8 + 4)
-        || d[1] != 1LL << 16
+       || d[1] != 1LL << 16
        || m[0] != 5
        || m[1] != 19 * 16 + 6 * 8 + 16 * 4
        || m[2] != 5

diff --git a/libgomp/testsuite/libgomp.c++/task-reduction-4.C b/libgomp/testsuite/libgomp.c++/task-reduction-4.C
index 28ea0cd9f3bb5b5f5211f0fa3d6f7e2ff658a46a..1d4da79b3c12214a001ee514f4639651c8a4438b 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/task-reduction-4.C
+++ b/libgomp/testsuite/libgomp.c++/task-reduction-4.C
@@ -164,7 +164,7 @@ test (T &n)
        }
     }
     if (d[0] != 1LL << (8 + 4)
-        || d[1] != 1LL << 16
+       || d[1] != 1LL << 16
        || m[0] != 5
        || m[1] != 19 * 16 + 6 * 8 + 16 * 4
        || m[2] != 5

diff --git a/libgomp/testsuite/libgomp.c++/taskloop-reduction-1.C b/libgomp/testsuite/libgomp.c++/taskloop-reduction-1.C
index 400cc8b963845851a1ab14301b6a0e2d1b4a3d92..f7fb9cac9e53f546038aa5b5943d16e4e43bd5f9 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/taskloop-reduction-1.C
+++ b/libgomp/testsuite/libgomp.c++/taskloop-reduction-1.C
@@ -119,9 +119,9 @@ test ()
     #pragma omp taskloop reduction (+: g, m) reduction (*: h, n)
     for (i = 0; i < 64; ++i)
       {
-        g.s += 3 * a[i];
-        h.s *= (3 - c[i]);
-        m.s += 4 * a[i];
+       g.s += 3 * a[i];
+       h.s *= (3 - c[i]);
+       m.s += 4 * a[i];
        n.s *= c[i];
        if ((g.t != 7 && g.t != 3) || (h.t != 5 && h.t != 9)
            || (m.t != 7 && m.t != 3) || (n.t != 5 && n.t != 9))

diff --git a/libgomp/testsuite/libgomp.c++/taskloop-reduction-2.C b/libgomp/testsuite/libgomp.c++/taskloop-reduction-2.C
index 486c3d337d79838ad4416b370a7fd597ee3482ac..f1de5dae2ea269d48b46e63628fd0ee8510ba34e 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/taskloop-reduction-2.C
+++ b/libgomp/testsuite/libgomp.c++/taskloop-reduction-2.C
@@ -21,7 +21,7 @@ long long (*&t)[2] = ts;
 struct U { U (); ~U () {}; U (const U &); int u[4]; };
 
 U::U
-() 
+()
 {
   u[0] = 0; u[1] = 1; u[2] = 2; u[3] = 3;
 }
@@ -179,7 +179,7 @@ test (int &n)
        f[2] += 8;
       }
     if (d[0] != 1LL << (8 + 4)
-        || d[1] != 1LL << 16
+       || d[1] != 1LL << 16
        || m[0] != 5
        || m[1] != 19 * 16 + 6 * 8 + 16 * 4
        || m[2] != 5

diff --git a/libgomp/testsuite/libgomp.c++/taskloop-reduction-4.C b/libgomp/testsuite/libgomp.c++/taskloop-reduction-4.C
index 9a9360bead65e1a2977e54bb94020ce8ca21bc36..41c7040ff1a678a1da03b54b1e1b755c3b405916 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/taskloop-reduction-4.C
+++ b/libgomp/testsuite/libgomp.c++/taskloop-reduction-4.C
@@ -64,7 +64,7 @@ foo (int n, S *c, S *d, S m[3], S *r, S o[4], S *p, S q[4][2])
   #pragma omp taskloop in_reduction (+: a, c[:2]) in_reduction (*: b[2 * n:3 * n], d[0:2]) \
                       reduction (default, +: o[n:n*2], m[1], p[0]) in_reduction (+: k[1:2][:], f[2:2]) \
                       reduction (+: q[1:2][:], r[2:2]) in_reduction (+: g[n:n*2], e[1], h[0]) \
-                      in_reduction (*: s[1:2], t[2:2][:]) 
+                      in_reduction (*: s[1:2], t[2:2][:])
   for (i = 0; i < 2; i++)
     {
       a[0].s += 7;

diff --git a/libgomp/testsuite/libgomp.c-c++-common/depend-iterator-1.c b/libgomp/testsuite/libgomp.c-c++-common/depend-iterator-1.c
index ca520cb15c3fcc188bd4c492aabfe4be3a357531..03cded42cbd25f02a8e16a9ac67706fdb51296fe 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/depend-iterator-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/depend-iterator-1.c
@@ -94,14 +94,14 @@ main ()
       else
        arr[i] = arr[i] + 2;
     #pragma omp task depend (iterator (unsigned n=begu:endu:step2, unsigned int o = 512: 1024U: (unsigned char) 128), inout : \
-                            foo (5, n + 128, o)[0]) 
+                            foo (5, n + 128, o)[0])
     for (i = 0; i < 64; i++)
       if (arr[i] != i + 3)
        abort ();
       else
        arr[i] = arr[i] + 4;
     #pragma omp task depend (iterator (int unsigned p=endu:begu:step,unsigned q= 1025U:513U:(signed char) -128), in : \
-                            foo (6, p + 128, q)[0]) 
+                            foo (6, p + 128, q)[0])
     for (i = 0; i < 64; i++)
       if (arr[i] != i + 7)
        abort ();

diff --git a/libgomp/testsuite/libgomp.c-c++-common/for-2.h b/libgomp/testsuite/libgomp.c-c++-common/for-2.h
index 03b16db3a026a9b18cb206e18e6140ce8d5c71b3..91a604a6c25ee23a3f4d10d06870a9bdcbbebfb4 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/for-2.h
+++ b/libgomp/testsuite/libgomp.c-c++-common/for-2.h
@@ -565,7 +565,7 @@ N(test) (void)
       for (k = 0; k < 10; k++)
        if (b[i][j][k] != i + 1.0 + 1.5 * j - 1.5 * k)
          return 1;
-  N(f28) ();     
+  N(f28) ();
   OMPFROM (b);
   for (i = 0; i < 10; i++)
     for (j = 0; j < 15; j++)

diff --git a/libgomp/testsuite/libgomp.c-c++-common/task-reduction-6.c b/libgomp/testsuite/libgomp.c-c++-common/task-reduction-6.c
index e0a946efba17eae41e78e0223da21ebc34f42b2f..09cbea66542634b1c5fd2fbbf41be7e963192c07 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/task-reduction-6.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/task-reduction-6.c
@@ -97,9 +97,9 @@ main ()
     #pragma omp taskloop in_reduction (+: g, m) in_reduction (*: h, n)
     for (i = 0; i < 64; ++i)
       {
-        g.s += 3 * a[i];
-        h.s *= (3 - c[i]);
-        m.s += 4 * a[i];
+       g.s += 3 * a[i];
+       h.s *= (3 - c[i]);
+       m.s += 4 * a[i];
        n.s *= c[i];
        if ((g.t != 7 && g.t != 3) || (h.t != 5 && h.t != 9)
            || (m.t != 7 && m.t != 3) || (n.t != 5 && n.t != 9))

diff --git a/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c b/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c
index 4b978291e78bd45f52dae5271694e232122b03e5..d44b471a37258838de8d74d0b5f585a3d57b55fe 100644 (file)
--- a/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/taskloop-reduction-1.c
@@ -93,9 +93,9 @@ main ()
     #pragma omp taskloop reduction (+: g, m) reduction (*: h, n)
     for (i = 0; i < 64; ++i)
       {
-        g.s += 3 * a[i];
-        h.s *= (3 - c[i]);
-        m.s += 4 * a[i];
+       g.s += 3 * a[i];
+       h.s *= (3 - c[i]);
+       m.s += 4 * a[i];
        n.s *= c[i];
        if ((g.t != 7 && g.t != 3) || (h.t != 5 && h.t != 9)
            || (m.t != 7 && m.t != 3) || (n.t != 5 && n.t != 9))