]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Build fix for 'openmp: allow requires unified_shared_memory'
authorTobias Burnus <tobias@codesourcery.com>
Thu, 30 Jun 2022 06:30:48 +0000 (08:30 +0200)
committerTobias Burnus <tobias@codesourcery.com>
Thu, 30 Jun 2022 06:30:48 +0000 (08:30 +0200)
OG12 commit fa65fc45972d27f2fd79a44eaba1978348177ee9 added an
error diagnostic (moved around in later commits); this diagnostic
caused bootstrap fails as %<...%> were missing. This commit adds
them.

gcc/c/
* c-parser.cc (c_parser_omp_requires): Add missing %<...%> in error.

gcc/cp/
* parser.cc (cp_parser_omp_requires): Add missing %<...%> in error.

gcc/c/c-parser.cc
gcc/cp/parser.cc

index 363b80ebfeb67d36d41751f41d9eb86ea8aa058c..5cabcb684e9323fade52b2d85c555c68b5570eed 100644 (file)
@@ -22872,8 +22872,8 @@ c_parser_omp_requires (c_parser *parser)
              if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
                  && flag_offload_memory != OFFLOAD_MEMORY_NONE)
                error_at (cloc,
-                         "unified_address is incompatible with the "
-                         "selected -foffload-memory option");
+                         "%<unified_address%> is incompatible with the "
+                         "selected %<-foffload-memory%> option");
              flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
            }
          else if (!strcmp (p, "unified_shared_memory"))
@@ -22883,8 +22883,8 @@ c_parser_omp_requires (c_parser *parser)
              if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
                  && flag_offload_memory != OFFLOAD_MEMORY_NONE)
                error_at (cloc,
-                         "unified_shared_memory is incompatible with the "
-                         "selected -foffload-memory option");
+                         "%<unified_shared_memory%> is incompatible with the "
+                         "selected %<-foffload-memory%> option");
              flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
            }
          else if (!strcmp (p, "dynamic_allocators"))
index 563bf4546eb1c11f7b311e26f84b0e7538f30a28..f8455e30ed87241ea741e4af6df22ac90858fe5f 100644 (file)
@@ -47177,8 +47177,8 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok)
              if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
                  && flag_offload_memory != OFFLOAD_MEMORY_NONE)
                error_at (cloc,
-                         "unified_address is incompatible with the "
-                         "selected -foffload-memory option");
+                         "%<unified_address%> is incompatible with the "
+                         "selected %<-foffload-memory%> option");
              flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
            }
          else if (!strcmp (p, "unified_shared_memory"))
@@ -47188,8 +47188,8 @@ cp_parser_omp_requires (cp_parser *parser, cp_token *pragma_tok)
              if (flag_offload_memory != OFFLOAD_MEMORY_UNIFIED
                  && flag_offload_memory != OFFLOAD_MEMORY_NONE)
                error_at (cloc,
-                         "unified_shared_memory is incompatible with the "
-                         "selected -foffload-memory option");
+                         "%<unified_shared_memory%> is incompatible with the "
+                         "selected %<-foffload-memory%> option");
              flag_offload_memory = OFFLOAD_MEMORY_UNIFIED;
            }
          else if (!strcmp (p, "dynamic_allocators"))