aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2019-03-11 21:56:07 +0100
committerMartin Liska <marxin@gcc.gnu.org>2019-03-11 20:56:07 +0000
commit63d42e89be8d5d2c22bff29981cdd419c4beb4a3 (patch)
tree93ab4d4ded047a58b7dac40cb3e6a163e4145484
parent7856fb4539854957b069321788170a12ee0bca28 (diff)
downloadgcc-63d42e89be8d5d2c22bff29981cdd419c4beb4a3.zip
gcc-63d42e89be8d5d2c22bff29981cdd419c4beb4a3.tar.gz
gcc-63d42e89be8d5d2c22bff29981cdd419c4beb4a3.tar.bz2
Fix double string quoting.
2019-03-11 Martin Liska <mliska@suse.cz> * config/aarch64/aarch64.c (aarch64_override_options_internal): Fix double string quoting. From-SVN: r269595
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/aarch64/aarch64.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61e23a6..2d08753 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2019-03-11 Martin Liska <mliska@suse.cz>
+ * config/aarch64/aarch64.c (aarch64_override_options_internal):
+ Fix double string quoting.
+
+2019-03-11 Martin Liska <mliska@suse.cz>
+
* collect-utils.c (collect_wait): Wrap apostrophes
in gcc internal format with %'.
* collect2.c (main): Likewise.
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index 252bed7..b38505b 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -11455,7 +11455,7 @@ aarch64_override_options_internal (struct gcc_options *opts)
&& opts->x_aarch64_stack_protector_guard_offset_str)
{
error ("incompatible options %<-mstack-protector-guard=global%> and"
- "%<-mstack-protector-guard-offset=%qs%>",
+ "%<-mstack-protector-guard-offset=%s%>",
aarch64_stack_protector_guard_offset_str);
}
@@ -11482,7 +11482,7 @@ aarch64_override_options_internal (struct gcc_options *opts)
long offs = strtol (aarch64_stack_protector_guard_offset_str, &end, 0);
if (!*str || *end || errno)
error ("%qs is not a valid offset in %qs", str,
- "%<-mstack-protector-guard-offset=%>");
+ "-mstack-protector-guard-offset=");
aarch64_stack_protector_guard_offset = offs;
}