Formatting fixes for -Wdeprecated-openmp diagnostic calls

All the -Wdeprecated-openmp diagnostic calls use indentation
style not used anywhere else in the compiler, this fixes it up.

2025-12-11  Jakub Jelinek  <jakub@redhat.com>

gcc/c/
	* c-parser.cc (c_parser_omp_clause_reduction,
	c_parser_omp_clause_linear, c_parser_omp_clause_depend,
	c_parser_omp_clause_map, c_parser_omp_clause_proc_bind,
	c_parser_omp_master, c_parser_omp_declare_target,
	c_parser_omp_metadirective): Formatting fixes.
gcc/cp/
	* parser.cc (cp_parser_omp_clause_reduction,
	cp_parser_omp_clause_linear, cp_parser_omp_clause_depend,
	cp_parser_omp_clause_map, cp_parser_omp_clause_proc_bind,
	cp_parser_omp_master, cp_parser_omp_declare_target,
	cp_parser_omp_metadirective): Formatting fixes.
gcc/fortran/
	* openmp.cc (gfc_match_omp_clause_reduction,
	gfc_match_omp_clause_uses_allocators, gfc_match_omp_clauses,
	match_omp_metadirective, gfc_match_omp_parallel_master,
	gfc_match_omp_parallel_master_taskloop,
	gfc_match_omp_parallel_master_taskloop_simd,
	gfc_match_omp_master, gfc_match_omp_master_taskloop,
	gfc_match_omp_master_taskloop_simd, resolve_omp_clauses): Formatting
	fixes.

diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index f97b294f98eed0362b6ef8df83725ae86c3e3683..284059f5ec0bbca3b4d26550cd4b435fd0d5ce25 100644 (file)
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -18850,8 +18850,9 @@ c_parser_omp_clause_reduction (c_parser *parser, enum omp_clause_code kind,
          break;
        case CPP_MINUS:
          warning_at (c_parser_peek_token (parser)->location,
-           OPT_Wdeprecated_openmp,
-           "%<-%> operator for reductions deprecated in OpenMP 5.2");
+                     OPT_Wdeprecated_openmp,
+                     "%<-%> operator for reductions deprecated in "
+                     "OpenMP 5.2");
          code = MINUS_EXPR;
          break;
        case CPP_AND:
@@ -19601,8 +19602,8 @@ c_parser_omp_clause_linear (c_parser *parser, tree list)
       if (kind != OMP_CLAUSE_LINEAR_DEFAULT)
        {
          warning_at (clause_loc, OPT_Wdeprecated_openmp,
-           "specifying the list items as arguments to the modifiers is "
-           "deprecated since OpenMP 5.2");
+                     "specifying the list items as arguments to the "
+                     "modifiers is deprecated since OpenMP 5.2");
          old_linear_modifier = true;
          c_parser_consume_token (parser);
          c_parser_consume_token (parser);
@@ -20141,15 +20142,15 @@ c_parser_omp_clause_depend (c_parser *parser, tree list)
       else if (strcmp ("sink", p) == 0)
        {
          warning_at (clause_loc, OPT_Wdeprecated_openmp,
-           "%<sink%> modifier with %<depend%> clause deprecated since "
-           "OpenMP 5.2, use with %<doacross%>");
+                     "%<sink%> modifier with %<depend%> clause deprecated "
+                     "since OpenMP 5.2, use with %<doacross%>");
          dkind = OMP_CLAUSE_DOACROSS_SINK;
        }
       else if (strcmp ("source", p) == 0)
        {
          warning_at (clause_loc, OPT_Wdeprecated_openmp,
-           "%<source%> modifier with %<depend%> clause deprecated since "
-           "OpenMP 5.2, use with %<doacross%>");
+                     "%<source%> modifier with %<depend%> clause deprecated "
+                     "since OpenMP 5.2, use with %<doacross%>");
          dkind = OMP_CLAUSE_DOACROSS_SOURCE;
        }
       else
