From patchwork Thu Apr 18 15:04:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 162504 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp854464jan; Thu, 18 Apr 2019 08:05:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwGUMuj3hGNSHuqSfxFjMa2czRy1F4nt7vYh4x+sB0QI4HNBfQpEcu4JwQfuy/f/n9mZyPb X-Received: by 2002:a63:2aca:: with SMTP id q193mr88535183pgq.269.1555599903710; Thu, 18 Apr 2019 08:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555599903; cv=none; d=google.com; s=arc-20160816; b=PHi5lvZRUCxqsdK7Fc5wz4dQNq5r+MVtpqBJV10KU+6ThMabSqYW+R+3xoF1l8+ILb lhtGS+yp3d8S6kFmaj1/FSMWxhv1qvN0AY9aQDJppbftF6xKaldM6FU5GwNGoh6lVlrT w0So44tshFHU5pJlhXfxiTmAXv7/XneZ1n+Gv+XTNs4pxOF/Ys6023DAWrcHrnVOkpY7 ZcQKwgxxx+4KIkSO1IuREurrXVoZt8xHytCVLTbpYAmc/BoE9Fv6d0EDg5ZiZvquJ0qL X+pyXntQ+AR6KhgVwmscb2oaQECYQHA61udoYBp1mWvYZaoobxY18Mm9He6mqRUzl9IE hzhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature :delivered-to:sender:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature; bh=Q9rweU0b5hgDpRZ4ZKADGgGbMHGtDn4t6b3ZqBiP/oE=; b=S5Jw9E++i1/Ifx4jh1Tikj4cckKQ/kteCmIz7D9neUWf/o1n0rGCVWyYV4zFKkgVIM DYlScWhcXFpr3azFwrtyQmHrbQnsKivVUcgqbzmP3eDES/ha1024v4/lYMpXTc9JF+pX 6RFLPbf/LyCIMvOn/AlapX2oFKVUDJQsGyly54D1yfkIP7qt3vFMmscXryDcaf7nL8Uh K2LJRA1b4oqhoUa+2PTo572XF3ekaD+WnQpW6I9GhaueKEhLrER18sWxwyQfwMDMo5I2 QlJAZqaidSIg/QyWmaiqMQ2sF6y+2a9dE8hiEEzy7tf5kDG0+uiQQNcDO9FjTipp5eGA K6KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=YIiE9uHw; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kAxb33gv; spf=pass (google.com: domain of gcc-patches-return-499443-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-499443-patch=linaro.org@gcc.gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id v12si2444704pfe.11.2019.04.18.08.05.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 08:05:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-499443-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=YIiE9uHw; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kAxb33gv; spf=pass (google.com: domain of gcc-patches-return-499443-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="gcc-patches-return-499443-patch=linaro.org@gcc.gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=qzkfHnrQgBVwAakiRZTvIIA7wVVmuh4uGg9POgKtweZBsE 9WWg/TNC5+/zQjT2S8wxCYz6tUYg+NrOftdpCTzfiqwc49SzwWTL8PJRcakSnjac QCde3h0HS5hyqpASyYh4B3sLZoiYNK73viFnsMkkobek17zv9ey+brWX5weTw= 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 :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=f7o1Sy/dSghBCCaHZN2JO6xeqkU=; b=YIiE9uHwmZ+rSQk77Jzw C+YsSF1yT/bUynvsrRdkWnU0oTsu5s2rEGOla9k6IwOzbf0En8WTplMMEOZiNaSp Sa1okCYF6lm1edYPFooiUc16Yn6dVRhSam5JqJ7Okc7ZQz0JAnY6Wl3yZRIQOWGu 0Fr3SgjJIhgcgEQG5Clj57A= Received: (qmail 18805 invoked by alias); 18 Apr 2019 15:04: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 18790 invoked by uid 89); 18 Apr 2019 15:04:51 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:check-i, check-internal-format-escaping.py, UD:check-internal-format-escaping.py, checkinternalformatescapingpy X-HELO: mail-vs1-f50.google.com Received: from mail-vs1-f50.google.com (HELO mail-vs1-f50.google.com) (209.85.217.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 18 Apr 2019 15:04:49 +0000 Received: by mail-vs1-f50.google.com with SMTP id d8so1265416vsp.2 for ; Thu, 18 Apr 2019 08:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:from:date:message-id:subject:to; bh=da32jPI0/jyz9ue8MxHX1wPfJOmuG7FAWR+n0Ci4RTs=; b=kAxb33gvwlJvGMMrHQC82b98X5Q5ohm6SR0Aq323Cs7XWZxditZko3Ca/dZCoJlQVV gYaRE6lFMcMaP6kfGx9IdG5IDM5SomvtsmSmsI9yKHQ/zKvHd4LhAe5/9AcDUyOXxkHg nMgOKnGlegYm6zgmLaQZ9fgVJJdluyLvEB+LRkeKbdJfcsMs74P4VgQAcmy6ianSCIJ5 x6bMVzASGbzvGcYkLT+MquM/KrmUYX9UQFucVRxdxCxDgFM5Aa0UGTwcEVZsf+c6Cv1P 0NhDKWVwT72wh+h82Z+Qu6w8IVTGZvtqYkoUOnTK+5wFkLaV7XkHYmSF+h5uNgGcmPEz PzXA== MIME-Version: 1.0 From: Christophe Lyon Date: Thu, 18 Apr 2019 17:04:35 +0200 Message-ID: Subject: [PATCH] PR translation/90118 Missing space between words To: gcc Patches X-IsSubscribed: yes Hi, This patch adds the missing space before '%<' in config/aarch64/aarch64.c and gcc/cp/call.c. It also updates the check-internal-format-escaping.py checker to warn about such cases. OK? Christophe contrib/ChangeLog: 2019-04-18 Christophe Lyon PR translation/90118 * check-internal-format-escaping.py: Check that %< is not next to a word. gcc/ChangeLog: 2019-04-18 Christophe Lyon PR translation/90118 * config/aarch64/aarch64.c (aarch64_override_options_internal): Add missing space before %<. gcc/cp/ChangeLog: 2019-04-18 Christophe Lyon PR translation/90118 * call.c (print_z_candidate): Add missing space before %<. diff --git a/contrib/check-internal-format-escaping.py b/contrib/check-internal-format-escaping.py index aac4f9e..9c62586 100755 --- a/contrib/check-internal-format-escaping.py +++ b/contrib/check-internal-format-escaping.py @@ -58,6 +58,10 @@ for i, l in enumerate(lines): print('%s: %s' % (origin, text)) if re.search("[^%]'", p): print('%s: %s' % (origin, text)) + # %< should not be preceded by a non-punctuation + # %character. + if re.search("[a-zA-Z0-9]%<", p): + print('%s: %s' % (origin, text)) j += 1 origin = None diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 9be7548..b66071f 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -11483,7 +11483,7 @@ aarch64_override_options_internal (struct gcc_options *opts) if (aarch64_stack_protector_guard == SSP_GLOBAL && opts->x_aarch64_stack_protector_guard_offset_str) { - error ("incompatible options %<-mstack-protector-guard=global%> and" + error ("incompatible options %<-mstack-protector-guard=global%> and " "%<-mstack-protector-guard-offset=%s%>", aarch64_stack_protector_guard_offset_str); } diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 9582345..8f3d019 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3614,16 +3614,16 @@ print_z_candidate (location_t loc, const char *msgstr, { cloc = loc; if (candidate->num_convs == 3) - inform (cloc, "%s%<%D(%T, %T, %T)%> ", msg, fn, + inform (cloc, "%s %<%D(%T, %T, %T)%> ", msg, fn, candidate->convs[0]->type, candidate->convs[1]->type, candidate->convs[2]->type); else if (candidate->num_convs == 2) - inform (cloc, "%s%<%D(%T, %T)%> ", msg, fn, + inform (cloc, "%s %<%D(%T, %T)%> ", msg, fn, candidate->convs[0]->type, candidate->convs[1]->type); else - inform (cloc, "%s%<%D(%T)%> ", msg, fn, + inform (cloc, "%s %<%D(%T)%> ", msg, fn, candidate->convs[0]->type); } else if (TYPE_P (fn))