From patchwork Mon May 20 09:48:45 2019 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: 1101916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-501168-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="D76e9XQ0"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 456vHW2VGhz9s55 for ; Mon, 20 May 2019 19:49:11 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; q=dns; s=default; b=Jf6865pfHiHfda2ngZv5Q/1iommhG06uGlJd5PWK1Wyva6bsCb SCiRxUuUl3QHtjYXMv3lPQ+fuWyxjvQy6zkpiYw0/fSWZO948G7SPlhrM1bpP1JI dxCCubWuAUM5BOeg1bXdA70N3aXmkCGABrI8DZwSikK9TGJF2xJ7Be4q0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :subject:to:cc:message-id:date:mime-version:content-type; s= default; bh=/4J2R5mDHsn7/dnSGCM8fp8oONU=; b=D76e9XQ0cgsjlxY1q6Ta Iz4J0dzgvLuf9u6f7V43fs5Z7V83nyOOHmEluccA0Cg7H0pkgLS5A08P5PQgE8nm wtwIUOw16J++Bdr+fE72kUvbrtruBrkeLAvyA9PIwyPOx8AJ5Z3T9+GjqrEUrC54 F7s0ZDrJMJ5w44uRiXeZjuY= Received: (qmail 33370 invoked by alias); 20 May 2019 09:48:51 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 33320 invoked by uid 89); 20 May 2019 09:48:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy=Quote, junk, sk:get_ele, rs6000cc X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 May 2019 09:48:47 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 82D94AD63; Mon, 20 May 2019 09:48:45 +0000 (UTC) From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] fix diagnostic quoting/spelling in rs6000 To: gcc-patches@gcc.gnu.org Cc: Martin Sebor , Segher Boessenkool Message-ID: <611a47aa-3f45-a4be-3aff-03879cf43c69@suse.cz> Date: Mon, 20 May 2019 11:48:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 X-IsSubscribed: yes Hi. The patch is about fallout of -Wformat-diag for ppc64le target where I added quoting of various warnings and errors. Patch can bootstrap on ppc64le-linux-gnu and survives regression tests. Ready to be installed? Thanks, Martin gcc/ChangeLog: 2019-05-16 Martin Liska * config/rs6000/driver-rs6000.c (elf_platform): Do not use an extra newline. * config/rs6000/rs6000-c.c (SYNTAX_ERROR): Wrap pragma in %<%>. (rs6000_pragma_longcall): Likewise/ (altivec_resolve_overloaded_builtin): Likewise for vec_lvs*. * config/rs6000/rs6000.c (rs6000_option_override_internal): Quote a C type. (rs6000_function_arg): Likewise. (rs6000_expand_set_fpscr_drn_builtin): Remove trailing dot. (rs6000_expand_ternop_builtin): Use interval syntax. (get_element_number): Likewise. (altivec_expand_builtin): Likewise. (rs6000_get_function_versions_dispatcher): Quote target_clones. Fix test-suite. gcc/testsuite/ChangeLog: 2019-05-17 Martin Liska * gcc.target/powerpc/ppc64-abi-warn-1.c: Wrap a type. * gcc.target/powerpc/pr80315-1.c: Use new interval format. * gcc.target/powerpc/pr80315-2.c: Likewise. * gcc.target/powerpc/pr80315-3.c: Likewise. * gcc.target/powerpc/pr80315-4.c: Likewise. * gcc.target/powerpc/warn-lvsl-lvsr.c: Wrap builtin names. --- gcc/config/rs6000/driver-rs6000.c | 2 +- gcc/config/rs6000/rs6000-c.c | 10 ++++----- gcc/config/rs6000/rs6000.c | 22 ++++++++++--------- .../gcc.target/powerpc/ppc64-abi-warn-1.c | 2 +- gcc/testsuite/gcc.target/powerpc/pr80315-1.c | 2 +- gcc/testsuite/gcc.target/powerpc/pr80315-2.c | 2 +- gcc/testsuite/gcc.target/powerpc/pr80315-3.c | 2 +- gcc/testsuite/gcc.target/powerpc/pr80315-4.c | 2 +- .../gcc.target/powerpc/warn-lvsl-lvsr.c | 4 ++-- 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/gcc/config/rs6000/driver-rs6000.c b/gcc/config/rs6000/driver-rs6000.c index b290eea4bdd..b58c1c91fc0 100644 --- a/gcc/config/rs6000/driver-rs6000.c +++ b/gcc/config/rs6000/driver-rs6000.c @@ -266,7 +266,7 @@ elf_platform (void) fatal_error ( input_location, "Unsupported cpu name returned from kernel for " - "%<-mcpu=native%>: %s\n" + "%<-mcpu=native%>: %s. " "Please use an explicit cpu name. Valid cpu names are: %s", cpu, s); } diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c index 7c28d4d8176..a898cf6c55a 100644 --- a/gcc/config/rs6000/rs6000-c.c +++ b/gcc/config/rs6000/rs6000-c.c @@ -49,7 +49,7 @@ #define SYNTAX_ERROR(gmsgid) do { \ warning (OPT_Wpragmas, gmsgid); \ - warning (OPT_Wpragmas, "ignoring malformed #pragma longcall"); \ + warning (OPT_Wpragmas, "ignoring malformed %<#pragma longcall%>"); \ return; \ } while (0) @@ -72,7 +72,7 @@ rs6000_pragma_longcall (cpp_reader *pfile ATTRIBUTE_UNUSED) SYNTAX_ERROR ("number must be 0 or 1"); if (pragma_lex (&x) != CPP_EOF) - warning (OPT_Wpragmas, "junk at end of #pragma longcall"); + warning (OPT_Wpragmas, "junk at end of %<#pragma longcall%>"); rs6000_default_long_calls = (n == integer_one_node); } @@ -6140,11 +6140,11 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl, /* vec_lvsl and vec_lvsr are deprecated for use with LE element order. */ if (fcode == ALTIVEC_BUILTIN_VEC_LVSL && !BYTES_BIG_ENDIAN) warning (OPT_Wdeprecated, - "vec_lvsl is deprecated for little endian; use " + "% is deprecated for little endian; use " "assignment for unaligned loads and stores"); else if (fcode == ALTIVEC_BUILTIN_VEC_LVSR && !BYTES_BIG_ENDIAN) warning (OPT_Wdeprecated, - "vec_lvsr is deprecated for little endian; use " + "% is deprecated for little endian; use " "assignment for unaligned loads and stores"); if (fcode == ALTIVEC_BUILTIN_VEC_MUL) @@ -6846,7 +6846,7 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl, { if (TYPE_READONLY (TREE_TYPE (type)) && !TYPE_READONLY (TREE_TYPE (decl_type))) - warning (0, "passing arg %d of %qE discards qualifiers from " + warning (0, "passing argument %d of %qE discards qualifiers from " "pointer target type", n + 1, fndecl); type = build_pointer_type (build_qualified_type (TREE_TYPE (type), 0)); diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 2992ba545d7..7e1b11ad43a 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -4275,7 +4275,7 @@ rs6000_option_override_internal (bool global_init_p) if (main_target_opt != NULL && (main_target_opt->x_rs6000_long_double_type_size != default_long_double_size)) - error ("target attribute or pragma changes long double size"); + error ("target attribute or pragma changes % size"); else rs6000_long_double_type_size = default_long_double_size; } @@ -4310,9 +4310,11 @@ rs6000_option_override_internal (bool global_init_p) { warned_change_long_double = true; if (TARGET_IEEEQUAD) - warning (OPT_Wpsabi, "Using IEEE extended precision long double"); + warning (OPT_Wpsabi, "Using IEEE extended precision " + "%"); else - warning (OPT_Wpsabi, "Using IBM extended precision long double"); + warning (OPT_Wpsabi, "Using IBM extended precision " + "%"); } } } @@ -11791,7 +11793,7 @@ rs6000_function_arg (cumulative_args_t cum_v, machine_mode mode, { warned = true; inform (input_location, - "the ABI of passing homogeneous float aggregates" + "the ABI of passing homogeneous % aggregates" " has changed in GCC 5"); } } @@ -13227,7 +13229,7 @@ rs6000_expand_set_fpscr_drn_builtin (enum insn_code icode, tree exp) /* Builtin not supported in 32-bit mode. */ fatal_error (input_location, "%<__builtin_set_fpscr_drn%> is not supported " - "in 32-bit mode."); + "in 32-bit mode"); if (rs6000_isa_flags & OPTION_MASK_SOFT_FLOAT) { @@ -14250,7 +14252,7 @@ rs6000_expand_ternop_builtin (enum insn_code icode, tree exp, rtx target) if (TREE_CODE (arg2) != INTEGER_CST || wi::geu_p (wi::to_wide (arg2), 16)) { - error ("argument 3 must be in the range 0..15"); + error ("argument 3 must be in the range [0, 15]"); return CONST0_RTX (tmode); } } @@ -14383,7 +14385,7 @@ get_element_number (tree vec_type, tree arg) if (!tree_fits_uhwi_p (arg) || (elt = tree_to_uhwi (arg), elt > max)) { - error ("selector must be an integer constant in the range 0..%wi", max); + error ("selector must be an integer constant in the range [0, %wi]", max); return 0; } @@ -14703,7 +14705,7 @@ altivec_expand_builtin (tree exp, rtx target, bool *expandedp) if (TREE_CODE (arg1) != INTEGER_CST || TREE_INT_CST_LOW (arg1) > 12) { - error ("second argument to %qs must be 0..12", "vec_vextract4b"); + error ("second argument to %qs must be [0, 12]", "vec_vextract4b"); return expand_call (exp, target, false); } break; @@ -14718,7 +14720,7 @@ altivec_expand_builtin (tree exp, rtx target, bool *expandedp) if (TREE_CODE (arg2) != INTEGER_CST || TREE_INT_CST_LOW (arg2) > 12) { - error ("third argument to %qs must be 0..12", "vec_vinsert4b"); + error ("third argument to %qs must be [0, 12]", "vec_vinsert4b"); return expand_call (exp, target, false); } break; @@ -37238,7 +37240,7 @@ rs6000_get_function_versions_dispatcher (void *decl) #ifndef TARGET_LIBC_PROVIDES_HWCAP_IN_TCB error_at (DECL_SOURCE_LOCATION (default_node->decl), - "target_clones attribute needs GLIBC (2.23 and newer) that " + "% attribute needs GLIBC (2.23 and newer) that " "exports hardware capability bits"); #else diff --git a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-1.c b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-1.c index c70c14c2858..ae7d5746b0d 100644 --- a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-1.c +++ b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-1.c @@ -6,7 +6,7 @@ struct f8 float x[8]; }; -void test (struct f8 a, struct f8 b) /* { dg-message "note: the ABI of passing homogeneous float aggregates has changed" } */ +void test (struct f8 a, struct f8 b) /* { dg-message "note: the ABI of passing homogeneous 'float' aggregates has changed" } */ { } diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c index d0fb6dc1c06..2f670a0c6c7 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr80315-1.c +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-1.c @@ -10,6 +10,6 @@ main() int mask; /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */ - res = __builtin_crypto_vshasigmaw (test, 1, 0xff); /* { dg-error "argument 3 must be in the range 0..15" } */ + res = __builtin_crypto_vshasigmaw (test, 1, 0xff); /* { dg-error "argument 3 must be in the range \\[0, 15\\]" } */ return 0; } diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c index 30df7f18658..e95187e2179 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr80315-2.c +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-2.c @@ -10,6 +10,6 @@ main () int mask; /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */ - res = __builtin_crypto_vshasigmad (test, 1, 0xff); /* { dg-error "argument 3 must be in the range 0..15" } */ + res = __builtin_crypto_vshasigmad (test, 1, 0xff); /* { dg-error "argument 3 must be in the range \\[0, 15\\]" } */ return 0; } diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c index 5365f1d516c..f1a782663a1 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr80315-3.c +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-3.c @@ -12,6 +12,6 @@ main () int mask; /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */ - res = vec_shasigma_be (test, 1, 0xff); /* { dg-error "argument 3 must be in the range 0..15" } */ + res = vec_shasigma_be (test, 1, 0xff); /* { dg-error "argument 3 must be in the range \\[0, 15\\]" } */ return res; } diff --git a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c index eb513639939..66a3efce9c5 100644 --- a/gcc/testsuite/gcc.target/powerpc/pr80315-4.c +++ b/gcc/testsuite/gcc.target/powerpc/pr80315-4.c @@ -12,6 +12,6 @@ main () int mask; /* Argument 2 must be 0 or 1. Argument 3 must be in range 0..15. */ - res = vec_shasigma_be (test, 1, 0xff); /* { dg-error "argument 3 must be in the range 0..15" } */ + res = vec_shasigma_be (test, 1, 0xff); /* { dg-error "argument 3 must be in the range \\[0, 15\\]" } */ return res; } diff --git a/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c b/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c index bf889aaa22b..62b37a9c335 100644 --- a/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c +++ b/gcc/testsuite/gcc.target/powerpc/warn-lvsl-lvsr.c @@ -9,6 +9,6 @@ float f[20]; void foo () { - vector unsigned char a = vec_lvsl (4, f); /* { dg-warning "vec_lvsl is deprecated for little endian; use assignment for unaligned loads and stores" } */ - vector unsigned char b = vec_lvsr (8, f); /* { dg-warning "vec_lvsr is deprecated for little endian; use assignment for unaligned loads and stores" } */ + vector unsigned char a = vec_lvsl (4, f); /* { dg-warning "'vec_lvsl' is deprecated for little endian; use assignment for unaligned loads and stores" } */ + vector unsigned char b = vec_lvsr (8, f); /* { dg-warning "'vec_lvsr' is deprecated for little endian; use assignment for unaligned loads and stores" } */ }