Thanks Martin!
On Wed, Jan 19, 2022 at 12:23 AM Martin Liška <mli...@suse.cz> wrote:
>
> 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
>
>