@@ -20583,8 +20584,8 @@ c_parser_omp_clause_map (c_parser *parser, tree list, bool declare_mapper_p)
       ++num_identifiers;
       if (num_identifiers - 1 != num_commas)
        warning_at (clause_loc, OPT_Wdeprecated_openmp,
-         "%<map%> clause modifiers without comma separation is deprecated "
-         "since OpenMP 5.2");
+                   "%<map%> clause modifiers without comma separation is "
+                   "deprecated since OpenMP 5.2");
     }
 
   if (c_parser_next_token_is (parser, CPP_NAME)
@@ -20827,12 +20828,12 @@ c_parser_omp_clause_proc_bind (c_parser *parser, tree list)
       if (strcmp ("primary", p) == 0)
        kind = OMP_CLAUSE_PROC_BIND_PRIMARY;
       else if (strcmp ("master", p) == 0)
-      {
-       warning_at (clause_loc, OPT_Wdeprecated_openmp,
-         "%<master%> affinity deprecated since OpenMP 5.1, "
-         "use %<primary%>");
-       kind = OMP_CLAUSE_PROC_BIND_MASTER;
-      }
+       {
+         warning_at (clause_loc, OPT_Wdeprecated_openmp,
+                     "%<master%> affinity deprecated since OpenMP 5.1, "
+                     "use %<primary%>");
+         kind = OMP_CLAUSE_PROC_BIND_MASTER;
+       }
       else if (strcmp ("close", p) == 0)
        kind = OMP_CLAUSE_PROC_BIND_CLOSE;
       else if (strcmp ("spread", p) == 0)
@@ -25451,7 +25452,8 @@ c_parser_omp_master (location_t loc, c_parser *parser,
                     bool *if_p)
 {
   warning_at (loc, OPT_Wdeprecated_openmp,
-    "%<master%> construct deprecated since OpenMP 5.1, use %<masked%>");
+             "%<master%> construct deprecated since OpenMP 5.1, use "
+             "%<masked%>");
   tree block, clauses, ret;
 
   strcat (p_name, " master");
@@ -28384,9 +28386,10 @@ c_parser_omp_declare_target (c_parser *parser)
   else
     {
       warning_at (c_parser_peek_token (parser)->location,
-       OPT_Wdeprecated_openmp,
-       "use of %<omp declare target%> as a synonym for %<omp begin declare "
-       "target%> has been deprecated since OpenMP 5.2");
+                 OPT_Wdeprecated_openmp,
+                 "use of %<omp declare target%> as a synonym for "
+                 "%<omp begin declare target%> has been deprecated since "
+                 "OpenMP 5.2");
       bool attr_syntax = parser->in_omp_attribute_pragma != NULL;
       c_parser_skip_to_pragma_eol (parser);
       c_omp_declare_target_attr attr = { attr_syntax, -1, 0 };
@@ -28397,8 +28400,9 @@ c_parser_omp_declare_target (c_parser *parser)
     {
       if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER && OMP_CLAUSE_ENTER_TO (c))
        warning_at (c_parser_peek_token (parser)->location,
-         OPT_Wdeprecated_openmp, "%<to%> clause with %<declare target%> "
-         "deprecated since OpenMP 5.2, use %<enter%>");
+                   OPT_Wdeprecated_openmp,
+                   "%<to%> clause with %<declare target%> deprecated since "
+                   "OpenMP 5.2, use %<enter%>");
       if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_DEVICE_TYPE)
        device_type |= OMP_CLAUSE_DEVICE_TYPE_KIND (c);
       if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_INDIRECT)
