Fix -Wformat-diag in various targets.

gcc/ChangeLog:

	* collect2.cc (scan_libraries): Fix -Wformat-diag issues.
	* config/aarch64/aarch64-builtins.cc (aarch64_simd_expand_builtin): Likewise.
	* config/arc/arc.md: Likewise.
	* config/avr/avr.cc (avr_section_type_flags): Likewise.
	* config/bfin/bfin.cc (bfin_option_override): Likewise.
	(bfin_handle_longcall_attribute): Likewise.
	* config/cris/cris.h (FUNCTION_PROFILER): Likewise.
	* config/frv/frv.cc (frv_expand_builtin): Likewise.
	* config/ia64/ia64-c.cc (ia64_hpux_handle_builtin_pragma): Likewise.
	* config/iq2000/iq2000.cc (save_restore_insns): Likewise.
	(iq2000_print_operand_address): Likewise.
	(iq2000_print_operand): Likewise.
	* config/m32c/m32c-pragma.cc (m32c_pragma_memregs): Likewise.
	(m32c_pragma_address): Likewise.
	* config/m68k/m68k.cc (m68k_handle_fndecl_attribute): Likewise.
	* config/mips/mips.cc (mips_handle_interrupt_attr): Likewise.
	(mips_set_compression_mode): Likewise.
	* config/mmix/mmix.cc (mmix_function_profiler): Likewise.
	(mmix_print_operand): Likewise.
	(mmix_output_shiftvalue_op_from_str): Likewise.
	(mmix_output_shifted_value): Likewise.
	* config/msp430/driver-msp430.cc (msp430_select_hwmult_lib): Likewise.
	* config/msp430/msp430.cc (msp430_option_override): Likewise.
	(msp430_attr): Likewise.
	(msp430_expand_delay_cycles): Likewise.
	(msp430_expand_builtin): Likewise.
	* config/rs6000/aix73.h: Likewise.
	* config/rs6000/rtems.h (INVALID_64BIT): Likewise.
	* config/rx/rx.cc (rx_expand_builtin_mvtc): Likewise.
	(valid_psw_flag): Likewise.
	* config/sh/sh.cc (parse_validate_atomic_model_option): Likewise.
	* config/stormy16/stormy16.cc (xstormy16_function_profiler): Likewise.
	(xstormy16_expand_builtin_va_start): Likewise.
	(xstormy16_handle_below100_attribute): Likewise.

20 files changed, 59 insertions, 59 deletions

diff --git a/gcc/collect2.cc b/gcc/collect2.cc
index 0185b9d9e82..d81c7f28f16 100644
--- a/gcc/collect2.cc
+++ b/gcc/collect2.cc
@@ -2552,7 +2552,7 @@ scan_libraries (const char *prog_name)
 
   pex = pex_init (PEX_USE_PIPES, "collect2", NULL);
   if (pex == NULL)
-    fatal_error (input_location, "pex_init failed: %m");
+    fatal_error (input_location, "%<pex_init%> failed: %m");
 
   errmsg = pex_run (pex, 0, ldd_file_name, real_ldd_argv, NULL, NULL, &err);
   if (errmsg != NULL)
diff --git a/gcc/config/aarch64/aarch64-builtins.cc b/gcc/config/aarch64/aarch64-builtins.cc
index 215de1c09c8..b7f338d6229 100644
--- a/gcc/config/aarch64/aarch64-builtins.cc
+++ b/gcc/config/aarch64/aarch64-builtins.cc
@@ -1943,7 +1943,7 @@ aarch64_simd_expand_builtin (int fcode, tree exp, rtx target)
 	}
       else
 	error_at (EXPR_LOCATION (exp),
-		  "total size and element size must be a non-zero "
+		  "total size and element size must be a nonzero "
 		  "constant immediate");
       /* Don't generate any RTL.  */
       return const0_rtx;
diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md
index d4e22a4b2d9..ace3cb70424 100644
--- a/gcc/config/arc/arc.md
+++ b/gcc/config/arc/arc.md
@@ -4666,7 +4666,7 @@ core_3, archs4x, archs4xd, archs4xd_slow"
   /* Keep this message in sync with the one in arc.cc:arc_expand_builtin,
      because *.md files do not get scanned by exgettext.  */
   fatal_error (input_location,
-	       \"operand to trap_s should be an unsigned 6-bit value\");
+	       \"operand to %<trap_s%> should be an unsigned 6-bit value\");
 }
   [(set_attr "length" "2")
   (set_attr "type" "misc")])
diff --git a/gcc/config/avr/avr.cc b/gcc/config/avr/avr.cc
index 9eec991e10a..4ed390e4cf9 100644
--- a/gcc/config/avr/avr.cc
+++ b/gcc/config/avr/avr.cc
@@ -10195,7 +10195,7 @@ avr_section_type_flags (tree decl, const char *name, int reloc)
 	flags |= SECTION_BSS;  /* @nobits */
       else
 	warning (0, "only uninitialized variables can be placed in the "
-		 ".noinit section");
+		 "%<.noinit%> section");
     }
 
   if (decl && DECL_P (decl)
diff --git a/gcc/config/bfin/bfin.cc b/gcc/config/bfin/bfin.cc
index a89a1b48028..c749b4894d7 100644
--- a/gcc/config/bfin/bfin.cc
+++ b/gcc/config/bfin/bfin.cc
@@ -2382,10 +2382,10 @@ bfin_option_override (void)
     }
 
   if (stack_limit_rtx && TARGET_STACK_CHECK_L1)
-    error ("can%'t use multiple stack checking methods together");
+    error ("cannot use multiple stack checking methods together");
 
   if (TARGET_ID_SHARED_LIBRARY && TARGET_FDPIC)
-    error ("ID shared libraries and FD-PIC mode can%'t be used together");
+    error ("ID shared libraries and FD-PIC mode cannot be used together");
 
   /* Don't allow the user to specify -mid-shared-library and -msep-data
      together, as it makes little sense from a user's point of view...  */
@@ -2419,7 +2419,7 @@ bfin_option_override (void)
     error ("%<-mcoreb%> should be used with %<-mmulticore%>");
 
   if (TARGET_COREA && TARGET_COREB)
-    error ("%<-mcorea%> and %<-mcoreb%> can%'t be used together");
+    error ("%<-mcorea%> and %<-mcoreb%> cannot be used together");
 
   flag_schedule_insns = 0;
 
@@ -4763,7 +4763,7 @@ bfin_handle_longcall_attribute (tree *node, tree name,
 	  && lookup_attribute ("longcall", TYPE_ATTRIBUTES (*node))))
     {
       warning (OPT_Wattributes,
-	       "can%'t apply both longcall and shortcall attributes to the same function");
+	       "cannott apply both longcall and shortcall attributes to the same function");
       *no_add_attrs = true;
     }
 
diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index c623d083ff1..b274e116620 100644
--- a/gcc/config/cris/cris.h
+++ b/gcc/config/cris/cris.h
@@ -663,7 +663,7 @@ struct cum_args {int regs;};
 /* Node: Profiling */
 
 #define FUNCTION_PROFILER(FILE, LABELNO)  \
- error ("no FUNCTION_PROFILER for CRIS")
+ error ("no %<FUNCTION_PROFILER%> for CRIS")
 
 /* FIXME: Some of the undefined macros might be mandatory.  If so, fix
    documentation.  */
