From patchwork Wed Jan 12 09:02:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 49905 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EF7BD393A436 for ; Wed, 12 Jan 2022 09:04:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 3412938B3429 for ; Wed, 12 Jan 2022 09:02:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3412938B3429 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4F4DD21121; Wed, 12 Jan 2022 09:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1641978157; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4iLG3f5F31vdc5i++VgIwQQ2Br5U4z8wmWAYQutFQuM=; b=Bc76GDfQ09jHFXGszbKssQib1zV0VspOh+MVJi6RJGQHf7d0/oitRMADuxrD5Cq/12FaUY RiiW+YdKBGnLuHqk5MHCPqIFKKKqxngfO+qsm2f4ttRCAOKJ/rjyMYWSeQuahE7LSlnQ4I p9/oY0mC5MJ1eivttH/Mm+U4QZec9Lw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1641978157; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4iLG3f5F31vdc5i++VgIwQQ2Br5U4z8wmWAYQutFQuM=; b=9uVvMMUSiUq8RwalZhrYUTokyTzt3WLxz0KNmPFmQdz6Nc405FQh3tNYwJXJkZ8qjulNWy Ci5Z6l+PC0HnhkDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 359C113B3D; Wed, 12 Jan 2022 09:02:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id LKTzCy2Z3mHRPAAAMHmgww (envelope-from ); Wed, 12 Jan 2022 09:02:37 +0000 Message-ID: <82b5332c-0c99-0163-cfc6-bd6bb3093f7e@suse.cz> Date: Wed, 12 Jan 2022 10:02:36 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] Fix -Wformat-diag for rs6000 target. To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Segher Boessenkool Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hello. We've got -Wformat-diag for some time and I think we should start using it in -Werror for GCC bootstrap. The following patch removes last pieces of the warning for rs6000 target. Ready to be installed? Thanks, Martin gcc/ChangeLog: * config/rs6000/rs6000-call.c (rs6000_invalid_builtin): Wrap keywords and use %qs instead of %<%s%>. (rs6000_expand_builtin): Likewise. gcc/testsuite/ChangeLog: * gcc.target/powerpc/bfp/scalar-extract-exp-5.c: Adjust scans in testcases. * gcc.target/powerpc/bfp/scalar-extract-sig-5.c: Likewise. * gcc.target/powerpc/bfp/scalar-insert-exp-11.c: Likewise. --- gcc/config/rs6000/rs6000-call.c | 8 ++++---- .../gcc.target/powerpc/bfp/scalar-extract-exp-5.c | 2 +- .../gcc.target/powerpc/bfp/scalar-extract-sig-5.c | 2 +- .../gcc.target/powerpc/bfp/scalar-insert-exp-11.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c index c78b8b08c40..becdad73812 100644 --- a/gcc/config/rs6000/rs6000-call.c +++ b/gcc/config/rs6000/rs6000-call.c @@ -3307,7 +3307,7 @@ rs6000_invalid_builtin (enum rs6000_gen_builtins fncode) "-mvsx"); break; case ENB_IEEE128_HW: - error ("%qs requires ISA 3.0 IEEE 128-bit floating point", name); + error ("%qs requires ISA 3.0 IEEE 128-bit floating-point", name); break; case ENB_DFP: error ("%qs requires the %qs option", name, "-mhard-dfp"); @@ -5589,20 +5589,20 @@ rs6000_expand_builtin (tree exp, rtx target, rtx /* subtarget */, if (bif_is_nosoft (*bifaddr) && rs6000_isa_flags & OPTION_MASK_SOFT_FLOAT) { - error ("%<%s%> not supported with %<-msoft-float%>", + error ("%qs not supported with %<-msoft-float%>", bifaddr->bifname); return const0_rtx; } if (bif_is_no32bit (*bifaddr) && TARGET_32BIT) { - error ("%<%s%> is not supported in 32-bit mode", bifaddr->bifname); + error ("%qs is not supported in 32-bit mode", bifaddr->bifname); return const0_rtx; } if (bif_is_ibmld (*bifaddr) && !FLOAT128_2REG_P (TFmode)) { - error ("%<%s%> requires % to be IBM 128-bit format", + error ("%qs requires % to be IBM 128-bit format", bifaddr->bifname); return const0_rtx; } diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c index 34184812dc5..1225613b275 100644 --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c @@ -14,7 +14,7 @@ get_exponent (__ieee128 *p) { __ieee128 source = *p; - return scalar_extract_exp (source); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating point" } */ + return scalar_extract_exp (source); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating-point" } */ } diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c index 13c64fc3acf..adf0e4f99df 100644 --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c @@ -12,5 +12,5 @@ get_significand (__ieee128 *p) { __ieee128 source = *p; - return (long long int) __builtin_vec_scalar_extract_sig (source); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating point" } */ + return (long long int) __builtin_vec_scalar_extract_sig (source); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating-point" } */ } diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c index a5dd852e60f..6787a67950b 100644 --- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c +++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c @@ -16,5 +16,5 @@ insert_exponent (__ieee128 *significand_p, __ieee128 significand = *significand_p; unsigned long long int exponent = *exponent_p; - return scalar_insert_exp (significand, exponent); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating point" } */ + return scalar_insert_exp (significand, exponent); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating-point" } */ }