@@ -30206,8 +30210,8 @@ c_parser_omp_metadirective (c_parser *parser, bool *if_p)
       const char *p = IDENTIFIER_POINTER (c_parser_peek_token (parser)->value);
       if (strcmp (p, "default") == 0)
        warning_at (pragma_loc, OPT_Wdeprecated_openmp,
-         "%<default%> clause on metadirectives deprecated since "
-         "OpenMP 5.2, use %<otherwise%>");
+                   "%<default%> clause on metadirectives deprecated since "
+                   "OpenMP 5.2, use %<otherwise%>");
       c_parser_consume_token (parser);
       bool default_p
        = strcmp (p, "default") == 0 || strcmp (p, "otherwise") == 0;

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 5525213c0347a61b54af9c954a82d06a12d2e6b6..d9a4b6e1a0c8d22d6c54faf859ced2b128a8bb72 100644 (file)
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -42166,8 +42166,8 @@ cp_parser_omp_clause_reduction (cp_parser *parser, enum omp_clause_code kind,
     case CPP_MULT: code = MULT_EXPR; break;
     case CPP_MINUS:
       warning_at (cp_lexer_peek_token (parser->lexer)->location,
-       OPT_Wdeprecated_openmp,
-       "%<-%> operator for reductions deprecated in OpenMP 5.2");
+                 OPT_Wdeprecated_openmp,
+                 "%<-%> operator for reductions deprecated in OpenMP 5.2");
       code = MINUS_EXPR;
       break;
     case CPP_AND: code = BIT_AND_EXPR; break;
@@ -42866,9 +42866,9 @@ cp_parser_omp_clause_linear (cp_parser *parser, tree list,
          cp_lexer_consume_token (parser->lexer);
          old_linear_modifier = true;
          warning_at (cp_lexer_peek_token (parser->lexer)->location,
-           OPT_Wdeprecated_openmp,
-           "specifying the list items as arguments to the modifiers is "
-           "deprecated since OpenMP 5.2");
+                     OPT_Wdeprecated_openmp,
+                     "specifying the list items as arguments to the "
+                     "modifiers is deprecated since OpenMP 5.2");
        }
       else
        kind = OMP_CLAUSE_LINEAR_DEFAULT;
@@ -43480,15 +43480,15 @@ cp_parser_omp_clause_depend (cp_parser *parser, tree list, location_t loc)
       else if (strcmp ("sink", p) == 0)
        {
          warning_at (loc, OPT_Wdeprecated_openmp,
-           "%<sink%> modifier with %<depend%> clause deprecated since "
-           "OpenMP 5.2, use with %<doacross%>");
+                     "%<sink%> modifier with %<depend%> clause deprecated "
+                     "since OpenMP 5.2, use with %<doacross%>");
          dkind = OMP_CLAUSE_DOACROSS_SINK;
        }
       else if (strcmp ("source", p) == 0)
        {
          warning_at (loc, OPT_Wdeprecated_openmp,
-           "%<source%> modifier with %<depend%> clause deprecated since "
-           "OpenMP 5.2, use with %<doacross%>");
+                     "%<source%> modifier with %<depend%> clause deprecated "
+                     "since OpenMP 5.2, use with %<doacross%>");
          dkind = OMP_CLAUSE_DOACROSS_SOURCE;
        }
       else