diff --git a/gcc/config/frv/frv.cc b/gcc/config/frv/frv.cc
index d6c399304a1..6f1904b358c 100644
--- a/gcc/config/frv/frv.cc
+++ b/gcc/config/frv/frv.cc
@@ -9134,7 +9134,7 @@ frv_expand_builtin (tree exp,
     case FRV_BUILTIN_IACCsetl:
       if (!TARGET_FR405_BUILTINS)
 	{
-	  error ("this builtin function is only available"
+	  error ("this built-in function is only available"
 		 " on the fr405 and fr450");
 	  return NULL_RTX;
 	}
@@ -9143,7 +9143,7 @@ frv_expand_builtin (tree exp,
     case FRV_BUILTIN_PREFETCH:
       if (!TARGET_FR500_FR550_BUILTINS)
 	{
-	  error ("this builtin function is only available on the fr500"
+	  error ("this built-in function is only available on the fr500"
 		 " and fr550");
 	  return NULL_RTX;
 	}
@@ -9155,7 +9155,7 @@ frv_expand_builtin (tree exp,
     case FRV_BUILTIN_MQSRAHI:
       if (!TARGET_MEDIA_FR450)
 	{
-	  error ("this builtin function is only available on the fr450");
+	  error ("this built-in function is only available on the fr450");
 	  return NULL_RTX;
 	}
       break;
diff --git a/gcc/config/ia64/ia64-c.cc b/gcc/config/ia64/ia64-c.cc
index f1c8948fa30..fa1b3817d93 100644
--- a/gcc/config/ia64/ia64-c.cc
+++ b/gcc/config/ia64/ia64-c.cc
@@ -47,7 +47,7 @@ ia64_hpux_handle_builtin_pragma (cpp_reader *pfile ATTRIBUTE_UNUSED)
 	type = pragma_lex (&x);
     }
   if (type != CPP_EOF)
-    warning (OPT_Wpragmas, "malformed #pragma builtin");
+    warning (OPT_Wpragmas, "malformed %<#pragma builtin%>");
 }
 
 /* List of standard math functions which do not set matherr by default
diff --git a/gcc/config/iq2000/iq2000.cc b/gcc/config/iq2000/iq2000.cc
index 9b8349d7a88..062734102ba 100644
--- a/gcc/config/iq2000/iq2000.cc
+++ b/gcc/config/iq2000/iq2000.cc
@@ -1864,7 +1864,7 @@ save_restore_insns (int store_p)
 
   if (gp_offset < 0 || end_offset < 0)
     internal_error
-      ("gp_offset (%ld) or end_offset (%ld) is less than zero",
+      ("%<gp_offset%> (%ld) or %<end_offset%> (%ld) is less than zero",
        (long) gp_offset, (long) end_offset);
 
   else if (gp_offset < 32768)
@@ -2890,7 +2890,7 @@ static void
 iq2000_print_operand_address (FILE * file, machine_mode mode, rtx addr)
 {
   if (!addr)
-    error ("PRINT_OPERAND_ADDRESS, null pointer");
+    error ("%<PRINT_OPERAND_ADDRESS%>, null pointer");
 
   else
     switch (GET_CODE (addr))
@@ -3045,7 +3045,7 @@ iq2000_print_operand (FILE *file, rtx op, int letter)
 	  break;
 
 	default:
-	  error ("PRINT_OPERAND: Unknown punctuation %<%c%>", letter);
+	  error ("%<PRINT_OPERAND%>: Unknown punctuation %<%c%>", letter);
 	  break;
 	}
 
@@ -3054,7 +3054,7 @@ iq2000_print_operand (FILE *file, rtx op, int letter)
 
   if (! op)
     {
-      error ("PRINT_OPERAND null pointer");
+      error ("%<PRINT_OPERAND%> null pointer");
       return;
     }
 
diff --git a/gcc/config/m32c/m32c-pragma.cc b/gcc/config/m32c/m32c-pragma.cc
index 685caeaceac..c7d01a99d14 100644
--- a/gcc/config/m32c/m32c-pragma.cc
+++ b/gcc/config/m32c/m32c-pragma.cc
@@ -51,14 +51,14 @@ m32c_pragma_memregs (cpp_reader * reader ATTRIBUTE_UNUSED)
 
 	  type = pragma_lex (&val);
 	  if (type != CPP_EOF)
-	    warning (0, "junk at end of #pragma GCC memregs [0..16]");
+	    warning (0, "junk at end of %<#pragma GCC memregs%> [0-16]");
 
 	  if (i >= 0 && i <= 16)
 	    {
 	      if (!ok_to_change_target_memregs)
 		{
 		  warning (0,
-			   "#pragma GCC memregs must precede any function decls");
+			   "%<#pragma GCC memregs%> must precede any function declarations");
 		  return;
 		}
 	      target_memregs = i;
@@ -66,14 +66,14 @@ m32c_pragma_memregs (cpp_reader * reader ATTRIBUTE_UNUSED)
 	    }
 	  else
 	    {
-	      warning (0, "#pragma GCC memregs takes a number [0..16]");
+	      warning (0, "%<#pragma GCC memregs%> takes a number [0-16]");
 	    }
 
 	  return;
 	}
     }
 
-  error ("#pragma GCC memregs takes a number [0..16]");
+  error ("%<#pragma GCC memregs%> takes a number [0-16]");
 }
 
 /* Implements the "pragma ADDRESS" pragma.  This pragma takes a
@@ -101,12 +101,12 @@ m32c_pragma_address (cpp_reader * reader ATTRIBUTE_UNUSED)
 	  type = pragma_lex (&var);
 	  if (type != CPP_EOF)
 	    {
-	      error ("junk at end of #pragma ADDRESS");
+	      error ("junk at end of %<#pragma ADDRESS%>");
 	    }
 	  return;
 	}
     }
-  error ("malformed #pragma ADDRESS variable address");
+  error ("malformed %<#pragma ADDRESS%> variable address");
 }
 
 /* Implements REGISTER_TARGET_PRAGMAS.  */
diff --git a/gcc/config/m68k/m68k.cc b/gcc/config/m68k/m68k.cc
index 1d5ef02f8de..62898dafe92 100644
--- a/gcc/config/m68k/m68k.cc
+++ b/gcc/config/m68k/m68k.cc
@@ -803,7 +803,7 @@ m68k_handle_fndecl_attribute (tree *node, tree name,
   if (!TARGET_FIDOA
       && !strcmp (IDENTIFIER_POINTER (name), "interrupt_thread"))
     {
-      error ("interrupt_thread is available only on fido");
+      error ("%<interrupt_thread%> is available only on fido");
       *no_add_attrs = true;
     }
 
diff --git a/gcc/config/mips/mips.cc b/gcc/config/mips/mips.cc
index 6c0da2bb90c..4f9683e8bf4 100644
--- a/gcc/config/mips/mips.cc
+++ b/gcc/config/mips/mips.cc
@@ -1519,7 +1519,7 @@ mips_handle_interrupt_attr (tree *node ATTRIBUTE_UNUSED, tree name, tree args,
 	{
 	  warning (OPT_Wattributes,
 		   "argument to %qE attribute is neither eic, nor "
-		   "vector=<line>", name);
+		   "%<vector=<line>%>", name);
 	  *no_add_attrs = true;
 	}
       else if (startswith (TREE_STRING_POINTER (cst), "vector="))
@@ -1535,7 +1535,7 @@ mips_handle_interrupt_attr (tree *node ATTRIBUTE_UNUSED, tree name, tree args,
 	    {
 	      warning (OPT_Wattributes,
 		       "interrupt vector to %qE attribute is not "
-		       "vector=(sw0|sw1|hw0|hw1|hw2|hw3|hw4|hw5)",
+		       "%<vector=(sw0|sw1|hw0|hw1|hw2|hw3|hw4|hw5)%>",
 		       name);
 	      *no_add_attrs = true;
 	    }
@@ -19712,7 +19712,7 @@ mips_set_compression_mode (unsigned int compression_mode)
 	sorry ("MIPS16 %<-mxgot%> code");
 
       if (TARGET_HARD_FLOAT_ABI && !TARGET_OLDABI)
-	sorry ("hard-float MIPS16 code for ABIs other than o32 and o64");
+	sorry ("%<hard-float%> MIPS16 code for ABIs other than o32 and o64");
 
       if (TARGET_MSA)
 	sorry ("MSA MIPS16 code");
diff --git a/gcc/config/mmix/mmix.cc b/gcc/config/mmix/mmix.cc
index 18053d453be..439ae8f044f 100644
--- a/gcc/config/mmix/mmix.cc
+++ b/gcc/config/mmix/mmix.cc
@@ -977,7 +977,7 @@ void
 mmix_function_profiler (FILE *stream ATTRIBUTE_UNUSED,
 			int labelno ATTRIBUTE_UNUSED)
 {
-  sorry ("function_profiler support for MMIX");
+  sorry ("%<function_profiler%> support for MMIX");
 }
 
 /* Worker function for TARGET_SETUP_INCOMING_VARARGS.  For the moment,
@@ -1763,7 +1763,7 @@ mmix_print_operand (FILE *stream, rtx x, int code)
 
     default:
       /* Presumably there's a missing case above if we get here.  */
-      internal_error ("MMIX Internal: Missing %qc case in mmix_print_operand", code);
+      internal_error ("MMIX Internal: Missing %qc case in %<mmix_print_operand%>", code);
     }
 
   switch (GET_CODE (modified_x))
@@ -2591,7 +2591,7 @@ mmix_output_shiftvalue_op_from_str (FILE *stream,
     {
       char s[sizeof ("0xffffffffffffffff")];
       sprintf (s, "%#" PRIx64, value);
-      internal_error ("MMIX Internal: %s is not a shiftable int", s);
+      internal_error ("MMIX Internal: %s is not a shiftable integer", s);
     }
 
   for (i = 0; i < 4; i++)
@@ -2650,7 +2650,7 @@ mmix_output_shifted_value (FILE *stream, int64_t value)
     {
       char s[16+2+1];
       sprintf (s, "%#" PRIx64, value);
-      internal_error ("MMIX Internal: %s is not a shiftable int", s);
+      internal_error ("MMIX Internal: %s is not a shiftable integer", s);
     }
 
   for (i = 0; i < 4; i++)
diff --git a/gcc/config/msp430/driver-msp430.cc b/gcc/config/msp430/driver-msp430.cc
index 5ea2b078fb5..b4bff424f55 100644
--- a/gcc/config/msp430/driver-msp430.cc
+++ b/gcc/config/msp430/driver-msp430.cc
@@ -89,7 +89,7 @@ msp430_select_hwmult_lib (int argc ATTRIBUTE_UNUSED,
     {
     case 1:
       if (strcasecmp (argv[0], "default"))
-	error ("unexpected argument to msp430_select_hwmult_lib: %s", argv[0]);
+	error ("unexpected argument to %<msp430_select_hwmult_lib%>: %s", argv[0]);
       break;
 
     default:
@@ -138,12 +138,12 @@ msp430_select_hwmult_lib (int argc ATTRIBUTE_UNUSED,
 	    }
 	}
       else
-	error ("unexpected first argument to msp430_select_hwmult_lib: %s",
+	error ("unexpected first argument to %<msp430_select_hwmult_lib%>: %s",
 	       argv[0]);
       break;
 
     case 0:
-      error ("msp430_select_hwmult_lib needs one or more arguments");
+      error ("%<msp430_select_hwmult_lib%> needs one or more arguments");
       break;
     }
 
diff --git a/gcc/config/msp430/msp430.cc b/gcc/config/msp430/msp430.cc
index 18673ff6fd3..eb219fd5e71 100644
--- a/gcc/config/msp430/msp430.cc
+++ b/gcc/config/msp430/msp430.cc
@@ -222,16 +222,16 @@ msp430_option_override (void)
 		{
 		  if (target_cpu == MSP430_CPU_MSP430X_DEFAULT)
 		    warning (0,
-			     "Unrecognized MCU name %qs, assuming that it is "
-			     "just a MSP430X with no hardware multiply.\n"
-			     "Use the %<-mcpu%> and %<-mhwmult%> options to "
-			     "set these explicitly.",
+			     "unrecognized MCU name %qs, assuming that it is "
+			     "just a MSP430X with no hardware multiply; "
+			     "use the %<-mcpu%> and %<-mhwmult%> options to "
+			     "set these explicitly",
 			     target_mcu);
 		  else
 		    warning (0,
-			     "Unrecognized MCU name %qs, assuming that it "
-			     "has no hardware multiply.\nUse the %<-mhwmult%> "
-			     "option to set this explicitly.",
+			     "unrecognized MCU name %qs, assuming that it "
+			     "has no hardware multiply; use the %<-mhwmult%> "
+			     "option to set this explicitly",
 			     target_mcu);
 		}
 
@@ -241,9 +241,9 @@ msp430_option_override (void)
 	    {
 	      if (msp430_warn_mcu)
 		warning (0,
-			 "Unrecognized MCU name %qs, assuming that it just "
-			 "supports the MSP430X ISA.\nUse the %<-mcpu%> option "
-			 "to set the ISA explicitly.",
+			 "unrecognized MCU name %qs, assuming that it just "
+			 "supports the MSP430X ISA; use the %<-mcpu%> option "
+			 "to set the ISA explicitly",
 			 target_mcu);
 	    }
 	  else if (msp430_warn_mcu)
@@ -1901,7 +1901,7 @@ msp430_attr (tree * node,
 	    /* Allow the attribute to be added - the linker script
 	       being used may still recognise this value.  */
 	    warning (OPT_Wattributes,
-		     "numeric argument of %qE attribute must be in range 0..63",
+		     "numeric argument of %qE attribute must be in range [0-63]",
 		     name);
 	  break;
 
@@ -2744,7 +2744,7 @@ msp430_expand_delay_cycles (rtx arg)
 
   if (GET_CODE (arg) != CONST_INT)
     {
-      error ("__delay_cycles() only takes constant arguments");
+      error ("%<__delay_cycles()%> only takes constant arguments");
       return NULL_RTX;
     }
 
@@ -2754,7 +2754,7 @@ msp430_expand_delay_cycles (rtx arg)
     {
       if (c < 0)
 	{
-	  error ("__delay_cycles only takes non-negative cycle counts");
+	  error ("%<__delay_cycles%> only takes non-negative cycle counts");
 	  return NULL_RTX;
 	}
     }
@@ -2775,7 +2775,7 @@ msp430_expand_delay_cycles (rtx arg)
 	  c %= 4;
 	  if ((unsigned long long) i > 0xffffffffULL)
 	    {
-	      error ("__delay_cycles is limited to 32-bit loop counts");
+	      error ("%<__delay_cycles%> is limited to 32-bit loop counts");
 	      return NULL_RTX;
 	    }
 	}
@@ -2846,7 +2846,7 @@ msp430_expand_builtin (tree exp,
 
   if (! msp430_is_interrupt_func ())
     {
-      error ("MSP430 builtin functions only work inside interrupt handlers");
+      error ("MSP430 built-in functions only work inside interrupt handlers");
       return NULL_RTX;
     }
 
diff --git a/gcc/config/rs6000/aix73.h b/gcc/config/rs6000/aix73.h
index 8baa27e54c0..0b847900d3a 100644
--- a/gcc/config/rs6000/aix73.h
+++ b/gcc/config/rs6000/aix73.h
@@ -34,7 +34,7 @@ do {									\
     {									\
       rs6000_long_double_type_size = 64;				\
       if (OPTION_SET_P (rs6000_long_double_type_size))		\
-	warning (0, "soft-float and long-double-128 are incompatible");	\
+	warning (0, "%<soft-float%> and long-double-128 are incompatible");	\
     }									\
   if (TARGET_POWERPC64 && ! TARGET_64BIT)				\
     {									\
diff --git a/gcc/config/rs6000/rtems.h b/gcc/config/rs6000/rtems.h
index a6520aa363d..8aa41d5448d 100644
--- a/gcc/config/rs6000/rtems.h
+++ b/gcc/config/rs6000/rtems.h
@@ -82,7 +82,7 @@
 #define	RS6000_ABI_NAME "linux"
 
 /* Copy and paste from linux64.h and freebsd64.h */
-#define INVALID_64BIT "-m%s not supported in this configuration"
+#define INVALID_64BIT "%<-m%s%> not supported in this configuration"
 
 /* A lot of copy and paste from linux64.h and freebsd64.h */
 #undef	SUBSUBTARGET_OVERRIDE_OPTIONS
diff --git a/gcc/config/rx/rx.cc b/gcc/config/rx/rx.cc
index ba82482b664..7c3975e63dd 100644
--- a/gcc/config/rx/rx.cc
+++ b/gcc/config/rx/rx.cc
@@ -2477,7 +2477,7 @@ rx_expand_builtin_mvtc (tree exp)
 
   if (INTVAL (arg1) == 1)
     {
-      warning (0, "invalid control register for mvtc : %d - using 'psw'",
+      warning (0, "invalid control register for mvtc: %d - using 'psw'",
 	       (int) INTVAL (arg1));
       arg1 = const0_rtx;
     }
@@ -2602,7 +2602,7 @@ valid_psw_flag (rtx op, const char *which)
   error ("%<__builtin_rx_%s%> takes %<C%>, %<Z%>, %<S%>, %<O%>, %<I%>, "
 	 "or %<U%>", which);
   if (!mvtc_inform_done)
-    error ("use %<__builtin_rx_mvtc%> (0, ... ) to write arbitrary values to PSW");
+    error ("use %<__builtin_rx_mvtc (0, ... )%> to write arbitrary values to PSW");
   mvtc_inform_done = 1;
 
   return 0;
diff --git a/gcc/config/sh/sh.cc b/gcc/config/sh/sh.cc
index dd8bce4aa3b..8d4056338a5 100644
--- a/gcc/config/sh/sh.cc
+++ b/gcc/config/sh/sh.cc
@@ -728,7 +728,7 @@ parse_validate_atomic_model_option (const char* str)
 	  goto got_mode_name;
 	}
 
-    err_ret ("invalid atomic model name \"%s\"", tokens.front ().c_str ());
+    err_ret ("invalid atomic model name %qs", tokens.front ().c_str ());
 got_mode_name:;
   }
 
@@ -742,11 +742,11 @@ got_mode_name:;
 	  std::string offset_str = tokens[i].substr (strlen ("gbr-offset="));
 	  ret.tcb_gbr_offset = integral_argument (offset_str.c_str ());
 	  if (offset_str.empty () || ret.tcb_gbr_offset == -1)
-	    err_ret ("could not parse gbr-offset value \"%s\" in atomic model "
+	    err_ret ("could not parse gbr-offset value %qs in atomic model "
 		     "option", offset_str.c_str ());
 	}
       else
-	err_ret ("unknown parameter \"%s\" in atomic model option",
+	err_ret ("unknown parameter %qs in atomic model option",
 		 tokens[i].c_str ());
     }
 
diff --git a/gcc/config/stormy16/stormy16.cc b/gcc/config/stormy16/stormy16.cc
index 36fb97eb2e5..fabf09ab9a0 100644
--- a/gcc/config/stormy16/stormy16.cc
+++ b/gcc/config/stormy16/stormy16.cc
@@ -1212,7 +1212,7 @@ xstormy16_epilogue_uses (int regno)
 void
 xstormy16_function_profiler (void)
 {
-  sorry ("function_profiler support");
+  sorry ("%<function_profiler%> support");
 }
 
 /* Update CUM to advance past argument ARG.  Once this is done,
@@ -1306,7 +1306,7 @@ xstormy16_expand_builtin_va_start (tree valist, rtx nextarg ATTRIBUTE_UNUSED)
   tree t,u;
 
   if (xstormy16_interrupt_function_p ())
-    error ("cannot use va_start in interrupt function");
+    error ("cannot use %<va_start%> in interrupt function");
 
   f_base = TYPE_FIELDS (va_list_type_node);
   f_count = DECL_CHAIN (f_base);
@@ -2256,7 +2256,7 @@ xstormy16_handle_below100_attribute (tree *node,
     {
       if (! (TREE_PUBLIC (*node) || TREE_STATIC (*node)))
 	{
-	  warning (OPT_Wattributes, "__BELOW100__ attribute not allowed "
+	  warning (OPT_Wattributes, "%<__BELOW100__%> attribute not allowed "
 		   "with auto storage class");
 	  *no_add_attrs = true;
 	}