From patchwork Tue Mar 22 12:39:19 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: 52211 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 4365C3945C18 for ; Tue, 22 Mar 2022 12:40:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 75C793945C37 for ; Tue, 22 Mar 2022 12:39:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 75C793945C37 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-out2.suse.de (Postfix) with ESMTPS id AA74F1F388 for ; Tue, 22 Mar 2022 12:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1647952759; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FWCYsZyiP5LBzGcf2thomTvRVAh5ygPh9GZwkEgye1c=; b=A0ift+6QhF25lquhl/kUmLOHB8VVlXPbpabKD14SVc9MBCDW1Na76R6vYtNTT5zACb8G9F T5uDu/Yd63f3GJ1AgPaOHAq7SvveJJE0qCPgFUFw5+qiUGo4Rx/ruIHq/aJNhkM5Bzn3cn ZFFx8VmBKu5dt0KKcTcTnwmGr20OucY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1647952759; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FWCYsZyiP5LBzGcf2thomTvRVAh5ygPh9GZwkEgye1c=; b=EqEwVjKd045b/1DAyOJBJTyXJLV7K9gp+ZW16pwyhp6PTUeP9T3iyn46Q3pktNkiyvOMKd C4+YGLb5m6vxDEBQ== 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 9968C12FC5 for ; Tue, 22 Mar 2022 12:39:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 63LTI3fDOWLlbQAAMHmgww (envelope-from ) for ; Tue, 22 Mar 2022 12:39:19 +0000 Message-ID: Date: Tue, 22 Mar 2022 13:39:19 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] i386: update error message format. To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.8 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, T_SCC_BODY_TEXT_LINE 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Pushed to master as obvious. Use '%qs' instead of '(%qs)'. gcc/ChangeLog: * config/i386/i386-options.cc (ix86_option_override_internal): Use '%qs' instead of '(%qs)'. gcc/testsuite/ChangeLog: * gcc.target/i386/pr99753.c: Update test. * gcc.target/i386/spellcheck-options-1.c: Likewise. * gcc.target/i386/spellcheck-options-2.c: Likewise. * gcc.target/i386/spellcheck-options-4.c: Likewise. --- gcc/config/i386/i386-options.cc | 8 ++++---- gcc/testsuite/gcc.target/i386/pr99753.c | 2 +- gcc/testsuite/gcc.target/i386/spellcheck-options-1.c | 2 +- gcc/testsuite/gcc.target/i386/spellcheck-options-2.c | 2 +- gcc/testsuite/gcc.target/i386/spellcheck-options-4.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc index 80553936410..32cc58a764b 100644 --- a/gcc/config/i386/i386-options.cc +++ b/gcc/config/i386/i386-options.cc @@ -2212,8 +2212,8 @@ ix86_option_override_internal (bool main_args_p, if (i == pta_size) { error (main_args_p - ? G_("bad value (%qs) for %<-march=%> switch") - : G_("bad value (%qs) for % attribute"), + ? G_("bad value %qs for %<-march=%> switch") + : G_("bad value %qs for % attribute"), opts->x_ix86_arch_string); auto_vec candidates; @@ -2292,8 +2292,8 @@ ix86_option_override_internal (bool main_args_p, if (ix86_tune_specified && i == pta_size) { error (main_args_p - ? G_("bad value (%qs) for %<-mtune=%> switch") - : G_("bad value (%qs) for % attribute"), + ? G_("bad value %qs for %<-mtune=%> switch") + : G_("bad value %qs for % attribute"), opts->x_ix86_tune_string); auto_vec candidates; diff --git a/gcc/testsuite/gcc.target/i386/pr99753.c b/gcc/testsuite/gcc.target/i386/pr99753.c index 3def1fd7481..1b000bd56b6 100644 --- a/gcc/testsuite/gcc.target/i386/pr99753.c +++ b/gcc/testsuite/gcc.target/i386/pr99753.c @@ -2,4 +2,4 @@ /* { dg-do compile } */ /* { dg-options "-march=amd -m32" } */ -/* { dg-error "bad value .'amd'. for '-march=' switch" "" { target *-*-* } 0 } */ +/* { dg-error "bad value 'amd' for '-march=' switch" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/i386/spellcheck-options-1.c b/gcc/testsuite/gcc.target/i386/spellcheck-options-1.c index 275f86c178d..a775545887e 100644 --- a/gcc/testsuite/gcc.target/i386/spellcheck-options-1.c +++ b/gcc/testsuite/gcc.target/i386/spellcheck-options-1.c @@ -3,5 +3,5 @@ /* { dg-do compile } */ /* { dg-options "-march=hasvel" } */ -/* { dg-error "bad value .'hasvel'. for '-march=' switch" "" { target *-*-* } 0 } */ +/* { dg-error "bad value 'hasvel' for '-march=' switch" "" { target *-*-* } 0 } */ /* { dg-message "valid arguments to '-march=' switch are: \[^\n\r]*; did you mean 'haswell'?" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/i386/spellcheck-options-2.c b/gcc/testsuite/gcc.target/i386/spellcheck-options-2.c index 848906245af..91ddfe2cad2 100644 --- a/gcc/testsuite/gcc.target/i386/spellcheck-options-2.c +++ b/gcc/testsuite/gcc.target/i386/spellcheck-options-2.c @@ -3,5 +3,5 @@ /* { dg-do compile } */ /* { dg-options "-mtune=hasvel" } */ -/* { dg-error "bad value .'hasvel'. for '-mtune=' switch" "" { target *-*-* } 0 } */ +/* { dg-error "bad value 'hasvel' for '-mtune=' switch" "" { target *-*-* } 0 } */ /* { dg-message "valid arguments to '-mtune=' switch are: \[^\n\r]*; did you mean 'haswell'?" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/i386/spellcheck-options-4.c b/gcc/testsuite/gcc.target/i386/spellcheck-options-4.c index 7eba4127513..71804a3d9b8 100644 --- a/gcc/testsuite/gcc.target/i386/spellcheck-options-4.c +++ b/gcc/testsuite/gcc.target/i386/spellcheck-options-4.c @@ -3,5 +3,5 @@ /* { dg-do compile } */ -__attribute__((target ("arch=hasvel"))) void foo (void) {} /* { dg-error "bad value .'hasvel'. for 'target..arch=..' attribute" } */ +__attribute__((target ("arch=hasvel"))) void foo (void) {} /* { dg-error "bad value 'hasvel' for 'target..arch=..' attribute" } */ /* { dg-message "valid arguments to 'target..arch=..' attribute are: \[^\n\r]*; did you mean 'haswell'?" "" { target *-*-* } .-1 } */