2019-07-14  Segher Boessenkool  <seg...@kernel.crashing.org>

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

gcc/testsuite/
        * gcc.target/powerpc/bfp/scalar-extract-exp-2.c: Adjust.
        * gcc.target/powerpc/bfp/scalar-extract-sig-2.c: Adjust.
        * gcc.target/powerpc/bfp/scalar-insert-exp-2.c: Adjust.
        * gcc.target/powerpc/bfp/scalar-insert-exp-5.c: Adjust.
        * gcc.target/powerpc/bfp/scalar-insert-exp-8.c: Adjust.
        * gcc.target/powerpc/byte-in-set-2.c: Adjust.
        * gcc.target/powerpc/cmpb-3.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-xl-len-13.c: Adjust.
        * gcc.target/powerpc/vsu/vec-xst-len-12.c: Adjust.

---
 gcc/config/rs6000/rs6000-c.c                                | 3 +--
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-exp-2.c | 2 +-
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-extract-sig-2.c | 2 +-
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-2.c  | 2 +-
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-5.c  | 2 +-
 gcc/testsuite/gcc.target/powerpc/bfp/scalar-insert-exp-8.c  | 2 +-
 gcc/testsuite/gcc.target/powerpc/byte-in-set-2.c            | 2 +-
 gcc/testsuite/gcc.target/powerpc/cmpb-3.c                   | 2 +-
 gcc/testsuite/gcc.target/powerpc/vsu/vec-all-nez-7.c        | 2 +-
 gcc/testsuite/gcc.target/powerpc/vsu/vec-any-eqz-7.c        | 2 +-
 gcc/testsuite/gcc.target/powerpc/vsu/vec-xl-len-13.c        | 2 +-
 gcc/testsuite/gcc.target/powerpc/vsu/vec-xst-len-12.c       | 2 +-
 12 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 7854082..7f0cdc7 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -7036,8 +7036,7 @@ altivec_resolve_overloaded_builtin (location_t loc, tree 
fndecl,
                    name, internal_name);
          }
        else
-         error ("builtin function %qs not supported in this compiler "
-                "configuration", name);
+         error ("%qs is not supported in this compiler configuration", name);
        /* If an error-representing  result tree was returned from
           altivec_build_resolved_builtin above, use it.  */
        return (result != NULL) ? result : error_mark_node;
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 b04462f..9221806 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_vec_scalar_extract_exp' not supported in this compiler 
configuration" } */
+  return scalar_extract_exp (source);  /* { dg-error 
"'__builtin_vec_scalar_extract_exp' is not supported in this compiler 
configuration" } */
 }
 
 
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 c912879..e24d4bd 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_vec_scalar_extract_sig' not supported in this compiler 
configuration" } */
+  return __builtin_vec_scalar_extract_sig (source); /* { dg-error 
"'__builtin_vec_scalar_extract_sig' is not supported in this compiler 
configuration" } */
 }
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 af27099..feb9431 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_vec_scalar_insert_exp' not supported in this compiler 
configuration" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error 
"'__builtin_vec_scalar_insert_exp' is not supported in this compiler 
configuration" } */
 }
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 05b98d9..0e5683d 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_vec_scalar_insert_exp' not supported in this compiler 
configuration" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error 
"'__builtin_vec_scalar_insert_exp' is not supported in this compiler 
configuration" } */
 }
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 d1a0a8b..bd68f77 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_vec_scalar_insert_exp' not supported in this compiler 
configuration" } */
+  return scalar_insert_exp (significand, exponent); /* { dg-error 
"'__builtin_vec_scalar_insert_exp' is not supported in this compiler 
configuration" } */
 }
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 a741010..9a80c27 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_byte_in_set' not supported in this compiler configuration" } */
+  return __builtin_byte_in_set (b, set_members); /* { dg-error 
"'__builtin_byte_in_set' is 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 0fa8eb1..de111a8 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_cmpb' not 
supported in this compiler configuration" } */
+  return __builtin_cmpb (a, b);        /* { dg-error "'__builtin_cmpb' is not 
supported in this compiler configuration" } */
 }
 
 void expect (long long int pattern, long long int value)
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 c2b237e..0f9badd 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_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' is 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 afd3526..c69dfa6 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_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' is not supported in this compiler configuration" } */
 }
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 4808c4d..9de6424 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_vec_lxvl' not supported in this compiler configuration" } */
+  return __builtin_vec_lxvl (address, length); /* { dg-error 
"'__builtin_vec_lxvl' is not supported in this compiler configuration" } */
 }
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 0a0b0cb..3a51132 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_vec_stxvl' not supported in this compiler configuration" } */
+  __builtin_vec_stxvl (data, address, length); /* { dg-error 
"'__builtin_vec_stxvl' is not supported in this compiler configuration" } */
 }
-- 
1.8.3.1

Reply via email to