public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: "Martin Liška" <mliska@suse.cz>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH] riscv: fix -Wformat-diag errors.
Date: Tue, 18 Jan 2022 17:22:44 +0100	[thread overview]
Message-ID: <3f0a77b3-734b-8d37-29bd-5ba7e7b086a8@suse.cz> (raw)

Pushed as pre-approved by Jeff. The patch fixes -Wformat-diag warnings.

Martin

gcc/ChangeLog:

	* common/config/riscv/riscv-common.cc (riscv_subset_list::add):
	Wrap keywords with quotes and remove trailing dots.
	(riscv_subset_list::parsing_subset_version): Likewise.
	(riscv_subset_list::parse_std_ext): Likewise.
	(riscv_subset_list::parse_multiletter_ext): Likewise.
	* config/riscv/riscv.cc (riscv_handle_type_attribute): Likewise.
---
  gcc/common/config/riscv/riscv-common.cc | 16 ++++++++--------
  gcc/config/riscv/riscv.cc               |  4 ++--
  2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc
index c1d8431c1fa..004822bfe6c 100644
--- a/gcc/common/config/riscv/riscv-common.cc
+++ b/gcc/common/config/riscv/riscv-common.cc
@@ -375,7 +375,7 @@ riscv_subset_list::add (const char *subset, int major_version,
        else
  	error_at (
  	  m_loc,
-	  "%<-march=%s%>: Extension `%s' appear more than one time.",
+	  "%<-march=%s%>: extension %qs appear more than one time",
  	  m_arch,
  	  subset);
  
@@ -613,14 +613,14 @@ riscv_subset_list::parsing_subset_version (const char *ext,
  	  {
  	    if (!ISDIGIT (*(p+1)))
  	      {
-		error_at (m_loc, "%<-march=%s%>: Expect number "
-			  "after %<%dp%>.", m_arch, version);
+		error_at (m_loc, "%<-march=%s%>: expect number "
+			  "after %<%dp%>", m_arch, version);
  		return NULL;
  	      }
  	    if (!major_p)
  	      {
-		error_at (m_loc, "%<-march=%s%>: For %<%s%dp%dp?%>, version "
-			  "number with more than 2 level is not supported.",
+		error_at (m_loc, "%<-march=%s%>: for %<%s%dp%dp?%>, version "
+			  "number with more than 2 level is not supported",
  			  m_arch, ext, major, version);
  		return NULL;
  	      }
@@ -701,8 +701,8 @@ riscv_subset_list::parse_std_ext (const char *p)
  				  /* std_ext_p= */ true, &explicit_version_p);
        if (major_version != 0 || minor_version != 0)
  	{
-	  warning_at (m_loc, 0, "version of `g` will be omitted, please "
-				"specify version for individual extension.");
+	  warning_at (m_loc, 0, "version of %<g%> will be omitted, please "
+				"specify version for individual extension");
  	}
  
        /* We have special rule for G, we disallow rv32gm2p but allow rv32g_zicsr
@@ -906,7 +906,7 @@ riscv_subset_list::parse_multiletter_ext (const char *p,
  
        if (*p != '\0' && *p != '_')
  	{
-	  error_at (m_loc, "%<-march=%s%>: %s must separate with _",
+	  error_at (m_loc, "%<-march=%s%>: %s must separate with %<_%>",
  		    m_arch, ext_type_str);
  	  return NULL;
  	}
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 7c806780883..8314864d5e7 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -3309,8 +3309,8 @@ riscv_handle_type_attribute (tree *node ATTRIBUTE_UNUSED, tree name, tree args,
  	      && strcmp (string, "machine"))
  	    {
  	      warning (OPT_Wattributes,
-		       "argument to %qE attribute is not \"user\", \"supervisor\", or \"machine\"",
-		       name);
+		       "argument to %qE attribute is not %<user%>, %<supervisor%>, "
+		       "or %<machine%>", name);
  	      *no_add_attrs = true;
  	    }
  	}
-- 
2.34.1



             reply	other threads:[~2022-01-18 16:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-18 16:22 Martin Liška [this message]
2022-01-18 16:31 ` Kito Cheng
2022-01-18 16:38   ` Palmer Dabbelt
2022-01-23 22:02     ` Maciej W. Rozycki
2022-01-18 22:00 ` Joseph Myers
2022-01-19  9:33   ` Martin Liška

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=3f0a77b3-734b-8d37-29bd-5ba7e7b086a8@suse.cz \
    --to=mliska@suse.cz \
    --cc=gcc-patches@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).