[gcc(refs/users/wschmidt/heads/builtins4)] rs6000: More bug fixes

[William Schmidt <wschmidt@gcc.gnu.org>]

https://gcc.gnu.org/g:7ff8854fbeca0344663b584452d7505ecf7a9a30

commit 7ff8854fbeca0344663b584452d7505ecf7a9a30
Author: Bill Schmidt <wschmidt@linux.ibm.com>
Date:   Thu Jan 7 12:17:54 2021 -0600

    rs6000: More bug fixes
    
    2021-01-07  Bill Schmidt  <wschmidt@linux.ibm.com>
    
    gcc/
            * config/rs6000/rs6000-builtin-new.def
            * config/rs6000-overload.def
    
    gcc/testsuite/
            * gcc.target/powerpc/altivec-10.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/dfp/dtstsfi-10.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-11.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-12.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-13.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-14.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-15.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-16.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-17.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-18.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-19.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-30.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-31.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-32.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-33.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-34.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-35.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-36.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-37.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-38.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-39.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-50.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-51.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-52.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-53.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-54.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-55.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-56.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-57.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-58.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-59.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-70.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-71.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-72.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-73.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-74.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-75.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-76.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-77.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-78.c: Adjust.
            * gcc.target/powerpc/dfp/dtstsfi-79.c: Adjust.

Diff:
---
 gcc/config/rs6000/rs6000-builtin-new.def           | 26 ++++++++---------
 gcc/config/rs6000/rs6000-overload.def              | 34 +++++++++++-----------
 gcc/testsuite/gcc.target/powerpc/altivec-10.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/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c  |  2 +-
 gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c  |  2 +-
 46 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/gcc/config/rs6000/rs6000-builtin-new.def b/gcc/config/rs6000/rs6000-builtin-new.def
index 8b54b17e1ce..2c1eabd4fde 100644
--- a/gcc/config/rs6000/rs6000-builtin-new.def
+++ b/gcc/config/rs6000/rs6000-builtin-new.def
@@ -2734,10 +2734,10 @@
   const signed int __builtin_vsx_scalar_cmp_exp_dp_unordered (double, double);
     VSCEDPUO xscmpexpdp_unordered {}
 
-  const unsigned int __builtin_vsx_scalar_test_data_class_dp (double, signed int);
+  const unsigned int __builtin_vsx_scalar_test_data_class_dp (double, const int<7>);
     VSTDCDP xststdcdp {}
 
-  const unsigned int __builtin_vsx_scalar_test_data_class_sp (float, signed int);
+  const unsigned int __builtin_vsx_scalar_test_data_class_sp (float, const int<7>);
     VSTDCSP xststdcsp {}
 
   const unsigned int __builtin_vsx_scalar_test_neg_dp (double);
@@ -2746,10 +2746,10 @@
   const unsigned int __builtin_vsx_scalar_test_neg_sp (float);
     VSTDCNSP xststdcnegsp {}
 
-  const vbll __builtin_vsx_test_data_class_dp (vd, signed int);
+  const vbll __builtin_vsx_test_data_class_dp (vd, const int<7>);
     VTDCDP xvtstdcdp {}
 
-  const vbi __builtin_vsx_test_data_class_sp (vf, signed int);
+  const vbi __builtin_vsx_test_data_class_sp (vf, const int<7>);
     VTDCSP xvtstdcsp {}
 
   const vf __builtin_vsx_vextract_fp_from_shorth (vus);
@@ -2794,28 +2794,28 @@
   double __builtin_mffsl ();
     MFFSL rs6000_mffsl {}
 
-  const signed int __builtin_dtstsfi_eq_dd (unsigned int, _Decimal64);
+  const signed int __builtin_dtstsfi_eq_dd (const int<6>, _Decimal64);
     TSTSFI_EQ_DD dfptstsfi_eq_dd {}
 
-  const signed int __builtin_dtstsfi_eq_td (unsigned int, _Decimal128);
+  const signed int __builtin_dtstsfi_eq_td (const int<6>, _Decimal128);
     TSTSFI_EQ_TD dfptstsfi_eq_td {}
 
-  const signed int __builtin_dtstsfi_gt_dd (unsigned int, _Decimal64);
+  const signed int __builtin_dtstsfi_gt_dd (const int<6>, _Decimal64);
     TSTSFI_GT_DD dfptstsfi_gt_dd {}
 
-  const signed int __builtin_dtstsfi_gt_td (unsigned int, _Decimal128);
+  const signed int __builtin_dtstsfi_gt_td (const int<6>, _Decimal128);
     TSTSFI_GT_TD dfptstsfi_gt_td {}
 
