On 07/03/2022 10:27, Martin Liška wrote:
This fixes option quoting in error messages.

Ready to be installed?
Thanks,
Martin

     PR target/104794

gcc/ChangeLog:

     * config/arm/arm.cc (arm_option_override_internal): Fix quoting
     of options in error messages.
     (arm_option_reconfigure_globals): Likewise.
---
  gcc/config/arm/arm.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index c1103d9fad6..4bf1ef0517d 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -3185,8 +3185,8 @@ arm_option_override_internal (struct gcc_options *opts,
    if (arm_stack_protector_guard == SSP_GLOBAL
        && opts->x_arm_stack_protector_guard_offset_str)
      {
-      error ("incompatible options %'-mstack-protector-guard=global%' and"
-         "%'-mstack-protector-guard-offset=%qs%'",
+      error ("incompatible options %<-mstack-protector-guard=global%> and"
+         "%<-mstack-protector-guard-offset=%s%>",

Wasn't the complaint also that there should be a space in the text between the 'and"' and the '"%<' on the subsequent line?

R.
           arm_stack_protector_guard_offset_str);
      }

@@ -3880,7 +3880,7 @@ arm_option_reconfigure_globals (void)
      }

    if (!TARGET_HARD_TP && arm_stack_protector_guard == SSP_TLSREG)
-    error("%'-mstack-protector-guard=tls%' needs a hardware TLS register"); +    error("%<-mstack-protector-guard=tls%> needs a hardware TLS register");
  }

 /* Perform some validation between the desired architecture and the rest of the

Reply via email to