@@ -44077,8 +44077,8 @@ cp_parser_omp_clause_map (cp_parser *parser, tree list, bool declare_mapper_p)
       ++num_identifiers;
       if (num_identifiers - 1 != num_commas)
        warning_at (clause_loc, OPT_Wdeprecated_openmp,
-         "%<map%> clause modifiers without comma separation is "
-         "deprecated since OpenMP 5.2");
+                   "%<map%> clause modifiers without comma separation is "
+                   "deprecated since OpenMP 5.2");
     }
 
   if (cp_lexer_next_token_is (parser->lexer, CPP_NAME)
@@ -44320,12 +44320,12 @@ cp_parser_omp_clause_proc_bind (cp_parser *parser, tree list,
       if (strcmp ("primary", p) == 0)
        kind = OMP_CLAUSE_PROC_BIND_PRIMARY;
       else if (strcmp ("master", p) == 0)
-      {
-       warning_at (location, OPT_Wdeprecated_openmp,
-         "%<master%> affinity deprecated since OpenMP 5.1, "
-         "use %<primary%>");
-       kind = OMP_CLAUSE_PROC_BIND_MASTER;
-      }
+       {
+         warning_at (location, OPT_Wdeprecated_openmp,
+                     "%<master%> affinity deprecated since OpenMP 5.1, "
+                     "use %<primary%>");
+         kind = OMP_CLAUSE_PROC_BIND_MASTER;
+       }
       else if (strcmp ("close", p) == 0)
        kind = OMP_CLAUSE_PROC_BIND_CLOSE;
       else if (strcmp ("spread", p) == 0)
@@ -49042,7 +49042,8 @@ cp_parser_omp_master (cp_parser *parser, cp_token *pragma_tok,
   unsigned int save;
   location_t loc = cp_lexer_peek_token (parser->lexer)->location;
   warning_at (loc, OPT_Wdeprecated_openmp,
-    "%<master%> construct deprecated since OpenMP 5.1, use %<masked%>");
+             "%<master%> construct deprecated since OpenMP 5.1, use "
+             "%<masked%>");
 
   strcat (p_name, " master");
 
@@ -52779,9 +52780,10 @@ cp_parser_omp_declare_target (cp_parser *parser, cp_token *pragma_tok)
   else
     {
       warning_at (cp_lexer_peek_token (parser->lexer)->location,
-       OPT_Wdeprecated_openmp,
-       "use of %<omp declare target%> as a synonym for %<omp begin declare "
-       "target%> has been deprecated since OpenMP 5.2");
+                 OPT_Wdeprecated_openmp,
+                 "use of %<omp declare target%> as a synonym for "
+                 "%<omp begin declare target%> has been deprecated since "
+                 "OpenMP 5.2");
       cp_omp_declare_target_attr a
        = { parser->lexer->in_omp_attribute_pragma, -1, false };
       vec_safe_push (scope_chain->omp_declare_target_attribute, a);
@@ -52792,8 +52794,8 @@ cp_parser_omp_declare_target (cp_parser *parser, cp_token *pragma_tok)
     {
       if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER && OMP_CLAUSE_ENTER_TO (c))
        warning_at (OMP_CLAUSE_LOCATION (c), OPT_Wdeprecated_openmp,
-         "%<to%> clause with %<declare target%> deprecated since "
-         "OpenMP 5.2, use %<enter%>");
+                   "%<to%> clause with %<declare target%> deprecated since "
+                   "OpenMP 5.2, use %<enter%>");
       if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_DEVICE_TYPE)
        device_type |= OMP_CLAUSE_DEVICE_TYPE_KIND (c);
       if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_INDIRECT)
@@ -53216,8 +53218,8 @@ cp_parser_omp_metadirective (cp_parser *parser, cp_token *pragma_tok,
        = IDENTIFIER_POINTER (cp_lexer_peek_token (parser->lexer)->u.value);
       if (strcmp (p, "default") == 0)
        warning_at (match_loc, OPT_Wdeprecated_openmp,
-         "%<default%> clause on metadirectives deprecated since "
-         "OpenMP 5.2, use %<otherwise%>");
+                   "%<default%> clause on metadirectives deprecated since "
+                   "OpenMP 5.2, use %<otherwise%>");
       cp_lexer_consume_token (parser->lexer);
       bool default_p
        = strcmp (p, "default") == 0 || strcmp (p, "otherwise") == 0;

diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index e6997427fc5f8dbf4539734a67f08f96bee8ee4b..3150686cddee61652d70516407f7bb8f8e739cba 100644 (file)
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -1495,8 +1495,9 @@ gfc_match_omp_clause_reduction (char pc, gfc_omp_clauses *c, bool openacc,
     rop = OMP_REDUCTION_TIMES;
   else if (gfc_match_char ('-') == MATCH_YES)
     {
-      gfc_warning (OPT_Wdeprecated_openmp, "%<-%> operator at %C "
-       "for reductions deprecated in OpenMP 5.2");
+      gfc_warning (OPT_Wdeprecated_openmp,
+                  "%<-%> operator at %C for reductions deprecated in "
+                  "OpenMP 5.2");
       rop = OMP_REDUCTION_MINUS;
     }
   else if (gfc_match (".and.") == MATCH_YES)
@@ -1858,10 +1859,11 @@ gfc_match_omp_clause_uses_allocators (gfc_omp_clauses *c)
       if (!has_modifiers)
        {
          if (gfc_match ("( %S ) ", &p->u2.traits_sym) == MATCH_YES)
-           gfc_warning (OPT_Wdeprecated_openmp, "The specification of "
-             "arguments to %<uses_allocators%> at %L where each item is of "
-             "the form %<allocator(traits)%> is deprecated since OpenMP 5.2",
-             &p->where);
+           gfc_warning (OPT_Wdeprecated_openmp,
+                        "The specification of arguments to "
+                        "%<uses_allocators%> at %L where each item is of "
+                        "the form %<allocator(traits)%> is deprecated since "
+                        "OpenMP 5.2", &p->where);
        }
       else if (gfc_peek_ascii_char () == '(')
        {
@@ -2918,9 +2920,10 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                      goto error;
                    }
                  if (is_depend)
-                   gfc_warning (OPT_Wdeprecated_openmp, "%<source%> "
-                     "modifier with %<depend%> clause at %L deprecated "
-                     "since OpenMP 5.2, use with %<doacross%>", &old_loc);
+                   gfc_warning (OPT_Wdeprecated_openmp,
+                                "%<source%> modifier with %<depend%> clause "
+                                "at %L deprecated since OpenMP 5.2, use with "
+                                "%<doacross%>", &old_loc);
                  c->doacross_source = true;
                  c->depend_source = is_depend;
                  continue;
@@ -2945,10 +2948,10 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                      goto error;
                    }
                  if (is_depend)
-                   gfc_warning (OPT_Wdeprecated_openmp, "%<sink%> "
-                     "modifier with %<depend%> clause at %L "
-                     "deprecated since OpenMP 5.2, use with %<doacross%>",
-                     &old_loc);
+                   gfc_warning (OPT_Wdeprecated_openmp,
+                                "%<sink%> modifier with %<depend%> clause at "
+                                "%L deprecated since OpenMP 5.2, use with "
+                                "%<doacross%>", &old_loc);
                  m = gfc_match_omp_doacross_sink (&c->lists[OMP_LIST_DEPEND],
                                                   is_depend);
                  if (m == MATCH_YES)
@@ -3462,9 +3465,9 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                }
              if (old_linear_modifier)
                gfc_warning (OPT_Wdeprecated_openmp,
-                 "Specification of the list items as arguments to the "
-                 "modifiers at %L is deprecated since OpenMP 5.2",
-                 &saved_loc);
+                            "Specification of the list items as arguments to "
+                            "the modifiers at %L is deprecated since "
+                            "OpenMP 5.2", &saved_loc);
              if (linear_op != OMP_LINEAR_DEFAULT)
                {
                  if (gfc_match (" :") == MATCH_YES)
@@ -3651,9 +3654,10 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                    break;
                  if (gfc_match (", ") != MATCH_YES)
                    gfc_warning (OPT_Wdeprecated_openmp,
-                     "The specification of modifiers without comma "
-                     "separators for the %<map%> clause at %C has "
-                     "been deprecated since OpenMP 5.2");
+                                "The specification of modifiers without "
+                                "comma separators for the %<map%> clause "
+                                "at %C has been deprecated since "
+                                "OpenMP 5.2");
                }
 
              gfc_omp_map_op map_op = OMP_MAP_TOFROM;
