Hi. This is a fix for my recent change in string messages. It fixes:
/bin/sh /home/marxin/Programming/gcc/gcc/../move-if-change tmp-recog.c insn-recog.c /home/marxin/Programming/gcc/gcc/config/aarch64/aarch64.c: In function ‘void aarch64_override_options_internal(gcc_options*)’: /home/marxin/Programming/gcc/gcc/config/aarch64/aarch64.c:11457:14: warning: 'q' flag used within a quoted sequence [-Wformat=] error ("incompatible options %<-mstack-protector-guard=global%> and" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "%<-mstack-protector-guard-offset=%qs%>", ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Ready for trunk? Thanks, Martin gcc/ChangeLog: 2019-03-11 Martin Liska <mli...@suse.cz> * config/aarch64/aarch64.c (aarch64_override_options_internal): Fix double string quoting. --- gcc/config/aarch64/aarch64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index 252bed7f0e5..b38505b0872 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; }