-  const signed int __builtin_dtstsfi_lt_dd (unsigned int, _Decimal64);
+  const signed int __builtin_dtstsfi_lt_dd (const int<6>, _Decimal64);
     TSTSFI_LT_DD dfptstsfi_lt_dd {}
 
-  const signed int __builtin_dtstsfi_lt_td (unsigned int, _Decimal128);
+  const signed int __builtin_dtstsfi_lt_td (const int<6>, _Decimal128);
     TSTSFI_LT_TD dfptstsfi_lt_td {}
 
-  const signed int __builtin_dtstsfi_ov_dd (unsigned int, _Decimal64);
+  const signed int __builtin_dtstsfi_ov_dd (const int<6>, _Decimal64);
     TSTSFI_OV_DD dfptstsfi_unordered_dd {}
 
-  const signed int __builtin_dtstsfi_ov_td (unsigned int, _Decimal128);
+  const signed int __builtin_dtstsfi_ov_td (const int<6>, _Decimal128);
     TSTSFI_OV_TD dfptstsfi_unordered_td {}
 
 
@@ -2905,7 +2905,7 @@
   const _Float128 __builtin_vsx_scalar_insert_exp_qp (_Float128, unsigned long long);
     VSIEQPF xsiexpqpf_kf {}
 
-  const unsigned int __builtin_vsx_scalar_test_data_class_qp (_Float128, signed int);
+  const unsigned int __builtin_vsx_scalar_test_data_class_qp (_Float128, const int<7>);
     VSTDCQP xststdcqp_kf {}
 
   const unsigned int __builtin_vsx_scalar_test_neg_qp (_Float128);
diff --git a/gcc/config/rs6000/rs6000-overload.def b/gcc/config/rs6000/rs6000-overload.def
index 60a18a79416..45e95ea3063 100644
--- a/gcc/config/rs6000/rs6000-overload.def
+++ b/gcc/config/rs6000/rs6000-overload.def
@@ -3548,27 +3548,27 @@
     XVRDPIZ
 
 [VEC_TSTSFI_GT, SKIP, __builtin_dfp_dtstsfi_gt]
-  signed int __builtin_dfp_dtstsfi_gt (unsigned int, _Decimal64);
+  signed int __builtin_dfp_dtstsfi_gt (const int, _Decimal64);
     TSTSFI_GT_DD
-  signed int __builtin_dfp_dtstsfi_gt (unsigned int, _Decimal128);
+  signed int __builtin_dfp_dtstsfi_gt (const int, _Decimal128);
     TSTSFI_GT_TD
 
 [VEC_TSTSFI_EQ, SKIP, __builtin_dfp_dtstsfi_eq]
-  signed int __builtin_dfp_dtstsfi_eq (unsigned int, _Decimal64);
+  signed int __builtin_dfp_dtstsfi_eq (const int, _Decimal64);
     TSTSFI_EQ_DD
-  signed int __builtin_dfp_dtstsfi_eq (unsigned int, _Decimal128);
+  signed int __builtin_dfp_dtstsfi_eq (const int, _Decimal128);
     TSTSFI_EQ_TD
 
 [VEC_TSTSFI_LT, SKIP, __builtin_dfp_dtstsfi_lt]
-  signed int __builtin_dfp_dtstsfi_lt (unsigned int, _Decimal64);
+  signed int __builtin_dfp_dtstsfi_lt (const int, _Decimal64);
     TSTSFI_LT_DD
-  signed int __builtin_dfp_dtstsfi_lt (unsigned int, _Decimal128);
+  signed int __builtin_dfp_dtstsfi_lt (const int, _Decimal128);
     TSTSFI_LT_TD
 
 [VEC_TSTSFI_OV, SKIP, __builtin_dfp_dtstsfi_ov]
-  signed int __builtin_dfp_dtstsfi_ov (unsigned int, _Decimal64);
+  signed int __builtin_dfp_dtstsfi_ov (const int, _Decimal64);
     TSTSFI_OV_DD
-  signed int __builtin_dfp_dtstsfi_ov (unsigned int, _Decimal128);
+  signed int __builtin_dfp_dtstsfi_ov (const int, _Decimal128);
     TSTSFI_OV_TD
 
 [VEC_UNPACKH, vec_unpackh, __builtin_vec_unpackh]
@@ -3637,7 +3637,7 @@
   vull __builtin_vec_extract_sig (vd);
     VESDP
 
-[VEC_VIE, vec_insert_exp, __builtin_vec_insert_exp, ARCH_PWR9]
+[VEC_VIE, vec_insert_exp, __builtin_vec_insert_exp, _ARCH_PWR9]
   vf __builtin_vec_insert_exp (vf, vui);
     VIESP  VIESP_VF
   vf __builtin_vec_insert_exp (vui, vui);
