diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -1344,7 +1344,8 @@
     if ((exprLeft.value().source.ToString() != variableName) &&
         (exprRight.value().source.ToString() != variableName)) {
       context_.Say(variable.GetSource(),
-          "Atomic update variable '%s' not found in the RHS of the assignment statement in an ATOMIC (UPDATE) construct"_err_en_US,
+          "Atomic update variable '%s' not found in the RHS of the \
+assignment statement in an ATOMIC (UPDATE) construct"_err_en_US,
           variableName);
     }
     return common::HasMember<T, AllowedBinaryOperators>;
@@ -1367,8 +1368,8 @@
                 !(name->source == "max" || name->source == "min" ||
                     name->source == "iand" || name->source == "ior" ||
                     name->source == "ieor")) {
-              context_.Say(expr.source,
-                  "Invalid intrinsic procedure name in OpenMP ATOMIC (UPDATE) statement"_err_en_US);
+              context_.Say(expr.source, "Invalid intrinsic procedure name in \
+OpenMP ATOMIC (UPDATE) statement"_err_en_US);
             } else if (name) {
               bool foundMatch{false};
               if (auto varDesignatorIndirection =
@@ -1394,7 +1395,8 @@
               }
               if (!foundMatch) {
                 context_.Say(expr.source,
-                    "Atomic update variable '%s' not found in the argument list of intrinsic procedure"_err_en_US,
+                    "Atomic update variable '%s' not found in the \
+argument list of intrinsic procedure"_err_en_US,
                     var.GetSource().ToString());
               }
             }
@@ -1417,7 +1419,8 @@
       numMemoryOrderClause++;
       if (numMemoryOrderClause > 1) {
         context_.Say(clause.source,
-            "More than one memory order clause not allowed on OpenMP Atomic construct"_err_en_US);
+            "More than one memory order clause not allowed on OpenMP \
+Atomic construct"_err_en_US);
         return;
       }
     }
@@ -1432,8 +1435,9 @@
     if (std::get_if<Fortran::parser::OmpMemoryOrderClause>(&clause.u)) {
       numMemoryOrderClause++;
       if (numMemoryOrderClause > 1) {
-        context_.Say(clause.source,
-            "More than one memory order clause not allowed on OpenMP Atomic construct"_err_en_US);
+        context_.Say(
+            clause.source, "More than one memory order clause not allowed on \
+OpenMP Atomic construct"_err_en_US);
         return;
       }
     }
@@ -1442,8 +1446,8 @@
     if (std::get_if<Fortran::parser::OmpMemoryOrderClause>(&clause.u)) {
       numMemoryOrderClause++;
       if (numMemoryOrderClause > 1) {
-        context_.Say(clause.source,
-            "More than one memory order clause not allowed on OpenMP Atomic construct"_err_en_US);
+        context_.Say(clause.source, "More than one memory order clause not \
+allowed on OpenMP Atomic construct"_err_en_US);
         return;
       }
     }