rs6000: Shut up -Wformat-diag somewhat
diff mbox series

Message ID 661337fc42ded9b92a300f5cdb69baf730d17cac.1563032153.git.segher@kernel.crashing.org
State New
Headers show
Series
  • rs6000: Shut up -Wformat-diag somewhat
Related show

Commit Message

Segher Boessenkool July 13, 2019, 3:53 p.m. UTC
We currently get lot of build warnings like
/home/segher/src/gcc/gcc/config/rs6000/rs6000-c.c:7039:12: warning: misspelled term 'builtin function' in format; use 'built-in function' instead [-Wformat-diag]
 7039 |    error ("builtin function %qs not supported in this compiler "
      |            ^~~~~~~~~~~~~~~~

That would print something like
  builtin function '__builtin_example' not supported in this compiler

Changing that to "built-in" as suggested only makes this worse.
Instead, let's just remove the whole "builtin function" phrase.

Tested on powerpc64-linux {-m32,-m64}; committing.


Segher


2019-07-13  Segher Boessenkool  <segher@kernel.crashing.org>

	PR target/91148
	* config/rs6000/rs6000.c (rs6000_invalid_builtin): Remove superfluous
	"builtin function" phrasing.

gcc/testsuite/
	* gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-extract-exp-1.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-extract-exp-4.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-extract-sig-1.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-extract-sig-4.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-1.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-10.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-4.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-7.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-test-data-class-11.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-test-data-class-6.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-test-data-class-7.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-test-neg-2.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-test-neg-3.c: Adjust.
	* gcc.target/powerpc/bfp/scalar-test-neg-5.c: Adjust.
	* gcc.target/powerpc/bfp/vec-extract-exp-2.c: Adjust.
	* gcc.target/powerpc/bfp/vec-extract-exp-3.c: Adjust.
	* gcc.target/powerpc/bfp/vec-extract-sig-2.c: Adjust.
	* gcc.target/powerpc/bfp/vec-extract-sig-3.c: Adjust.
	* gcc.target/powerpc/bfp/vec-insert-exp-2.c: Adjust.
	* gcc.target/powerpc/bfp/vec-insert-exp-3.c: Adjust.
	* gcc.target/powerpc/bfp/vec-insert-exp-6.c: Adjust.
	* gcc.target/powerpc/bfp/vec-insert-exp-7.c: Adjust.
	* gcc.target/powerpc/bfp/vec-test-data-class-2.c: Adjust.
	* gcc.target/powerpc/bfp/vec-test-data-class-3.c: Adjust.
	* gcc.target/powerpc/byte-in-either-range-1.c: Adjust.
	* gcc.target/powerpc/byte-in-range-1.c: Adjust.
	* gcc.target/powerpc/byte-in-set-1.c: Adjust.
	* gcc.target/powerpc/byte-in-set-2.c: Adjust.
	* gcc.target/powerpc/cmpb-3.c: Adjust.
	* gcc.target/powerpc/crypto-builtin-2.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-1.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-11.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-16.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-21.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-26.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-31.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-36.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-41.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-46.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-51.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-56.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-6.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-61.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-66.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-71.c: Adjust.
	* gcc.target/powerpc/dfp/dtstsfi-76.c: Adjust.
	* gcc.target/powerpc/vsu/vec-all-nez-7.c: Adjust.
	* gcc.target/powerpc/vsu/vec-any-eqz-7.c: Adjust.
	* gcc.target/powerpc/vsu/vec-cmpnez-7.c: Adjust.
	* gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c: Adjust.
	* gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c: Adjust.
	* gcc.target/powerpc/vsu/vec-xl-len-12.c: Adjust.
	* gcc.target/powerpc/vsu/vec-xl-len-13.c: Adjust.
	* gcc.target/powerpc/vsu/vec-xlx-7.c: Adjust.
	* gcc.target/powerpc/vsu/vec-xrx-7.c: Adjust.
	* gcc.target/powerpc/vsu/vec-xst-len-12.c: Adjust.
	* gcc.target/powerpc/vsu/vec-xst-len-13.c: Adjust.

---
 gcc/config/rs6000/rs6000.c                         | 53 +++++++++-------------
 .../gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c   |  2 +-
 .../powerpc/bfp/scalar-cmp-exp-unordered-2.c       |  2 +-
 .../gcc.target/powerpc/bfp/scalar-extract-exp-1.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-extract-exp-2.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-extract-exp-4.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-extract-sig-1.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-extract-sig-2.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-extract-sig-4.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-1.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-10.c  |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-2.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-4.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-5.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-7.c   |  2 +-
 .../gcc.target/powerpc/bfp/scalar-insert-exp-8.c   |  2 +-
 .../powerpc/bfp/scalar-test-data-class-11.c        |  2 +-
 .../powerpc/bfp/scalar-test-data-class-6.c         |  2 +-
 .../powerpc/bfp/scalar-test-data-class-7.c         |  2 +-
 .../gcc.target/powerpc/bfp/scalar-test-neg-2.c     |  2 +-
 .../gcc.target/powerpc/bfp/scalar-test-neg-3.c     |  2 +-
 .../gcc.target/powerpc/bfp/scalar-test-neg-5.c     |  2 +-
 .../gcc.target/powerpc/bfp/vec-extract-exp-2.c     |  2 +-
 .../gcc.target/powerpc/bfp/vec-extract-exp-3.c     |  2 +-
 .../gcc.target/powerpc/bfp/vec-extract-sig-2.c     |  2 +-
 .../gcc.target/powerpc/bfp/vec-extract-sig-3.c     |  2 +-
 .../gcc.target/powerpc/bfp/vec-insert-exp-2.c      |  2 +-
 .../gcc.target/powerpc/bfp/vec-insert-exp-3.c      |  2 +-
 .../gcc.target/powerpc/bfp/vec-insert-exp-6.c      |  2 +-
 .../gcc.target/powerpc/bfp/vec-insert-exp-7.c      |  2 +-
 .../gcc.target/powerpc/bfp/vec-test-data-class-2.c |  2 +-
 .../gcc.target/powerpc/bfp/vec-test-data-class-3.c |  2 +-
 .../gcc.target/powerpc/byte-in-either-range-1.c    |  2 +-
 gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c |  2 +-
 gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c   |  2 +-
 gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c   |  2 +-
 gcc/testsuite/gcc.target/powerpc/cmpb-3.c          |  2 +-
 .../gcc.target/powerpc/crypto-builtin-2.c          | 14 +++---
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c   |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c   |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c  |  2 +-
 .../gcc.target/powerpc/vsu/vec-all-nez-7.c         |  2 +-
 .../gcc.target/powerpc/vsu/vec-any-eqz-7.c         |  2 +-
 .../gcc.target/powerpc/vsu/vec-cmpnez-7.c          |  2 +-
 .../gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c      |  2 +-
 .../gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c      |  2 +-
 .../gcc.target/powerpc/vsu/vec-xl-len-12.c         |  2 +-
 .../gcc.target/powerpc/vsu/vec-xl-len-13.c         |  2 +-
 gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c   |  2 +-
 gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c   |  2 +-
 .../gcc.target/powerpc/vsu/vec-xst-len-12.c        |  2 +-
 .../gcc.target/powerpc/vsu/vec-xst-len-13.c        |  2 +-
 67 files changed, 94 insertions(+), 103 deletions(-)

Comments

Richard Sandiford July 13, 2019, 4:26 p.m. UTC | #1
Segher Boessenkool <segher@kernel.crashing.org> writes:
> We currently get lot of build warnings like
> /home/segher/src/gcc/gcc/config/rs6000/rs6000-c.c:7039:12: warning: misspelled term 'builtin function' in format; use 'built-in function' instead [-Wformat-diag]
>  7039 |    error ("builtin function %qs not supported in this compiler "
>       |            ^~~~~~~~~~~~~~~~
>
> That would print something like
>   builtin function '__builtin_example' not supported in this compiler
>
> Changing that to "built-in" as suggested only makes this worse.
> Instead, let's just remove the whole "builtin function" phrase.
>
> Tested on powerpc64-linux {-m32,-m64}; committing.
>
>
> Segher
>
>
> 2019-07-13  Segher Boessenkool  <segher@kernel.crashing.org>
>
> 	PR target/91148
> 	* config/rs6000/rs6000.c (rs6000_invalid_builtin): Remove superfluous
> 	"builtin function" phrasing.

Sounded from the above like there was supposed to be a rs6000-c.c
change as well.  Just saying because IMO "X not supported..." seems
unnecessarily awkward compared to...

> diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
> index 65df8d6..e199748 100644
> --- a/gcc/config/rs6000/rs6000.c
> +++ b/gcc/config/rs6000/rs6000.c
> @@ -14744,62 +14744,53 @@ rs6000_invalid_builtin (enum rs6000_builtins fncode)
>  
>    gcc_assert (name != NULL);
>    if ((fnmask & RS6000_BTM_CELL) != 0)
> -    error ("builtin function %qs is only valid for the cell processor", name);
> +    error ("%qs is only valid for the cell processor", name);
>    else if ((fnmask & RS6000_BTM_VSX) != 0)
> -    error ("builtin function %qs requires the %qs option", name, "-mvsx");
> +    error ("%qs requires the %qs option", name, "-mvsx");
>    else if ((fnmask & RS6000_BTM_HTM) != 0)
> -    error ("builtin function %qs requires the %qs option", name, "-mhtm");
> +    error ("%qs requires the %qs option", name, "-mhtm");
>    else if ((fnmask & RS6000_BTM_ALTIVEC) != 0)
> -    error ("builtin function %qs requires the %qs option", name, "-maltivec");
> +    error ("%qs requires the %qs option", name, "-maltivec");
>    else if ((fnmask & (RS6000_BTM_DFP | RS6000_BTM_P8_VECTOR))
>  	   == (RS6000_BTM_DFP | RS6000_BTM_P8_VECTOR))
> -    error ("builtin function %qs requires the %qs and %qs options",
> -	   name, "-mhard-dfp", "-mpower8-vector");
> -  else if ((fnmask & RS6000_BTM_DFP) != 0)
> -    error ("builtin function %qs requires the %qs option", name, "-mhard-dfp");
> -  else if ((fnmask & RS6000_BTM_P8_VECTOR) != 0)
> -    error ("builtin function %qs requires the %qs option", name,
> +    error ("%qs requires the %qs and %qs options", name, "-mhard-dfp",
>  	   "-mpower8-vector");
> +  else if ((fnmask & RS6000_BTM_DFP) != 0)
> +    error ("%qs requires the %qs option", name, "-mhard-dfp");
> +  else if ((fnmask & RS6000_BTM_P8_VECTOR) != 0)
> +    error ("%qs requires the %qs option", name, "-mpower8-vector");
>    else if ((fnmask & (RS6000_BTM_P9_VECTOR | RS6000_BTM_64BIT))
>  	   == (RS6000_BTM_P9_VECTOR | RS6000_BTM_64BIT))
> -    error ("builtin function %qs requires the %qs and %qs options",
> -	   name, "-mcpu=power9", "-m64");
> +    error ("%qs requires the %qs and %qs options", name, "-mcpu=power9",
> +	   "-m64");
>    else if ((fnmask & RS6000_BTM_P9_VECTOR) != 0)
> -    error ("builtin function %qs requires the %qs option", name,
> -	   "-mcpu=power9");
> +    error ("%qs requires the %qs option", name, "-mcpu=power9");
>    else if ((fnmask & (RS6000_BTM_P9_MISC | RS6000_BTM_64BIT))
>  	   == (RS6000_BTM_P9_MISC | RS6000_BTM_64BIT))
> -    error ("builtin function %qs requires the %qs and %qs options",
> -	   name, "-mcpu=power9", "-m64");
> +    error ("%qs requires the %qs and %qs options", name, "-mcpu=power9",
> +	   "-m64");
>    else if ((fnmask & RS6000_BTM_P9_MISC) == RS6000_BTM_P9_MISC)
> -    error ("builtin function %qs requires the %qs option", name,
> -	   "-mcpu=power9");
> +    error ("%qs requires the %qs option", name, "-mcpu=power9");
>    else if ((fnmask & RS6000_BTM_LDBL128) == RS6000_BTM_LDBL128)
>      {
>        if (!TARGET_HARD_FLOAT)
> -	error ("builtin function %qs requires the %qs option", name,
> -	       "-mhard-float");
> +	error ("%qs requires the %qs option", name, "-mhard-float");
>        else
> -	error ("builtin function %qs requires the %qs option", name,
> +	error ("%qs requires the %qs option", name,
>  	       TARGET_IEEEQUAD ? "-mabi=ibmlongdouble" : "-mlong-double-128");
>      }
>    else if ((fnmask & RS6000_BTM_HARD_FLOAT) != 0)
> -    error ("builtin function %qs requires the %qs option", name,
> -	   "-mhard-float");
> +    error ("%qs requires the %qs option", name, "-mhard-float");
>    else if ((fnmask & RS6000_BTM_FLOAT128_HW) != 0)
> -    error ("builtin function %qs requires ISA 3.0 IEEE 128-bit floating point",
> -	   name);
> +    error ("%qs requires ISA 3.0 IEEE 128-bit floating point", name);
>    else if ((fnmask & RS6000_BTM_FLOAT128) != 0)
> -    error ("builtin function %qs requires the %qs option", name,
> -	   "%<-mfloat128%>");
> +    error ("%qs requires the %qs option", name, "%<-mfloat128%>");
>    else if ((fnmask & (RS6000_BTM_POPCNTD | RS6000_BTM_POWERPC64))
>  	   == (RS6000_BTM_POPCNTD | RS6000_BTM_POWERPC64))
> -    error ("builtin function %qs requires the %qs (or newer), and "
> -	   "%qs or %qs options",
> +    error ("%qs requires the %qs (or newer), and %qs or %qs options",
>  	   name, "-mcpu=power7", "-m64", "-mpowerpc64");
>    else
> -    error ("builtin function %qs is not supported with the current options",
> -	   name);
> +    error ("%qs is not supported with the current options", name);
>  }

...these, which all have verbs and read nicely.

Sorry for indulging a pet peeve. :-)

Thanks,
Richard
Segher Boessenkool July 13, 2019, 5:52 p.m. UTC | #2
On Sat, Jul 13, 2019 at 05:26:04PM +0100, Richard Sandiford wrote:
> Segher Boessenkool <segher@kernel.crashing.org> writes:
> > We currently get lot of build warnings like
> > /home/segher/src/gcc/gcc/config/rs6000/rs6000-c.c:7039:12: warning: misspelled term 'builtin function' in format; use 'built-in function' instead [-Wformat-diag]
> >  7039 |    error ("builtin function %qs not supported in this compiler "
> >       |            ^~~~~~~~~~~~~~~~
> >
> > That would print something like
> >   builtin function '__builtin_example' not supported in this compiler
> >
> > Changing that to "built-in" as suggested only makes this worse.
> > Instead, let's just remove the whole "builtin function" phrase.

> Sounded from the above like there was supposed to be a rs6000-c.c
> change as well.  Just saying because IMO "X not supported..." seems
> unnecessarily awkward compared to...

This patch only handles this one block, to shut up the majority of the
warnings in PR91148.  It doesn't attempt to handle everything, not even
all those where the warning is pedantic but valid.

The torrent of useless warnings is hampering more important work.

But yes I'll fix that rs6000-c.c one, I like verbs as well :-)


Segher

Patch
diff mbox series

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 65df8d6..e199748 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -14744,62 +14744,53 @@  rs6000_invalid_builtin (enum rs6000_builtins fncode)
 
   gcc_assert (name != NULL);
   if ((fnmask & RS6000_BTM_CELL) != 0)
-    error ("builtin function %qs is only valid for the cell processor", name);
+    error ("%qs is only valid for the cell processor", name);
   else if ((fnmask & RS6000_BTM_VSX) != 0)
-    error ("builtin function %qs requires the %qs option", name, "-mvsx");
+    error ("%qs requires the %qs option", name, "-mvsx");
   else if ((fnmask & RS6000_BTM_HTM) != 0)
-    error ("builtin function %qs requires the %qs option", name, "-mhtm");
+    error ("%qs requires the %qs option", name, "-mhtm");
   else if ((fnmask & RS6000_BTM_ALTIVEC) != 0)
-    error ("builtin function %qs requires the %qs option", name, "-maltivec");
+    error ("%qs requires the %qs option", name, "-maltivec");
   else if ((fnmask & (RS6000_BTM_DFP | RS6000_BTM_P8_VECTOR))
 	   == (RS6000_BTM_DFP | RS6000_BTM_P8_VECTOR))
-    error ("builtin function %qs requires the %qs and %qs options",
-	   name, "-mhard-dfp", "-mpower8-vector");
-  else if ((fnmask & RS6000_BTM_DFP) != 0)
-    error ("builtin function %qs requires the %qs option", name, "-mhard-dfp");
-  else if ((fnmask & RS6000_BTM_P8_VECTOR) != 0)
-    error ("builtin function %qs requires the %qs option", name,
+    error ("%qs requires the %qs and %qs options", name, "-mhard-dfp",
 	   "-mpower8-vector");
+  else if ((fnmask & RS6000_BTM_DFP) != 0)
+    error ("%qs requires the %qs option", name, "-mhard-dfp");
+  else if ((fnmask & RS6000_BTM_P8_VECTOR) != 0)
+    error ("%qs requires the %qs option", name, "-mpower8-vector");
   else if ((fnmask & (RS6000_BTM_P9_VECTOR | RS6000_BTM_64BIT))
 	   == (RS6000_BTM_P9_VECTOR | RS6000_BTM_64BIT))
-    error ("builtin function %qs requires the %qs and %qs options",
-	   name, "-mcpu=power9", "-m64");
+    error ("%qs requires the %qs and %qs options", name, "-mcpu=power9",
+	   "-m64");
   else if ((fnmask & RS6000_BTM_P9_VECTOR) != 0)
-    error ("builtin function %qs requires the %qs option", name,
-	   "-mcpu=power9");
+    error ("%qs requires the %qs option", name, "-mcpu=power9");
   else if ((fnmask & (RS6000_BTM_P9_MISC | RS6000_BTM_64BIT))
 	   == (RS6000_BTM_P9_MISC | RS6000_BTM_64BIT))
-    error ("builtin function %qs requires the %qs and %qs options",
-	   name, "-mcpu=power9", "-m64");
+    error ("%qs requires the %qs and %qs options", name, "-mcpu=power9",
+	   "-m64");
   else if ((fnmask & RS6000_BTM_P9_MISC) == RS6000_BTM_P9_MISC)
-    error ("builtin function %qs requires the %qs option", name,
-	   "-mcpu=power9");
+    error ("%qs requires the %qs option", name, "-mcpu=power9");
   else if ((fnmask & RS6000_BTM_LDBL128) == RS6000_BTM_LDBL128)
     {
       if (!TARGET_HARD_FLOAT)
-	error ("builtin function %qs requires the %qs option", name,
-	       "-mhard-float");
+	error ("%qs requires the %qs option", name, "-mhard-float");
       else
-	error ("builtin function %qs requires the %qs option", name,
+	error ("%qs requires the %qs option", name,
 	       TARGET_IEEEQUAD ? "-mabi=ibmlongdouble" : "-mlong-double-128");
     }
   else if ((fnmask & RS6000_BTM_HARD_FLOAT) != 0)
-    error ("builtin function %qs requires the %qs option", name,
-	   "-mhard-float");
+    error ("%qs requires the %qs option", name, "-mhard-float");
   else if ((fnmask & RS6000_BTM_FLOAT128_HW) != 0)
-    error ("builtin function %qs requires ISA 3.0 IEEE 128-bit floating point",
-	   name);
+    error ("%qs requires ISA 3.0 IEEE 128-bit floating point", name);
   else if ((fnmask & RS6000_BTM_FLOAT128) != 0)
-    error ("builtin function %qs requires the %qs option", name,
-	   "%<-mfloat128%>");
+    error ("%qs requires the %qs option", name, "%<-mfloat128%>");
   else if ((fnmask & (RS6000_BTM_POPCNTD | RS6000_BTM_POWERPC64))
 	   == (RS6000_BTM_POPCNTD | RS6000_BTM_POWERPC64))
-    error ("builtin function %qs requires the %qs (or newer), and "
-	   "%qs or %qs options",
+    error ("%qs requires the %qs (or newer), and %qs or %qs options",
 	   name, "-mcpu=power7", "-m64", "-mpowerpc64");
   else
-    error ("builtin function %qs is not supported with the current options",
-	   name);
+    error ("%qs is not supported with the current options", name);
 }
 
 /* Target hook for early folding of built-ins, shamelessly stolen
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
index 6d713d2..604dbbc 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-eq-2.c
@@ -11,5 +11,5 @@  compare_exponents_eq (double *exponent1_p, double *exponent2_p)
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_eq (exponent1, exponent2);	/* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_eq' requires" } */
+  return __builtin_vec_scalar_cmp_exp_eq (exponent1, exponent2);	/* { dg-error "'__builtin_vsx_scalar_cmp_exp_dp_eq' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
index f3d8f04..2f01b87 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-gt-2.c
@@ -11,5 +11,5 @@  compare_exponents_gt (double *exponent1_p, double *exponent2_p)
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_gt (exponent1, exponent2); /* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_gt' requires" } */
+  return __builtin_vec_scalar_cmp_exp_gt (exponent1, exponent2); /* { dg-error "'__builtin_vsx_scalar_cmp_exp_dp_gt' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
index 0dd210a..75969c2 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-lt-2.c
@@ -11,5 +11,5 @@  compare_exponents_lt (double *exponent1_p, double *exponent2_p)
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_lt (exponent1, exponent2);	/* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_lt' requires" } */
+  return __builtin_vec_scalar_cmp_exp_lt (exponent1, exponent2);	/* { dg-error "'__builtin_vsx_scalar_cmp_exp_dp_lt' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
index 6987991..f59b4a3 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-cmp-exp-unordered-2.c
@@ -11,5 +11,5 @@  compare_exponents_unordered (double *exponent1_p, double *exponent2_p)
   double exponent1 = *exponent1_p;
   double exponent2 = *exponent2_p;
 
-  return __builtin_vec_scalar_cmp_exp_unordered (exponent1, exponent2);	/* { dg-error "builtin function '__builtin_vsx_scalar_cmp_exp_dp_unordered' requires" } */
+  return __builtin_vec_scalar_cmp_exp_unordered (exponent1, exponent2);	/* { dg-error "'__builtin_vsx_scalar_cmp_exp_dp_unordered' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c
index d77d84c..9737762 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-1.c
@@ -11,7 +11,7 @@  get_exponent (double *p)
 {
   double source = *p;
 
-  return __builtin_vec_scalar_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_extract_exp' requires" } */
+  return __builtin_vec_scalar_extract_exp (source); /* { dg-error "'__builtin_vsx_scalar_extract_exp' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c
index 3f4d97b..b04462f 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c
@@ -14,7 +14,7 @@  get_exponent (double *p)
 {
   double source = *p;
 
-  return scalar_extract_exp (source);	/* { dg-error "builtin function '__builtin_vec_scalar_extract_exp' not supported in this compiler configuration" } */
+  return scalar_extract_exp (source);	/* { dg-error "'__builtin_vec_scalar_extract_exp' not supported in this compiler configuration" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c
index b3d4910..850ff62 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-4.c
@@ -11,7 +11,7 @@  get_exponent (__ieee128 *p)
 {
   __ieee128 source = *p;
 
-  return __builtin_vec_scalar_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_extract_expq' requires" } */
+  return __builtin_vec_scalar_extract_exp (source); /* { dg-error "'__builtin_vsx_scalar_extract_expq' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c
index b87e6d46..f12eed3 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-1.c
@@ -11,5 +11,5 @@  get_significand (double *p)
 {
   double source = *p;
 
-  return __builtin_vec_scalar_extract_sig (source);	/* { dg-error "builtin function '__builtin_vsx_scalar_extract_sig' requires" } */
+  return __builtin_vec_scalar_extract_sig (source);	/* { dg-error "'__builtin_vsx_scalar_extract_sig' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c
index 4a9819c..c912879 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c
@@ -12,5 +12,5 @@  get_significand (double *p)
 {
   double source = *p;
 
-  return __builtin_vec_scalar_extract_sig (source); /* { dg-error "builtin function '__builtin_vec_scalar_extract_sig' not supported in this compiler configuration" } */
+  return __builtin_vec_scalar_extract_sig (source); /* { dg-error "'__builtin_vec_scalar_extract_sig' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c
index cf8f14c..32a53c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-4.c
@@ -11,5 +11,5 @@  get_significand (__ieee128 *p)
 {
   __ieee128 source = *p;
 
-  return __builtin_vec_scalar_extract_sig (source);	/* { dg-error "builtin function '__builtin_vsx_scalar_extract_sigq' requires" } */
+  return __builtin_vec_scalar_extract_sig (source);	/* { dg-error "'__builtin_vsx_scalar_extract_sigq' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c
index a913899..8260b10 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-1.c
@@ -13,5 +13,5 @@  insert_exponent (unsigned long long int *significand_p,
   unsigned long long int significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp' requires" } */
+  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vsx_scalar_insert_exp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c
index 196a6f6..769d3b0 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-10.c
@@ -13,5 +13,5 @@  insert_exponent (__ieee128 *significand_p,
   __ieee128 significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp_qp' requires" } */
+  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vsx_scalar_insert_exp_qp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c
index 9cab364..af27099 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c
@@ -16,5 +16,5 @@  insert_exponent (unsigned long long int *significand_p,
   unsigned long long int significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c
index a248703..1699c67 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-4.c
@@ -13,5 +13,5 @@  insert_exponent (double *significand_p,
   double significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp_dp' requires" } */
+  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vsx_scalar_insert_exp_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c
index a6605b9..05b98d9 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c
@@ -16,5 +16,5 @@  insert_exponent (double *significand_p,
   double significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c
index 3f6a3ff..2e03e15 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-7.c
@@ -13,5 +13,5 @@  insert_exponent (unsigned __int128 *significand_p,
   unsigned __int128 significand = *significand_p;
   unsigned long long int exponent = *exponent_p;
 
-  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vsx_scalar_insert_exp_q' requires" } */
+  return __builtin_vec_scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vsx_scalar_insert_exp_q' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c
index 2bb4f5e..d1a0a8b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c
@@ -16,5 +16,5 @@  insert_exponent (unsigned __int128 *significand_p, /* { dg-error "'__int128' is
   unsigned __int128 significand = *significand_p;  /* { dg-error "'__int128' is not supported on this target" } */
   unsigned long long int exponent = *exponent_p;
 
-  return scalar_insert_exp (significand, exponent); /* { dg-error "builtin function '__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error "'__builtin_vec_scalar_insert_exp' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c
index 1ed3fd2..7c6fca2 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-11.c
@@ -10,5 +10,5 @@  test_data_class (__ieee128 *p)
 {
   __ieee128 source = *p;
 
-  return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function '__builtin_vsx_scalar_test_data_class_qp' requires" } */
+  return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "'__builtin_vsx_scalar_test_data_class_qp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c
index 9fae5ff..7fb6601 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-6.c
@@ -10,5 +10,5 @@  test_data_class (double *p)
 {
   double source = *p;
 
-  return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function '__builtin_vsx_scalar_test_data_class_dp' requires" } */
+  return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "'__builtin_vsx_scalar_test_data_class_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c
index f3e8a20..02e9ec5 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-data-class-7.c
@@ -10,5 +10,5 @@  test_data_class (float *p)
 {
   float source = *p;
 
-  return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "builtin function '__builtin_vsx_scalar_test_data_class_sp' requires" } */
+  return __builtin_vec_scalar_test_data_class (source, 3); /* { dg-error "'__builtin_vsx_scalar_test_data_class_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c
index 6bdf1d6..7d2b4de 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-2.c
@@ -10,5 +10,5 @@  test_neg (float *p)
 {
   float source = *p;
 
-  return __builtin_vec_scalar_test_neg_sp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_test_neg_sp' requires" } */
+  return __builtin_vec_scalar_test_neg_sp (source); /* { dg-error "'__builtin_vsx_scalar_test_neg_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c
index 681b3d7..b503dfa 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-3.c
@@ -10,5 +10,5 @@  test_neg (double *p)
 {
   double source = *p;
 
-  return __builtin_vec_scalar_test_neg_dp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_test_neg_dp' requires" } */
+  return __builtin_vec_scalar_test_neg_dp (source); /* { dg-error "'__builtin_vsx_scalar_test_neg_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c
index b234ab9..bab8604 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/scalar-test-neg-5.c
@@ -10,5 +10,5 @@  test_neg (__ieee128 *p)
 {
   __ieee128 source = *p;
 
-  return __builtin_vec_scalar_test_neg_qp (source); /* { dg-error "builtin function '__builtin_vsx_scalar_test_neg_qp' requires" } */
+  return __builtin_vec_scalar_test_neg_qp (source); /* { dg-error "'__builtin_vsx_scalar_test_neg_qp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c
index e27e053..86d0260 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-2.c
@@ -9,5 +9,5 @@  get_exponents (__vector double *p)
 {
   __vector double source = *p;
 
-  return __builtin_vec_extract_exp (source); /* { dg-error "builtin function '__builtin_vsx_extract_exp_dp' requires" } */
+  return __builtin_vec_extract_exp (source); /* { dg-error "'__builtin_vsx_extract_exp_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c
index c2d48f8..e909a26 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-exp-3.c
@@ -9,5 +9,5 @@  get_exponents (__vector float *p)
 {
   __vector float source = *p;
 
-  return __builtin_vec_extract_exp (source);	/* { dg-error "builtin function '__builtin_vsx_extract_exp_sp' requires" } */
+  return __builtin_vec_extract_exp (source);	/* { dg-error "'__builtin_vsx_extract_exp_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c
index 0ef4b3c..eab6673 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-2.c
@@ -9,5 +9,5 @@  get_significands (__vector double *p)
 {
   __vector double source = *p;
 
-  return __builtin_vec_extract_sig (source);	/* { dg-error "builtin function '__builtin_vsx_extract_sig_dp' requires" } */
+  return __builtin_vec_extract_sig (source);	/* { dg-error "'__builtin_vsx_extract_sig_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c
index 4727fc3..ab1967b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-extract-sig-3.c
@@ -9,5 +9,5 @@  get_significands (__vector float *p)
 {
   __vector float source = *p;
 
-  return __builtin_vec_extract_sig (source);	/* { dg-error "builtin function '__builtin_vsx_extract_sig_sp' requires" } */
+  return __builtin_vec_extract_sig (source);	/* { dg-error "'__builtin_vsx_extract_sig_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c
index 4f33fd2..6aa6b40 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-2.c
@@ -11,5 +11,5 @@  make_floats (__vector unsigned int *significands_p,
   __vector unsigned int significands = *significands_p;
   __vector unsigned int exponents = *exponents_p;
 
-  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_sp' requires" } */
+  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "'__builtin_vsx_insert_exp_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c
index 097f0da..ab4c2f1 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-3.c
@@ -11,5 +11,5 @@  make_doubles (__vector unsigned long long int *significands_p,
   __vector unsigned long long int significands = *significands_p;
   __vector unsigned long long int exponents = *exponents_p;
 
-  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_dp' requires" } */
+  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "'__builtin_vsx_insert_exp_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c
index 01595cd..70ed82b 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-6.c
@@ -11,5 +11,5 @@  make_floats (__vector float *significands_p,
   __vector float significands = *significands_p;
   __vector unsigned int exponents = *exponents_p;
 
-  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_sp' requires" } */
+  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "'__builtin_vsx_insert_exp_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c
index 3401630..eb5dda4 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-insert-exp-7.c
@@ -11,5 +11,5 @@  make_doubles (__vector double *significands_p,
   __vector double significands = *significands_p;
   __vector unsigned long long int exponents = *exponents_p;
 
-  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "builtin function '__builtin_vsx_insert_exp_dp' requires" } */
+  return __builtin_vec_insert_exp (significands, exponents); /* { dg-error "'__builtin_vsx_insert_exp_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c
index 1ade5fb..f53efdc 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-2.c
@@ -9,5 +9,5 @@  get_data_class_flags (__vector double *p)
 {
   __vector double source = *p;
 
-  return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "builtin function '__builtin_vsx_test_data_class_dp' requires" } */
+  return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "'__builtin_vsx_test_data_class_dp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c
index a4f804e..5ec7019 100644
--- a/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/bfp/vec-test-data-class-3.c
@@ -9,5 +9,5 @@  get_data_class_flags (__vector float *p)
 {
   __vector float source = *p;
 
-  return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "builtin function '__builtin_vsx_test_data_class_sp' requires" } */
+  return __builtin_vec_test_data_class (source, 0x37); /* { dg-error "'__builtin_vsx_test_data_class_sp' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c b/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c
index 6e11285..e67fb66 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-either-range-1.c
@@ -17,5 +17,5 @@  test_byte_in_either_range (unsigned char b,
   range_encoding = ((first_hi_bound << 24) | (first_lo_bound << 16)
 		    | (second_hi_bound << 8) | second_lo_bound);
 
-  return __builtin_byte_in_either_range (b, range_encoding); /* { dg-error "builtin function '__builtin_scalar_byte_in_either_range' requires" } */
+  return __builtin_byte_in_either_range (b, range_encoding); /* { dg-error "'__builtin_scalar_byte_in_either_range' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c b/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c
index bd4a9d3..4f4ad8f 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-range-1.c
@@ -10,6 +10,6 @@  test_byte_in_range (unsigned char b,
 		    unsigned char low_range, unsigned char high_range)
 {
   unsigned int range_encoding = (high_range << 8) | low_range;
-  return __builtin_byte_in_range (b, range_encoding); /* { dg-error "builtin function '__builtin_scalar_byte_in_range' requires" } */
+  return __builtin_byte_in_range (b, range_encoding); /* { dg-error "'__builtin_scalar_byte_in_range' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c b/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c
index 3d3247a..a369dc1 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-set-1.c
@@ -9,5 +9,5 @@ 
 int
 test_byte_in_set (unsigned char b, unsigned long long set_members)
 {
-  return __builtin_byte_in_set (b, set_members); /* { dg-error "builtin function '__builtin_scalar_byte_in_set' requires" } */
+  return __builtin_byte_in_set (b, set_members); /* { dg-error "'__builtin_scalar_byte_in_set' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c b/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c
index a858841..a741010 100644
--- a/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c
@@ -11,5 +11,5 @@ 
 int
 test_byte_in_set (unsigned char b, unsigned long long set_members)
 {
-  return __builtin_byte_in_set (b, set_members); /* { dg-error "builtin function '__builtin_byte_in_set' not supported in this compiler configuration" } */
+  return __builtin_byte_in_set (b, set_members); /* { dg-error "'__builtin_byte_in_set' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/cmpb-3.c b/gcc/testsuite/gcc.target/powerpc/cmpb-3.c
index 70de475..0fa8eb1 100644
--- a/gcc/testsuite/gcc.target/powerpc/cmpb-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/cmpb-3.c
@@ -8,7 +8,7 @@  void abort ();
 long long int
 do_compare (long long int a, long long int b)
 {
-  return __builtin_cmpb (a, b);	/* { dg-error "builtin function '__builtin_cmpb' not supported in this compiler configuration" } */
+  return __builtin_cmpb (a, b);	/* { dg-error "'__builtin_cmpb' not supported in this compiler configuration" } */
 }
 
 void expect (long long int pattern, long long int value)
diff --git a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c
index a3389ff..4066b12 100644
--- a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-2.c
@@ -5,21 +5,21 @@ 
 
 void use_builtins_d (__vector unsigned long long *p, __vector unsigned long long *q, __vector unsigned long long *r, __vector unsigned long long *s)
 {
-  p[0] = __builtin_crypto_vcipher (q[0], r[0]); /* { dg-error "builtin function '__builtin_crypto_vcipher' is not supported with the current options" } */
-  p[1] = __builtin_crypto_vcipherlast (q[1], r[1]); /* { dg-error "builtin function '__builtin_crypto_vcipherlast' is not supported with the current options" } */
-  p[2] = __builtin_crypto_vncipher (q[2], r[2]); /* { dg-error "builtin function '__builtin_crypto_vncipher' is not supported with the current options" } */
-  p[3] = __builtin_crypto_vncipherlast (q[3], r[3]); /* { dg-error "builtin function '__builtin_crypto_vncipherlast' is not supported with the current options" } */
+  p[0] = __builtin_crypto_vcipher (q[0], r[0]); /* { dg-error "'__builtin_crypto_vcipher' is not supported with the current options" } */
+  p[1] = __builtin_crypto_vcipherlast (q[1], r[1]); /* { dg-error "'__builtin_crypto_vcipherlast' is not supported with the current options" } */
+  p[2] = __builtin_crypto_vncipher (q[2], r[2]); /* { dg-error "'__builtin_crypto_vncipher' is not supported with the current options" } */
+  p[3] = __builtin_crypto_vncipherlast (q[3], r[3]); /* { dg-error "'__builtin_crypto_vncipherlast' is not supported with the current options" } */
   p[4] = __builtin_crypto_vpermxor (q[4], r[4], s[4]);
   p[5] = __builtin_crypto_vpmsumd (q[5], r[5]);
-  p[6] = __builtin_crypto_vshasigmad (q[6], 1, 15); /* { dg-error "builtin function '__builtin_crypto_vshasigmad' is not supported with the current options" } */
-  p[7] = __builtin_crypto_vsbox (q[7]); /* { dg-error "builtin function '__builtin_crypto_vsbox' is not supported with the current options" } */
+  p[6] = __builtin_crypto_vshasigmad (q[6], 1, 15); /* { dg-error "'__builtin_crypto_vshasigmad' is not supported with the current options" } */
+  p[7] = __builtin_crypto_vsbox (q[7]); /* { dg-error "'__builtin_crypto_vsbox' is not supported with the current options" } */
 }
 
 void use_builtins_w (__vector unsigned int *p, __vector unsigned int *q, __vector unsigned int *r, __vector unsigned int *s)
 {
   p[0] = __builtin_crypto_vpermxor (q[0], r[0], s[0]);
   p[1] = __builtin_crypto_vpmsumw (q[1], r[1]);
-  p[2] = __builtin_crypto_vshasigmaw (q[2], 1, 15); /* { dg-error "builtin function '__builtin_crypto_vshasigmaw' is not supported with the current options" } */
+  p[2] = __builtin_crypto_vshasigmaw (q[2], 1, 15); /* { dg-error "'__builtin_crypto_vshasigmaw' is not supported with the current options" } */
 }
 
 void use_builtins_h (__vector unsigned short *p, __vector unsigned short *q, __vector unsigned short *r, __vector unsigned short *s)
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c
index 62e2f7f..e660b74 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-1.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_lt_dd' requires" } */
+  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "'__builtin_dtstsfi_lt_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
index bdbf85c..92145f0 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_dd (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_lt_dd' requires" } */
+  return __builtin_dfp_dtstsfi_lt_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_lt_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
index a2f4c4f..62dc52d 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_td (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_lt_td' requires" } */
+  return __builtin_dfp_dtstsfi_lt_td (5, source);	/* { dg-error "'__builtin_dtstsfi_lt_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c
index a881b71..a8e435b 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-21.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_gt_dd' requires" } */
+  return __builtin_dfp_dtstsfi_gt (5, source);	/* { dg-error "'__builtin_dtstsfi_gt_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c
index d69a094..40790f4 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-26.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_gt_td' requires" } */
+  return __builtin_dfp_dtstsfi_gt (5, source);	/* { dg-error "'__builtin_dtstsfi_gt_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
index d921b8f..a7f3908 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_dd (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_gt_dd' requires" } */
+  return __builtin_dfp_dtstsfi_gt_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_gt_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
index 046c78b..1b48867 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_td (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_gt_td' requires" } */
+  return __builtin_dfp_dtstsfi_gt_td (5, source);	/* { dg-error "'__builtin_dtstsfi_gt_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c
index 7460c0c..640e6c8 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-41.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_eq_dd' requires" } */
+  return __builtin_dfp_dtstsfi_eq (5, source);	/* { dg-error "'__builtin_dtstsfi_eq_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c
index 2072f11..6557a63 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-46.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_eq_td' requires" } */
+  return __builtin_dfp_dtstsfi_eq (5, source);	/* { dg-error "'__builtin_dtstsfi_eq_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
index cf0b4ad..801c8c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_dd (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_eq_dd' requires" } */
+  return __builtin_dfp_dtstsfi_eq_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_eq_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
index cac7c4d..589adeb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_td (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_eq_td' requires" } */
+  return __builtin_dfp_dtstsfi_eq_td (5, source);	/* { dg-error "'__builtin_dtstsfi_eq_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c
index dfa8039..873ad9f 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-6.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_lt_td' requires" } */
+  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "'__builtin_dtstsfi_lt_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c
index ad7aced..3b2867c 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-61.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_ov_dd' requires" } */
+  return __builtin_dfp_dtstsfi_ov (5, source);	/* { dg-error "'__builtin_dtstsfi_ov_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c
index ee9b56a..2b6d30a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-66.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_ov_td' requires" } */
+  return __builtin_dfp_dtstsfi_ov (5, source);	/* { dg-error "'__builtin_dtstsfi_ov_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
index bcdac7a..8fe0b6a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
@@ -9,6 +9,6 @@  int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_dd (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_ov_dd' requires" } */
+  return __builtin_dfp_dtstsfi_ov_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_ov_dd' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
index a618067..dccc388 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
@@ -9,7 +9,7 @@  int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_td (5, source);	/* { dg-error "builtin function '__builtin_dtstsfi_ov_td' requires" } */
+  return __builtin_dfp_dtstsfi_ov_td (5, source);	/* { dg-error "'__builtin_dtstsfi_ov_td' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c
index 980893f..c2b237e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c
@@ -11,5 +11,5 @@  test_all_not_equal_and_not_zero (vector unsigned short *arg1_p,
   vector unsigned short arg_1 = *arg1_p;
   vector unsigned short arg_2 = *arg2_p;
 
-  return __builtin_vec_vcmpnez_p (__CR6_LT, arg_1, arg_2);	/* { dg-error "builtin function '__builtin_vec_vcmpnez_p' not supported in this compiler configuration" } */
+  return __builtin_vec_vcmpnez_p (__CR6_LT, arg_1, arg_2);	/* { dg-error "'__builtin_vec_vcmpnez_p' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c
index 9fdbd5f..afd3526 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c
@@ -10,5 +10,5 @@  test_any_equal (vector unsigned int *arg1_p, vector unsigned int *arg2_p)
   vector unsigned int arg_1 = *arg1_p;
   vector unsigned int arg_2 = *arg2_p;
 
-  return __builtin_vec_vcmpnez_p (__CR6_LT_REV, arg_1, arg_2);	/* { dg-error "builtin function '__builtin_vec_vcmpnez_p' not supported in this compiler configuration" } */
+  return __builtin_vec_vcmpnez_p (__CR6_LT_REV, arg_1, arg_2);	/* { dg-error "'__builtin_vec_vcmpnez_p' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c
index bc906f7..811b32f1 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-cmpnez-7.c
@@ -10,5 +10,5 @@  fetch_data (vector unsigned int *arg1_p, vector unsigned int *arg2_p)
   vector unsigned int arg_1 = *arg1_p;
   vector unsigned int arg_2 = *arg2_p;
 
-  return __builtin_vec_vcmpnez (arg_1, arg_2);	/* { dg-error "builtin function '__builtin_altivec_vcmpnezw' requires the '-mcpu=power9' option" } */
+  return __builtin_vec_vcmpnez (arg_1, arg_2);	/* { dg-error "'__builtin_altivec_vcmpnezw' requires the '-mcpu=power9' option" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c
index 3364354..6ee066d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-cntlz-lsbb-2.c
@@ -9,5 +9,5 @@  count_leading_zero_byte_bits (vector unsigned char *arg1_p)
 {
   vector unsigned char arg_1 = *arg1_p;
 
-  return __builtin_vec_vclzlsbb (arg_1);	/* { dg-error "builtin function '__builtin_altivec_vclzlsbb_v16qi' requires the '-mcpu=power9' option" } */
+  return __builtin_vec_vclzlsbb (arg_1);	/* { dg-error "'__builtin_altivec_vclzlsbb_v16qi' requires the '-mcpu=power9' option" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c
index dfad174..ecd0add 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-cnttz-lsbb-2.c
@@ -9,5 +9,5 @@  count_trailing_zero_byte_bits (vector unsigned char *arg1_p)
 {
   vector unsigned char arg_1 = *arg1_p;
 
-  return __builtin_vec_vctzlsbb (arg_1);	/* { dg-error "builtin function '__builtin_altivec_vctzlsbb_v16qi' requires the '-mcpu=power9' option" } */
+  return __builtin_vec_vctzlsbb (arg_1);	/* { dg-error "'__builtin_altivec_vctzlsbb_v16qi' requires the '-mcpu=power9' option" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c
index 96a04d2..92b0d0dd 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-12.c
@@ -11,5 +11,5 @@ 
 __vector float
 fetch_data (float *address, size_t length)
 {
-  return __builtin_vec_lxvl (address, length); /* { dg-error "builtin function '__builtin_vsx_lxvl' requires" } */
+  return __builtin_vec_lxvl (address, length); /* { dg-error "'__builtin_vsx_lxvl' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c
index 04f213a9..4808c4d 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c
@@ -13,5 +13,5 @@ 
 __vector float
 fetch_data (float *address, size_t length)
 {
-  return __builtin_vec_lxvl (address, length);	/* { dg-error "builtin function '__builtin_vec_lxvl' not supported in this compiler configuration" } */
+  return __builtin_vec_lxvl (address, length);	/* { dg-error "'__builtin_vec_lxvl' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c
index 25cd01c..c6f7b5c 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xlx-7.c
@@ -10,5 +10,5 @@  fetch_data (unsigned int offset, vector signed int *datap)
 {
   vector signed int data = *datap;
 
-  return __builtin_vec_vextulx (offset, data);	/* { dg-error "builtin function '__builtin_altivec_vextuwlx' requires" } */
+  return __builtin_vec_vextulx (offset, data);	/* { dg-error "'__builtin_altivec_vextuwlx' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c
index 3a27213..fd6b5be 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xrx-7.c
@@ -10,5 +10,5 @@  fetch_data (unsigned short offset, vector signed short *datap)
 {
   vector signed short data = *datap;
 
-  return __builtin_vec_vexturx (offset, data);	/* { dg-error "builtin function '__builtin_altivec_vextuhrx' requires" } */
+  return __builtin_vec_vexturx (offset, data);	/* { dg-error "'__builtin_altivec_vextuhrx' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c
index 992d7b5..0a0b0cb 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c
@@ -13,5 +13,5 @@  store_data (vector double *datap, double *address, size_t length)
 {
   vector double data = *datap;
 
-  __builtin_vec_stxvl (data, address, length); /* { dg-error "builtin function '__builtin_vec_stxvl' not supported in this compiler configuration" } */
+  __builtin_vec_stxvl (data, address, length); /* { dg-error "'__builtin_vec_stxvl' not supported in this compiler configuration" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c
index 37b20b0..2a6a7da 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-13.c
@@ -14,5 +14,5 @@  store_data (vector double *datap, double *address, size_t length)
 {
   vector double data = *datap;
 
-  __builtin_vec_stxvl (data, address, length); /* { dg-error "builtin function '__builtin_altivec_stxvl' requires" } */
+  __builtin_vec_stxvl (data, address, length); /* { dg-error "'__builtin_altivec_stxvl' requires" } */
 }