From 4180490732498b1d7e30eb73abb6a7c934b89256 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Fri, 19 Apr 2019 09:08:49 +0000 Subject: [PATCH] PR translation/90118 Missing space between words 2019-04-19 Christophe Lyon PR translation/90118 contrib/ * check-internal-format-escaping.py: Check that %< is not next to a word. gcc/ * config/aarch64/aarch64.c (aarch64_override_options_internal): Add missing space before %<. From-SVN: r270454 --- contrib/ChangeLog | 6 ++++++ contrib/check-internal-format-escaping.py | 4 ++++ gcc/ChangeLog | 6 ++++++ gcc/config/aarch64/aarch64.c | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index b1fc60fcbee..db3eb2caa82 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2019-04-19 Christophe Lyon + + PR translation/90118 + * check-internal-format-escaping.py: Check that %< is not next to + a word. + 2019-04-17 Jakub Jelinek * dg-extract-results.sh: Only handle WARNING: program timed out diff --git a/contrib/check-internal-format-escaping.py b/contrib/check-internal-format-escaping.py index aac4f9edeee..9c625868012 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/ChangeLog b/gcc/ChangeLog index c240c54b25f..d160ddfb728 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-04-19 Christophe Lyon + + PR translation/90118 + * config/aarch64/aarch64.c (aarch64_override_options_internal): + Add missing space before %<. + 2019-04-18 Peter Bergner PR rtl-optimization/87871 diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 41bdefc6fee..10b0bd2d532 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); } -- 2.30.2