@@ -4049,9 +4053,9 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                c->proc_bind = OMP_PROC_BIND_PRIMARY;
              else if (gfc_match ("master )") == MATCH_YES)
                {
-                 gfc_warning (OPT_Wdeprecated_openmp, "%<master%> affinity "
-                   "policy at %C deprecated since OpenMP 5.1, use "
-                   "%<primary%>");
+                 gfc_warning (OPT_Wdeprecated_openmp,
+                              "%<master%> affinity policy at %C deprecated "
+                              "since OpenMP 5.1, use %<primary%>");
                  c->proc_bind = OMP_PROC_BIND_MASTER;
                }
              else if (gfc_match ("spread )") == MATCH_YES)
@@ -4317,9 +4321,10 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                goto error;
              if (m == MATCH_YES)
                {
-                 gfc_warning (OPT_Wdeprecated_openmp, "%<to%> clause with "
-                   "%<declare target%> at %L deprecated since OpenMP 5.2, "
-                   "use %<enter%>", &old_loc);
+                 gfc_warning (OPT_Wdeprecated_openmp,
+                              "%<to%> clause with %<declare target%> at %L "
+                              "deprecated since OpenMP 5.2, use %<enter%>",
+                              &old_loc);
                  continue;
                }
            }
@@ -7094,8 +7099,8 @@ match_omp_metadirective (bool begin_p)
        {
          default_p = true;
          gfc_warning (OPT_Wdeprecated_openmp,
-           "%<default%> clause with metadirective at %L "
-           "deprecated since OpenMP 5.2", &variant_locus);
+                      "%<default%> clause with metadirective at %L "
+                      "deprecated since OpenMP 5.2", &variant_locus);
        }
       else if (gfc_match ("otherwise ( ") == MATCH_YES)
        default_p = true;
