From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 3F97D3858C36; Tue,  4 Apr 2023 09:24:10 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3F97D3858C36
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1680600250;
	bh=dPutZewDkZAVI75B6UK8F6hQOIvB1Qz+hZrWvU4+zFs=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=CG7SnB43oGfH/lU7EYZ0RpIYF8Ld87r6jR+38N1291cl/rxletSkV+6wjkekZJF+K
	 SJq31WJL5pogH1sXDyGb1PMIDHolzGDmWzB6rP9KS/djnlSISNmG1xxtZwIjTlXjse
	 6SAqqCs6ZL0a3M6wAbG58eIBQObgC2d69+EtolWE=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug target/109384] [13 Regression] unquoted keyword 'float' in
 format [-Werror=format-diag]
Date: Tue, 04 Apr 2023 09:24:09 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: target
X-Bugzilla-Version: 13.0
X-Bugzilla-Keywords: 
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: UNCONFIRMED
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: 13.0
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-109384-4-Zr9ZMGLv2h@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-109384-4@http.gcc.gnu.org/bugzilla/>
References: <bug-109384-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D109384

--- Comment #4 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <jakub@gcc.gnu.org>:

https://gcc.gnu.org/g:840354060e23ff28d325af2b8422233ce14f40f8

commit r13-6997-g840354060e23ff28d325af2b8422233ce14f40f8
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Tue Apr 4 11:20:28 2023 +0200

    riscv: Fix bootstrap [PR109384]

    The following patch unbreaks riscv bootstrap, where it previously failed
    on -Werror=3Dformat-diag warning promoted to error.

    Ok for trunk?

    Or shall it say e.g.
    "%<-march=3D%s%>: %<zfinx%> extension conflicts with %<f>"
    ?
    Or say if the current condition is true, do
    const char *ext =3D "zfinx";
    if (subset_list->lookup ("zdinx"))
      ext =3D "zdinx";
    else if (subset_list->lookup ("zhinx"))
      ext =3D "zhinx";
    else if (subset_list->lookup ("zhinxmin"))
      ext =3D "zhinxmin";
    and
    "%<-march=3D%s%>: %qs extension conflicts with %<f>", arch, ext
    ?  Or do similar check for which extension to print against it,
    const char *ext =3D "zfinx";
    const char *ext2 =3D "f";
    if (subset_list->lookup ("zdinx"))
      {
        ext =3D "zdinx";
        if (subset_list->lookup ("d"))
          ext2 =3D "d";
      }
    else if (subset_list->lookup ("zhinx"))
      {
        ext =3D "zhinx";
        if (subset_list->lookup ("zfh"))
          ext2 =3D "zfh";
      }
    else if (subset_list->lookup ("zhinxmin"))
      {
        ext =3D "zhinxmin";
        if (subset_list->lookup ("zfhmin"))
          ext2 =3D "zfhmin";
      }
    "%<-march=3D%s%>: %qs extension conflicts with %qs", arch, ext, ext2
    ?

    2023-04-04  Jakub Jelinek  <jakub@redhat.com>

            PR target/109384
            * common/config/riscv/riscv-common.cc (riscv_subset_list::parse=
):
            Reword diagnostics about zfinx conflict with f, formatting fixe=
s.

            * gcc.target/riscv/arch-19.c: Expect a different message about
zfinx
            vs. f conflict.=