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

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b1fc60f..db3eb2c 100644 (file)
--- 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 (executable)
--- 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 (file)
--- 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 (file)
--- 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);
     }