From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DF8753858D1E for ; Tue, 4 Apr 2023 09:01:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF8753858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680598883; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=x84sKwKVnb/MTDlJYfF9juoVzzDMuk2ivF2wC2X1fno=; b=KK5D2CccIdUH8fB9Tuc6YSUqB7g5XmtObYbMYG509jbNDp8ia47q4F8FRb+BXPMto7O+dh d+DXWNPBEM6P2Y9otHy+2/i7/XoeSItdudg6A32L3Fuv4ZRWrJCiIVwRecXiWG113Ovzof GPtcLY13f/vht4NYL0DU3xDuIdPCLvM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-4QyezaQlOjG95j6afCrATw-1; Tue, 04 Apr 2023 05:01:22 -0400 X-MC-Unique: 4QyezaQlOjG95j6afCrATw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF444811E7C; Tue, 4 Apr 2023 09:01:21 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 725C12027061; Tue, 4 Apr 2023 09:01:21 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 33491Juf1764606 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 4 Apr 2023 11:01:19 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 33491IDA1764605; Tue, 4 Apr 2023 11:01:18 +0200 Date: Tue, 4 Apr 2023 11:01:18 +0200 From: Jakub Jelinek To: Kito Cheng , Jeff Law Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] riscv: Fix bootstrap [PR109384] Message-ID: Reply-To: Jakub Jelinek MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: Hi! The following patch unbreaks riscv bootstrap, where it previously failed on -Werror=format-diag warning promoted to error. Ok for trunk? Or shall it say e.g. "%<-march=%s%>: % extension conflicts with %" ? Or say if the current condition is true, do const char *ext = "zfinx"; if (subset_list->lookup ("zdinx")) ext = "zdinx"; else if (subset_list->lookup ("zhinx")) ext = "zhinx"; else if (subset_list->lookup ("zhinxmin")) ext = "zhinxmin"; and "%<-march=%s%>: %qs extension conflicts with %", arch, ext ? Or do similar check for which extension to print against it, const char *ext = "zfinx"; const char *ext2 = "f"; if (subset_list->lookup ("zdinx")) { ext = "zdinx"; if (subset_list->lookup ("d")) ext2 = "d"; } else if (subset_list->lookup ("zhinx")) { ext = "zhinx"; if (subset_list->lookup ("zfh")) ext2 = "zfh"; } else if (subset_list->lookup ("zhinxmin")) { ext = "zhinxmin"; if (subset_list->lookup ("zfhmin")) ext2 = "zfhmin"; } "%<-march=%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 zfinx vs. f conflict. --- gcc/common/config/riscv/riscv-common.cc.jj 2023-04-04 10:46:33.473871184 +0200 +++ gcc/common/config/riscv/riscv-common.cc 2023-04-04 10:41:22.014477456 +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=%s%>: z*inx is conflict with float extensions", - arch); + if (subset_list->lookup ("zfinx") && subset_list->lookup ("f")) + error_at (loc, "%<-march=%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.465651690 +0200 +++ gcc/testsuite/gcc.target/riscv/arch-19.c 2023-04-04 10:45:50.734503089 +0200 @@ -1,4 +1,4 @@ /* { dg-do compile } */ /* { dg-options "-march=rv64if_zfinx -mabi=lp64" } */ int foo() {} -/* { dg-error "'-march=rv64if_zfinx': z\\*inx is conflict with float extensions" "" { target *-*-* } 0 } */ +/* { dg-error "'-march=rv64if_zfinx': z\\*inx conflicts with floating-point extensions" "" { target *-*-* } 0 } */ Jakub