aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2019-04-19 09:08:49 +0000
committerChristophe Lyon <clyon@gcc.gnu.org>2019-04-19 11:08:49 +0200
commit4180490732498b1d7e30eb73abb6a7c934b89256 (patch)
treeddd7dd5975cd91534d9a0e591450711fdaa59dea
parente7178413f46ac98975bd4b83e073c931b418205d (diff)
downloadgcc-4180490732498b1d7e30eb73abb6a7c934b89256.zip
gcc-4180490732498b1d7e30eb73abb6a7c934b89256.tar.gz
gcc-4180490732498b1d7e30eb73abb6a7c934b89256.tar.bz2
PR translation/90118 Missing space between words
2019-04-19 Christophe Lyon <christophe.lyon@linaro.org> 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
-rw-r--r--contrib/ChangeLog6
-rwxr-xr-xcontrib/check-internal-format-escaping.py4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/aarch64/aarch64.c2
4 files changed, 17 insertions, 1 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b1fc60f..db3eb2c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-19 Christophe Lyon <christophe.lyon@linaro.org>
+
+ PR translation/90118
+ * check-internal-format-escaping.py: Check that %< is not next to
+ a word.
+
2019-04-17 Jakub Jelinek <jakub@redhat.com>
* 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 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/ChangeLog b/gcc/ChangeLog
index c240c54..d160ddf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-19 Christophe Lyon <christophe.lyon@linaro.org>
+
+ PR translation/90118
+ * config/aarch64/aarch64.c (aarch64_override_options_internal):
+ Add missing space before %<.
+
2019-04-18 Peter Bergner <bergner@linux.ibm.com>
PR rtl-optimization/87871
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 41bdefc..10b0bd2 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);
}