public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tobias Burnus <burnus@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc/devel/omp/gcc-12] Build fix for 'openmp: allow requires unified_shared_memory'
Date: Thu, 30 Jun 2022 06:35:32 +0000 (GMT)	[thread overview]
Message-ID: <20220630063532.54B843846473@sourceware.org> (raw)

https://gcc.gnu.org/g:b8ecb83d52884153c2b9b9c44840f933dfaa4dc7

commit b8ecb83d52884153c2b9b9c44840f933dfaa4dc7
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Thu Jun 30 08:30:48 2022 +0200

    Build fix for 'openmp: allow requires unified_shared_memory'
    
    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.

Diff:
---
 gcc/c/c-parser.cc | 8 ++++----
 gcc/cp/parser.cc  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index 363b80ebfeb..5cabcb684e9 100644
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -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"))
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 563bf4546eb..f8455e30ed8 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -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"))


                 reply	other threads:[~2022-06-30  6:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220630063532.54B843846473@sourceware.org \
    --to=burnus@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).