@@ -3694,25 +3694,25 @@
     VSIEQPF
 
 [VEC_VSTDC, scalar_test_data_class, __builtin_vec_scalar_test_data_class, _ARCH_PWR9]
-  bool __builtin_vec_scalar_test_data_class (float, signed int);
+  unsigned int __builtin_vec_scalar_test_data_class (float, const int);
     VSTDCSP
-  bool __builtin_vec_scalar_test_data_class (double, signed int);
+  unsigned int __builtin_vec_scalar_test_data_class (double, const int);
     VSTDCDP
-  bool __builtin_vec_scalar_test_data_class (_Float128, signed int);
+  unsigned int __builtin_vec_scalar_test_data_class (_Float128, const int);
     VSTDCQP
 
 [VEC_VSTDCN, scalar_test_neg, __builtin_vec_scalar_test_neg, _ARCH_PWR9]
-  bool __builtin_vec_scalar_test_neg (float);
+  unsigned int __builtin_vec_scalar_test_neg (float);
     VSTDCNSP
-  bool __builtin_vec_scalar_test_neg (double);
+  unsigned int __builtin_vec_scalar_test_neg (double);
     VSTDCNDP
-  bool __builtin_vec_scalar_test_neg (_Float128);
+  unsigned int __builtin_vec_scalar_test_neg (_Float128);
     VSTDCNQP
 
 [VEC_VTDC, vec_test_data_class, __builtin_vec_test_data_class, _ARCH_PWR9]
-  vbi __builtin_vec_test_data_class (vf, signed int);
+  vbi __builtin_vec_test_data_class (vf, const int);
     VTDCSP
-  vbll __builtin_vec_test_data_class (vd, signed int);
+  vbll __builtin_vec_test_data_class (vd, const int);
     VTDCDP
 
 [VEC_XL, vec_xl, __builtin_vec_vsx_ld, __VSX__]
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-10.c b/gcc/testsuite/gcc.target/powerpc/altivec-10.c
index f532eebbfab..e12b88a165b 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-10.c
@@ -61,7 +61,7 @@ check_cmple()
   vector float a = {1.0, 2.0, 3.0, 4.0};
   vector float b = {1.0, 3.0, 2.0, 5.0};
   vector bool int aux;