@@ -7468,16 +7473,18 @@ gfc_match_omp_parallel_masked_taskloop_simd (void)
 match
 gfc_match_omp_parallel_master (void)
 {
-  gfc_warning (OPT_Wdeprecated_openmp, "%<master%> construct at %C deprecated"
-    " since OpenMP 5.1, use %<masked%>");
+  gfc_warning (OPT_Wdeprecated_openmp,
+              "%<master%> construct at %C deprecated since OpenMP 5.1, use "
+              "%<masked%>");
   return match_omp (EXEC_OMP_PARALLEL_MASTER, OMP_PARALLEL_CLAUSES);
 }
 
 match
 gfc_match_omp_parallel_master_taskloop (void)
 {
-  gfc_warning (OPT_Wdeprecated_openmp, "%<master%> construct at %C deprecated"
-    " since OpenMP 5.1, use %<masked%>");
+  gfc_warning (OPT_Wdeprecated_openmp,
+              "%<master%> construct at %C deprecated since OpenMP 5.1, "
+              "use %<masked%>");
   return match_omp (EXEC_OMP_PARALLEL_MASTER_TASKLOOP,
                    (OMP_PARALLEL_CLAUSES | OMP_TASKLOOP_CLAUSES)
                    & ~(omp_mask (OMP_CLAUSE_IN_REDUCTION)));
@@ -7486,8 +7493,9 @@ gfc_match_omp_parallel_master_taskloop (void)
 match
 gfc_match_omp_parallel_master_taskloop_simd (void)
 {
-  gfc_warning (OPT_Wdeprecated_openmp, "%<master%> construct at %C deprecated"
-    " since OpenMP 5.1, use %<masked%>");
+  gfc_warning (OPT_Wdeprecated_openmp,
+              "%<master%> construct at %C deprecated since OpenMP 5.1, "
+              "use %<masked%>");
   return match_omp (EXEC_OMP_PARALLEL_MASTER_TASKLOOP_SIMD,
                    (OMP_PARALLEL_CLAUSES | OMP_TASKLOOP_CLAUSES
                     | OMP_SIMD_CLAUSES)
@@ -8071,8 +8079,9 @@ gfc_match_omp_masked_taskloop_simd (void)
 match
 gfc_match_omp_master (void)
 {
-  gfc_warning (OPT_Wdeprecated_openmp, "%<master%> construct at %C deprecated"
-    " since OpenMP 5.1, use %<masked%>");
+  gfc_warning (OPT_Wdeprecated_openmp,
+              "%<master%> construct at %C deprecated since OpenMP 5.1, "
+              "use %<masked%>");
   if (gfc_match_omp_eos () != MATCH_YES)
     {
       gfc_error ("Unexpected junk after $OMP MASTER statement at %C");
@@ -8086,16 +8095,18 @@ gfc_match_omp_master (void)
 match
 gfc_match_omp_master_taskloop (void)
 {
-  gfc_warning (OPT_Wdeprecated_openmp, "%<master%> construct at %C deprecated"
-    " since OpenMP 5.1, use %<masked%>");
+  gfc_warning (OPT_Wdeprecated_openmp,
+              "%<master%> construct at %C deprecated since OpenMP 5.1, "
+              "use %<masked%>");
   return match_omp (EXEC_OMP_MASTER_TASKLOOP, OMP_TASKLOOP_CLAUSES);
 }
 
 match
 gfc_match_omp_master_taskloop_simd (void)
 {
-  gfc_warning (OPT_Wdeprecated_openmp, "%<master%> construct at %C deprecated"
-    " since OpenMP 5.1, use %<masked%>");
+  gfc_warning (OPT_Wdeprecated_openmp,
+              "%<master%> construct at %C deprecated since OpenMP 5.1, use "
+              "%<masked%>");
   return match_omp (EXEC_OMP_MASTER_TASKLOOP_SIMD,
                    OMP_TASKLOOP_CLAUSES | OMP_SIMD_CLAUSES);
 }
@@ -9454,10 +9465,10 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
        {
          if (code->op == EXEC_OMP_ALLOCATE)
            gfc_warning (OPT_Wdeprecated_openmp,
-             "The use of one or more %<allocate%> directives with "
-             "an associated %<allocate%> statement at %L is "
-             "deprecated since OpenMP 5.2, use an %<allocators%> "
-             "directive", &code->loc);
+                        "The use of one or more %<allocate%> directives with "
+                        "an associated %<allocate%> statement at %L is "
+                        "deprecated since OpenMP 5.2, use an %<allocators%> "
+                        "directive", &code->loc);
          gfc_alloc *a;
          gfc_omp_namelist *n_null = NULL;
          bool missing_allocator = false;
@@ -10052,9 +10063,9 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
                  {
                    /* For TARGET, non-C_PTR are deprecated and handled as
                       has_device_addr.  */
-                   gfc_warning (OPT_Wdeprecated_openmp, "Non-C_PTR type "
-                     "argument at %L is deprecated, use HAS_DEVICE_ADDR",
-                     &n->where);
+                   gfc_warning (OPT_Wdeprecated_openmp,
+                                "Non-C_PTR type argument at %L is deprecated, "
+                                "use HAS_DEVICE_ADDR", &n->where);
                    gfc_omp_namelist *n2 = n;
                    n = n->next;
                    if (last)
@@ -10081,9 +10092,9 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
                if (n->sym->ts.type != BT_DERIVED
                    || !n->sym->ts.u.derived->ts.is_iso_c)
                  {
-                   gfc_warning (OPT_Wdeprecated_openmp, "Non-C_PTR type "
-                     "argument at %L is deprecated, use USE_DEVICE_ADDR",
-                     &n->where);
+                   gfc_warning (OPT_Wdeprecated_openmp,
+                                "Non-C_PTR type argument at %L is "
+                                "deprecated, use USE_DEVICE_ADDR", &n->where);
                    n = n->next;
                    if (last)
                      last->next = n;