From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-xe36.google.com (mail-vs1-xe36.google.com [IPv6:2607:f8b0:4864:20::e36]) by sourceware.org (Postfix) with ESMTPS id 4C18F3858D1E for ; Tue, 4 Apr 2023 09:18:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C18F3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-vs1-xe36.google.com with SMTP id z17so21191883vsf.4 for ; Tue, 04 Apr 2023 02:18:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680599932; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=V1k6wShot8BLP5YybfNBLwqwVHK4fv1dpIhUBUQ3yuE=; b=ZQJAdeFZqXu08NeS7ri5vBd7GounxXV/w9oraaRgqLKU8XxBxPiPpkaRwOF2DLc0fc bm0no68u2h7r72iQNm16kYA8HyEIP9VF8R5hDu2S40UbENgkx88mO08J6zdR+7frG17j JBUKFo0XabyybqV9EEh+XkRS7OacQaSZk+VIvmQY5F8ckzGSq8lOauC8/NIPbCCf+Zx9 UUJ5hjWjseDtAvnxJhGWBr4CzMU+B5uPcVzgPiRBtQa1priqNE66HixWkSZc+1WsI/kO ls84AJOBBi9+kSeswm1hsJQZAs36qsJMvU9fi3NFN/7K4qA/59B9mgginRx69j0OKoN4 XnVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680599932; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V1k6wShot8BLP5YybfNBLwqwVHK4fv1dpIhUBUQ3yuE=; b=ghUNUljekkTO+OiCyaj52t4NjZivC5czPhtl+86Apwj7dCovT3XflLKkTd+jeMT41m lB5OfHJe5ODQBsfa/mHa2BfakaGuvprQLzj3Pf1N9t67/cVSYDK9xaDjfNC0yoZMgOPX Ke/bzcUD7JAhMdOBGaJkn1yDg0W+f9/BtZxUW2jS6Wo88oJ/hC8b6lIqqtnzTEbkKFWj 7/IVGXrHL8Q+vra0olFnsNPbqZQkW5N5mXJ4Q/3MbUz/26pna8uYpXiiZ77bXaPNgQj8 2CwsLZyKaoyxtS0GmWCMXVCuf1L2tmCJFxYjAaDFvM8jeyxYEdtyhCcHxD40wQ6mMS+2 LsJw== X-Gm-Message-State: AAQBX9ck8BxMa7zcG2buwtHxennOq2JyVZLTusBczW3KrtoEMi3o2GMt esq2zW2SwFVJDuuPuv8tQj5rfl93lUrY1DmWLkQ= X-Google-Smtp-Source: AKy350Z5ZHkTcaAjHEQLzecXDgDAawxoJMxgES5LIlqme7Vu1UHGDcPNl8IQyWE1DzCTlvQBM0fPQec0f015TvyXEmo= X-Received: by 2002:a67:d81d:0:b0:429:d443:96a with SMTP id e29-20020a67d81d000000b00429d443096amr1835860vsj.7.1680599932379; Tue, 04 Apr 2023 02:18:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Kito Cheng Date: Tue, 4 Apr 2023 17:18:41 +0800 Message-ID: Subject: Re: [PATCH] riscv: Fix bootstrap [PR109384] To: Jakub Jelinek Cc: Jeff Law , gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: ok, thanks! On Tue, Apr 4, 2023 at 5:01=E2=80=AFPM Jakub Jelinek via Gcc-patches wrote: > > Hi! > > 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%>: % extension conflicts with %" > ? > 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 %", 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 > > PR target/109384 > * common/config/riscv/riscv-common.cc (riscv_subset_list::parse): > Reword diagnostics about zfinx conflict with f, formatting fixes. > > * gcc.target/riscv/arch-19.c: Expect a different message about zf= inx > vs. f conflict. > > --- gcc/common/config/riscv/riscv-common.cc.jj 2023-04-04 10:46:33.47387= 1184 +0200 > +++ gcc/common/config/riscv/riscv-common.cc 2023-04-04 10:41:22.01447= 7456 +0200 > @@ -1153,10 +1153,9 @@ riscv_subset_list::parse (const char *ar > > subset_list->handle_combine_ext (); > > - if (subset_list->lookup("zfinx") && subset_list->lookup("f")) > - error_at (loc, > - "%<-march=3D%s%>: z*inx is conflict with float extensions", > - arch); > + if (subset_list->lookup ("zfinx") && subset_list->lookup ("f")) > + error_at (loc, "%<-march=3D%s%>: z*inx conflicts with floating-point= " > + "extensions", arch); > > return subset_list; > > --- gcc/testsuite/gcc.target/riscv/arch-19.c.jj 2023-03-29 22:37:11.46565= 1690 +0200 > +++ gcc/testsuite/gcc.target/riscv/arch-19.c 2023-04-04 10:45:50.73450= 3089 +0200 > @@ -1,4 +1,4 @@ > /* { dg-do compile } */ > /* { dg-options "-march=3Drv64if_zfinx -mabi=3Dlp64" } */ > int foo() {} > -/* { dg-error "'-march=3Drv64if_zfinx': z\\*inx is conflict with float e= xtensions" "" { target *-*-* } 0 } */ > +/* { dg-error "'-march=3Drv64if_zfinx': z\\*inx conflicts with floating-= point extensions" "" { target *-*-* } 0 } */ > > Jakub >