-  vector signed int le = {-1, -1, 0, -1};
+  vector bool int le = (vector bool int){-1, -1, 0, -1};
 
   aux = vec_cmple (a, b);
 
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 7d2b4deefc3..7a1e8e8bd30 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_vsx_scalar_test_neg_sp' requires" } */
+  return __builtin_vec_scalar_test_neg (source); /* { dg-error "'__builtin_vsx_scalar_test_neg' 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 b503dfa8b56..c9b90927693 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_vsx_scalar_test_neg_dp' requires" } */
+  return __builtin_vec_scalar_test_neg (source); /* { dg-error "'__builtin_vsx_scalar_test_neg' 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 bab86040a7b..e70eb2d46f8 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_vsx_scalar_test_neg_qp' requires" } */
+  return __builtin_vec_scalar_test_neg (source); /* { dg-error "'__builtin_vsx_scalar_test_neg' requires" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
index 822030bf737..4f7562b9c38 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_dd (5, source);
+  return __builtin_dfp_dtstsfi_lt (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
index 044e7683cf1..c56a24e0db4 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_lt_dd' requires" } */
+  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "'__builtin_dtstsfi_lt' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
index 350b4c10205..4b72fa8edc3 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_dd (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_lt (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
index cc54c6b265e..af07fbb4a01 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_lt_dd (63, source))
+  if (__builtin_dfp_dtstsfi_lt (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
index 011d20039d0..6397aae3e56 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p, unsigned int significance)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_dd (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_lt (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
index 54d2557fa2f..6f57baf0150 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_td (5, source);
+  return __builtin_dfp_dtstsfi_lt (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfiq" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
index 8626c579a25..c6a42f089e0 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_td (5, source);	/* { dg-error "'__builtin_dtstsfi_lt_td' requires" } */
+  return __builtin_dfp_dtstsfi_lt (5, source);	/* { dg-error "'__builtin_dtstsfi_lt' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
index 28033dbac18..ea934ea4652 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_td (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_lt (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
index 8ce9390feaf..28bc10c3145 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_lt_td (63, source))
+  if (__builtin_dfp_dtstsfi_lt (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
index 092b9c0f7c5..b2073f56b05 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
@@ -8,5 +8,5 @@ int doTestBCDSignificance (_Decimal128 *p, unsigned int significance)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_td (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_lt (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
index 6d8869e5435..ee098bcb999 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_dd (5, source);
+  return __builtin_dfp_dtstsfi_gt (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
index 439fcb2a548..5d9d5d61b42 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_gt_dd' requires" } */
+  return __builtin_dfp_dtstsfi_gt (5, source);	/* { dg-error "'__builtin_dtstsfi_gt' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
index d24f3982ee9..15d7a352fdf 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_dd (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_gt (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
index 6d978a09750..236f39393e0 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_gt_dd (63, source))
+  if (__builtin_dfp_dtstsfi_gt (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
index b6620c51f2a..f6ed00a73dd 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p, unsigned int significance)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_dd (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_gt (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
index fdafaf9ceb8..1390c8381f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_td (5, source);
+  return __builtin_dfp_dtstsfi_gt (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfiq" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
index 822f6d57003..ca5e0098411 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_td (5, source);	/* { dg-error "'__builtin_dtstsfi_gt_td' requires" } */
+  return __builtin_dfp_dtstsfi_gt (5, source);	/* { dg-error "'__builtin_dtstsfi_gt' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
index dc4c8ecdd00..8e3954d6b93 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_td (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_gt (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
index fce744cd916..a2b922955f6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_gt_td (63, source))
+  if (__builtin_dfp_dtstsfi_gt (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
index 1aee9efe919..f6c0ede46cc 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
@@ -8,5 +8,5 @@ int doTestBCDSignificance (_Decimal128 *p, unsigned int significance)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_td (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_gt (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
index 25b35ed4bc9..4663fc653bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_dd (5, source);
+  return __builtin_dfp_dtstsfi_eq (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
index e6b5fe5469e..5e4f4964aaa 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_eq_dd' requires" } */
+  return __builtin_dfp_dtstsfi_eq (5, source);	/* { dg-error "'__builtin_dtstsfi_eq' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
index c9431b5ea1a..fc6b3568d09 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_dd (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_eq (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
index d11f497b137..9c194374187 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_eq_dd (63, source))
+  if (__builtin_dfp_dtstsfi_eq (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
index 2fdb58f6748..b896865e6bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p, unsigned int significance)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_dd (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_eq (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
index 912ae7f3492..5c6fcc4ec83 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_td (5, source);
+  return __builtin_dfp_dtstsfi_eq (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfiq" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
index 218d2f64d3e..02ff47441e5 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_td (5, source);	/* { dg-error "'__builtin_dtstsfi_eq_td' requires" } */
+  return __builtin_dfp_dtstsfi_eq (5, source);	/* { dg-error "'__builtin_dtstsfi_eq' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
index 275bf8d0ac2..edfac68b0e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_td (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_eq (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
index 0626d87d9be..9a94371da35 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_eq_td (63, source))
+  if (__builtin_dfp_dtstsfi_eq (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
index e1da3d810ef..e7b50dc108e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
@@ -8,5 +8,5 @@ int doTestBCDSignificance (_Decimal128 *p, unsigned int significance)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_td (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_eq (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
index 875354c9ab8..c584d988b4b 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_dd (5, source);
+  return __builtin_dfp_dtstsfi_ov (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfi" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
index 68758cf535a..6c64021a479 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_dd (5, source);	/* { dg-error "'__builtin_dtstsfi_ov_dd' requires" } */
+  return __builtin_dfp_dtstsfi_ov (5, source);	/* { dg-error "'__builtin_dtstsfi_ov' requires" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
index 725cc5432b9..44aaab201f9 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_dd (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_ov (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
index f368c38204b..e7d2a27ecfd 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_ov_dd (63, source))
+  if (__builtin_dfp_dtstsfi_ov (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
index c6ffd51d9f4..fb3331162c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
@@ -8,6 +8,6 @@ int doTestBCDSignificance (_Decimal64 *p, unsigned int significance)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_dd (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_ov (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
index 910fb7d98c8..7c75265de08 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
@@ -9,7 +9,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_td (5, source);
+  return __builtin_dfp_dtstsfi_ov (5, source);
 }
 
 /* { dg-final { scan-assembler	   "dtstsfiq" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
index d867a987df8..982ed5d79df 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_td (5, source);	/* { dg-error "'__builtin_dtstsfi_ov_td' requires" } */
+  return __builtin_dfp_dtstsfi_ov (5, source);	/* { dg-error "'__builtin_dtstsfi_ov' requires" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
index d279bfb5751..59471cfb645 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_td (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_ov (65, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
index 3034300f72b..1bda795b55a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
@@ -8,7 +8,7 @@ int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_ov_td (63, source))
+  if (__builtin_dfp_dtstsfi_ov (63, source))
     return 3;
   else
     return 5;
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
index b88b5a86bcb..c9e1721b3d6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
@@ -8,5 +8,5 @@ int doTestBCDSignificance (_Decimal128 *p, unsigned int significance)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_td (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
+  return __builtin_dfp_dtstsfi_ov (significance, source);	/* { dg-error "argument 1 must be a 6-bit unsigned literal" } */
 }