[gcc(refs/users/marxin/heads/Wformat-diag-targets)] Fix -Wformat-diag for rs6000 target.

[Martin Liska <marxin@gcc.gnu.org>]

https://gcc.gnu.org/g:60b6f60c15c60e89538b46ecef68a456c652b99d

commit 60b6f60c15c60e89538b46ecef68a456c652b99d
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Jan 12 09:43:28 2022 +0100

    Fix -Wformat-diag for rs6000 target.
    
    gcc/ChangeLog:
    
            * config/rs6000/rs6000-call.c (rs6000_invalid_builtin): Wrap
            keywords and use %qs instead of %<%s%>.
            (rs6000_expand_builtin): Likewise.
    
    gcc/testsuite/ChangeLog:
    
            * gcc.target/powerpc/bfp/scalar-extract-exp-5.c: Adjust scans in
            testcases.
            * gcc.target/powerpc/bfp/scalar-extract-sig-5.c: Likewise.
            * gcc.target/powerpc/bfp/scalar-insert-exp-11.c: Likewise.

Diff:
---
 gcc/config/rs6000/rs6000-call.c                             | 8 ++++----
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c | 2 +-
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c | 2 +-
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c
index c78b8b08c40..becdad73812 100644
--- a/gcc/config/rs6000/rs6000-call.c
+++ b/gcc/config/rs6000/rs6000-call.c
@@ -3307,7 +3307,7 @@ rs6000_invalid_builtin (enum rs6000_gen_builtins fncode)
 	     "-mvsx");
       break;
     case ENB_IEEE128_HW:
-      error ("%qs requires ISA 3.0 IEEE 128-bit floating point", name);
+      error ("%qs requires ISA 3.0 IEEE 128-bit floating-point", name);
       break;
     case ENB_DFP:
       error ("%qs requires the %qs option", name, "-mhard-dfp");
@@ -5589,20 +5589,20 @@ rs6000_expand_builtin (tree exp, rtx target, rtx /* subtarget */,
   if (bif_is_nosoft (*bifaddr)
       && rs6000_isa_flags & OPTION_MASK_SOFT_FLOAT)
     {
-      error ("%<%s%> not supported with %<-msoft-float%>",
+      error ("%qs not supported with %<-msoft-float%>",
 	     bifaddr->bifname);
       return const0_rtx;
     }
 
   if (bif_is_no32bit (*bifaddr) && TARGET_32BIT)
     {
-      error ("%<%s%> is not supported in 32-bit mode", bifaddr->bifname);
+      error ("%qs is not supported in 32-bit mode", bifaddr->bifname);
       return const0_rtx;
     }
 
   if (bif_is_ibmld (*bifaddr) && !FLOAT128_2REG_P (TFmode))
     {
-      error ("%<%s%> requires %<long double%> to be IBM 128-bit format",
+      error ("%qs requires %<long double%> to be IBM 128-bit format",
 	     bifaddr->bifname);
       return const0_rtx;
     }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c
index 34184812dc5..1225613b275 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-5.c
@@ -14,7 +14,7 @@ get_exponent (__ieee128 *p)
 {
   __ieee128 source = *p;
 
-  return scalar_extract_exp (source);	/* { dg-error "requires ISA 3.0 IEEE 128-bit floating point" } */
+  return scalar_extract_exp (source);	/* { dg-error "requires ISA 3.0 IEEE 128-bit floating-point" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c
index 13c64fc3acf..adf0e4f99df 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-5.c
@@ -12,5 +12,5 @@ get_significand (__ieee128 *p)
 {
   __ieee128 source = *p;
 
-  return (long long int) __builtin_vec_scalar_extract_sig (source); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating point" } */
+  return (long long int) __builtin_vec_scalar_extract_sig (source); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating-point" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c
index a5dd852e60f..6787a67950b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-11.c
@@ -16,5 +16,5 @@ insert_exponent (__ieee128 *significand_p,
   __ieee128 significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return scalar_insert_exp (significand, exponent); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating point" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error "requires ISA 3.0 IEEE 128-bit floating-point" } */
 }