diff mbox series

[rs6000] Deprecate unnecessary __builtin_dfp_dtstsfi_*_dd and td overloads

Message ID f4664463a99d4986fafb8c266f6167a6616f5a21.camel@vnet.ibm.com
State New
Headers show
Series [rs6000] Deprecate unnecessary __builtin_dfp_dtstsfi_*_dd and td overloads | expand

Commit Message

will schmidt Jan. 21, 2021, 11:49 p.m. UTC
[PATCH, rs6000] Deprecate unnecessary __builtin_dfp_dtstsfi_*_dd and td overloads

Hi,
  Noted as part of the work-in-progress builtins rewrite, the
__builtin_dfp_dtstsfi_*_{dd,td} builtins are redundant, and are thusly
being marked as deprecated.  They will be removed as part of the builtins
rewrite sometime in the future.
This includes the builtins __builtin_dfp_dtstsfi_eq_dd,
__builtin_dfp_dtstsfi_gt_dd, __builtin_dfp_dtstsfi_lt_dd,
__builtin_dfp_dtstsfi_ov_dd, __builtin_dfp_dtstsfi_eq_td,
__builtin_dfp_dtstsfi_gt_td, __builtin_dfp_dtstsfi_lt_td,
and __builtin_dfp_dtstsfi_ov_td.

Regtests underway.

OK for trunk?

Thanks
-Will

--

gcc/ChangeLog:
	* config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin):
	Mark builtins P9_BUILTIN_DFP_TSTSFI_LT_DD, P9_BUILTIN_DFP_TSTSFI_EQ_DD
	P9_BUILTIN_DFP_TSTSFI_GT_DD, P9_BUILTIN_DFP_TSTSFI_OV_DD,
	P9_BUILTIN_DFP_TSTSFI_LT_TD, P9_BUILTIN_DFP_TSTSFI_EQ_TD,
	P9_BUILTIN_DFP_TSTSFI_GT_TD, P9_BUILTIN_DFP_TSTSFI_OV_TD as deprecated.
	* doc/extend.texi: Update examples to indicate deprecated functions.

testsuite/ChangeLog:
	* gcc.target/powerpc/dfp/dtstsfi-10.c: Mark __builtin_dfp_dtstsfi_*_{dd,td}
	calls as deprecated.
	* gcc.target/powerpc/dfp/dtstsfi-11.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-12.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-13.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-14.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-15.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-16.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-17.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-18.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-19.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-30.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-31.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-32.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-33.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-34.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-35.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-36.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-37.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-38.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-39.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-50.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-51.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-52.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-53.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-54.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-55.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-56.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-57.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-58.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-59.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-70.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-71.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-72.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-73.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-74.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-75.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-76.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-77.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-78.c: Same.
	* gcc.target/powerpc/dfp/dtstsfi-79.c: Same.
	* gcc.target/powerpc/pr92661.c: Same.

Comments

Segher Boessenkool Jan. 25, 2021, 4:23 p.m. UTC | #1
Hi!

On Thu, Jan 21, 2021 at 05:49:14PM -0600, will schmidt wrote:
>   Noted as part of the work-in-progress builtins rewrite, the
> __builtin_dfp_dtstsfi_*_{dd,td} builtins are redundant, and are thusly
> being marked as deprecated.  They will be removed as part of the builtins
> rewrite sometime in the future.

> gcc/ChangeLog:
> 	* config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin):
> 	Mark builtins P9_BUILTIN_DFP_TSTSFI_LT_DD, P9_BUILTIN_DFP_TSTSFI_EQ_DD
> 	P9_BUILTIN_DFP_TSTSFI_GT_DD, P9_BUILTIN_DFP_TSTSFI_OV_DD,
> 	P9_BUILTIN_DFP_TSTSFI_LT_TD, P9_BUILTIN_DFP_TSTSFI_EQ_TD,
> 	P9_BUILTIN_DFP_TSTSFI_GT_TD, P9_BUILTIN_DFP_TSTSFI_OV_TD as deprecated.
> 	* doc/extend.texi: Update examples to indicate deprecated functions.
> 
> testsuite/ChangeLog:
> 	* gcc.target/powerpc/dfp/dtstsfi-10.c: Mark __builtin_dfp_dtstsfi_*_{dd,td}
> 	calls as deprecated.
> 	* gcc.target/powerpc/dfp/dtstsfi-11.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-12.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-13.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-14.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-15.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-16.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-17.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-18.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-19.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-30.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-31.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-32.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-33.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-34.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-35.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-36.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-37.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-38.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-39.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-50.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-51.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-52.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-53.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-54.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-55.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-56.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-57.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-58.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-59.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-70.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-71.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-72.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-73.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-74.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-75.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-76.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-77.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-78.c: Same.
> 	* gcc.target/powerpc/dfp/dtstsfi-79.c: Same.
> 	* gcc.target/powerpc/pr92661.c: Same.

This is okay for trunk if Bill thinks it is the right direction.  Thanks!


Segher
Li, Pan2 via Gcc-patches Jan. 26, 2021, 8:19 p.m. UTC | #2
On 1/25/21 10:23 AM, Segher Boessenkool wrote:
> Hi!
>
> On Thu, Jan 21, 2021 at 05:49:14PM -0600, will schmidt wrote:
>>    Noted as part of the work-in-progress builtins rewrite, the
>> __builtin_dfp_dtstsfi_*_{dd,td} builtins are redundant, and are thusly
>> being marked as deprecated.  They will be removed as part of the builtins
>> rewrite sometime in the future.
>> gcc/ChangeLog:
>> 	* config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin):
>> 	Mark builtins P9_BUILTIN_DFP_TSTSFI_LT_DD, P9_BUILTIN_DFP_TSTSFI_EQ_DD
>> 	P9_BUILTIN_DFP_TSTSFI_GT_DD, P9_BUILTIN_DFP_TSTSFI_OV_DD,
>> 	P9_BUILTIN_DFP_TSTSFI_LT_TD, P9_BUILTIN_DFP_TSTSFI_EQ_TD,
>> 	P9_BUILTIN_DFP_TSTSFI_GT_TD, P9_BUILTIN_DFP_TSTSFI_OV_TD as deprecated.
>> 	* doc/extend.texi: Update examples to indicate deprecated functions.
>>
>> testsuite/ChangeLog:
>> 	* gcc.target/powerpc/dfp/dtstsfi-10.c: Mark __builtin_dfp_dtstsfi_*_{dd,td}
>> 	calls as deprecated.
>> 	* gcc.target/powerpc/dfp/dtstsfi-11.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-12.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-13.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-14.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-15.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-16.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-17.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-18.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-19.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-30.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-31.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-32.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-33.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-34.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-35.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-36.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-37.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-38.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-39.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-50.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-51.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-52.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-53.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-54.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-55.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-56.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-57.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-58.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-59.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-70.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-71.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-72.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-73.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-74.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-75.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-76.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-77.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-78.c: Same.
>> 	* gcc.target/powerpc/dfp/dtstsfi-79.c: Same.
>> 	* gcc.target/powerpc/pr92661.c: Same.
> This is okay for trunk if Bill thinks it is the right direction.  Thanks!

I'm afraid I thought these were only introduced in GCC 11, but it turns 
out they are much older.  So we can't remove them without a deprecation 
cycle, unfortunately.  Please hold off until GCC 12. I apologize for 
misleading you.

Bill

>
>
> Segher
diff mbox series

Patch

diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index cdc64bd63c66..9a79e5684f20 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -946,10 +946,21 @@  altivec_resolve_overloaded_builtin (location_t loc, tree fndecl,
   else if (fcode == ALTIVEC_BUILTIN_VEC_LVSR && !BYTES_BIG_ENDIAN)
     warning (OPT_Wdeprecated,
 	     "%<vec_lvsr%> is deprecated for little endian; use "
 	     "assignment for unaligned loads and stores");
 
+  if (fcode == P9_BUILTIN_DFP_TSTSFI_LT_DD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_EQ_DD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_GT_DD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_OV_DD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_LT_TD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_EQ_TD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_GT_TD
+	|| fcode == P9_BUILTIN_DFP_TSTSFI_OV_TD)
+      warning (OPT_Wdeprecated, "builtin '%s' is deprecated",
+	       IDENTIFIER_POINTER (DECL_NAME (fndecl)));
+
   if (fcode == ALTIVEC_BUILTIN_VEC_MUL)
     {
       /* vec_mul needs to be special cased because there are no instructions
 	 for it for the {un}signed char, {un}signed short, and {un}signed int
 	 types.  */
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 8daa1c679748..90db01daeac6 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -17859,31 +17859,33 @@  int __builtin_byte_in_set (unsigned char u, unsigned long long set);
 int __builtin_byte_in_range (unsigned char u, unsigned int range);
 int __builtin_byte_in_either_range (unsigned char u, unsigned int ranges);
 
 int __builtin_dfp_dtstsfi_lt (unsigned int comparison, _Decimal64 value);
 int __builtin_dfp_dtstsfi_lt (unsigned int comparison, _Decimal128 value);
-int __builtin_dfp_dtstsfi_lt_dd (unsigned int comparison, _Decimal64 value);
-int __builtin_dfp_dtstsfi_lt_td (unsigned int comparison, _Decimal128 value);
 
 int __builtin_dfp_dtstsfi_gt (unsigned int comparison, _Decimal64 value);
 int __builtin_dfp_dtstsfi_gt (unsigned int comparison, _Decimal128 value);
-int __builtin_dfp_dtstsfi_gt_dd (unsigned int comparison, _Decimal64 value);
-int __builtin_dfp_dtstsfi_gt_td (unsigned int comparison, _Decimal128 value);
 
 int __builtin_dfp_dtstsfi_eq (unsigned int comparison, _Decimal64 value);
 int __builtin_dfp_dtstsfi_eq (unsigned int comparison, _Decimal128 value);
-int __builtin_dfp_dtstsfi_eq_dd (unsigned int comparison, _Decimal64 value);
-int __builtin_dfp_dtstsfi_eq_td (unsigned int comparison, _Decimal128 value);
 
 int __builtin_dfp_dtstsfi_ov (unsigned int comparison, _Decimal64 value);
 int __builtin_dfp_dtstsfi_ov (unsigned int comparison, _Decimal128 value);
-int __builtin_dfp_dtstsfi_ov_dd (unsigned int comparison, _Decimal64 value);
-int __builtin_dfp_dtstsfi_ov_td (unsigned int comparison, _Decimal128 value);
 
 double __builtin_mffsl(void);
 
+/* The following builtins are deprecated.  */
+int __builtin_dfp_dtstsfi_lt_dd (unsigned int comparison, _Decimal64 value);
+int __builtin_dfp_dtstsfi_lt_td (unsigned int comparison, _Decimal128 value);
+int __builtin_dfp_dtstsfi_gt_dd (unsigned int comparison, _Decimal64 value);
+int __builtin_dfp_dtstsfi_gt_td (unsigned int comparison, _Decimal128 value);
+int __builtin_dfp_dtstsfi_eq_dd (unsigned int comparison, _Decimal64 value);
+int __builtin_dfp_dtstsfi_eq_td (unsigned int comparison, _Decimal128 value);
+int __builtin_dfp_dtstsfi_ov_dd (unsigned int comparison, _Decimal64 value);
+int __builtin_dfp_dtstsfi_ov_td (unsigned int comparison, _Decimal128 value);
 @end smallexample
+
 The @code{__builtin_byte_in_set} function requires a
 64-bit environment supporting ISA 3.0 or later.  This function returns
 a non-zero value if and only if its @code{u} argument exactly equals one of
 the eight bytes contained within its 64-bit @code{set} argument.
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
index 822030bf7379..8b21f30acf76 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-10.c
@@ -7,9 +7,10 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_dd (5, source);
+  return __builtin_dfp_dtstsfi_lt_dd (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_lt_dd' is deprecated" } */
+
 }
 
 /* { 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 044e7683cf16..5976a43d78b4 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-11.c
@@ -6,8 +6,10 @@ 
 
 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_dd (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_lt_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_lt_dd' requires" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
index 350b4c102051..09eab3297554 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-12.c
@@ -6,8 +6,10 @@ 
 
 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_dd (65, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_lt_dd' is deprecated" "" { target *-*-* } dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" { target *-*-* } dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
index cc54c6b265e9..0ecf87211b58 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-13.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_lt_dd (63, source))
+  if (__builtin_dfp_dtstsfi_lt_dd (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_lt_dd' is deprecated" } */
     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 011d20039d06..4f5c6b5d95eb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-14.c
@@ -6,8 +6,10 @@ 
 
 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_dd (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_lt_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
index 54d2557fa2f2..a919b4270d3a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-15.c
@@ -7,10 +7,10 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_lt_td (5, source);
+  return __builtin_dfp_dtstsfi_lt_td (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_lt_td' is deprecated" } */
 }
 
 /* { 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 8626c579a25b..be882014418b 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-16.c
@@ -6,9 +6,11 @@ 
 
 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_td (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_lt_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_lt_td' requires" "" {target *-*-*} dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
index 28033dbac18f..f13d7385f5e6 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-17.c
@@ -6,9 +6,11 @@ 
 
 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_td (65, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_lt_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
index 8ce9390feaff..9052307e8bc5 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-18.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_lt_td (63, source))
+  if (__builtin_dfp_dtstsfi_lt_td (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_lt_td' is deprecated" } */
     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 092b9c0f7c5d..10e3ffacc5db 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-19.c
@@ -6,7 +6,9 @@ 
 
 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_td (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_lt_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
index 6d8869e5435e..7023ababf860 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-30.c
@@ -7,9 +7,9 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_dd (5, source);
+  return __builtin_dfp_dtstsfi_gt_dd (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_gt_dd' is deprecated" } */
 }
 
 /* { 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 439fcb2a548a..6a4822a6ac32 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-31.c
@@ -6,8 +6,10 @@ 
 
 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_dd (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_gt_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_gt_dd' requires" "" {target *-*-*} dtst_line } */ 
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
index d24f3982ee97..4d6c57d2466e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-32.c
@@ -6,8 +6,10 @@ 
 
 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_dd (65, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_gt_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
index 6d978a097500..b5728edadc87 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-33.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_gt_dd (63, source))
+  if (__builtin_dfp_dtstsfi_gt_dd (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_gt_dd' is deprecated." } */
     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 b6620c51f2a9..15e923a234b5 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-34.c
@@ -6,8 +6,10 @@ 
 
 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_dd (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_gt_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
index fdafaf9ceb85..7dbc87dc232c 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-35.c
@@ -7,10 +7,10 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_gt_td (5, source);
+  return __builtin_dfp_dtstsfi_gt_td (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_gt_td' is deprecated" } */
 }
 
 /* { 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 822f6d57003f..1ce226d9638a 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-36.c
@@ -6,9 +6,11 @@ 
 
 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_td (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_gt_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_gt_td' requires" "" {target *-*-*} dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
index dc4c8ecdd00f..f5a637782181 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-37.c
@@ -6,9 +6,11 @@ 
 
 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_td (65, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_gt_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
index fce744cd916d..1a53fbf50472 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-38.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_gt_td (63, source))
+  if (__builtin_dfp_dtstsfi_gt_td (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_gt_td' is deprecated" } */
     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 1aee9efe919e..fa7bcb543d1c 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-39.c
@@ -6,7 +6,9 @@ 
 
 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_td (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_gt_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line  } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
index 25b35ed4bc9c..682b3d9c64bd 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-50.c
@@ -7,9 +7,9 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_dd (5, source);
+  return __builtin_dfp_dtstsfi_eq_dd (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_eq_dd' is deprecated" } */
 }
 
 /* { 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 e6b5fe5469ef..bab36b669072 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-51.c
@@ -6,8 +6,10 @@ 
 
 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_dd (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_eq_dd' requires" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
index c9431b5ea1ae..dca8e5785eb9 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-52.c
@@ -6,8 +6,10 @@ 
 
 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_dd (65, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
index d11f497b1372..6ce1a8a22666 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-53.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_eq_dd (63, source))
+  if (__builtin_dfp_dtstsfi_eq_dd (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_eq_dd' is deprecated" } */
     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 2fdb58f67483..b58f55e63052 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-54.c
@@ -6,8 +6,10 @@ 
 
 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_dd (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_dd' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
index 912ae7f3492e..631cb063a0f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-55.c
@@ -7,10 +7,11 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_eq_td (5, source);
+  return __builtin_dfp_dtstsfi_eq_td (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_td' is deprecated." "" {target *-*-*} dtst_line } */
 }
 
 /* { 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 218d2f64d3ef..c720a2a3db07 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-56.c
@@ -6,9 +6,11 @@ 
 
 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_td (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_eq_td' requires" "" {target *-*-*} dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
index 275bf8d0ac20..3e82abadbed8 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-57.c
@@ -6,9 +6,11 @@ 
 
 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_td (65, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_td' is deprecated" "" {target *-*-*} dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
index 0626d87d9be6..18b1e03f0cfb 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-58.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_eq_td (63, source))
+  if (__builtin_dfp_dtstsfi_eq_td (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_eq_td' is deprecated" } */
     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 e1da3d810efd..d4b527388ef4 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-59.c
@@ -6,7 +6,9 @@ 
 
 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_td (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_eq_td' is deprecated" "" {target *-*-* } dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
index 875354c9ab86..218fcb7bb917 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-70.c
@@ -7,9 +7,9 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_dd (5, source);
+  return __builtin_dfp_dtstsfi_ov_dd (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_ov_dd' is deprecated." } */
 }
 
 /* { 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 68758cf535a2..09435b31e07e 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-71.c
@@ -6,8 +6,10 @@ 
 
 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_dd (5, source);/* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_ov_dd' is deprecated" "" { target *-*-* } dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_ov_dd'" "" { target *-*-* } dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
index 725cc5432b9d..f56fa97c63f9 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-72.c
@@ -6,8 +6,10 @@ 
 
 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_dd (65, source);  /* { dg-line dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" { target *-*-* } dtst_line } */
+	/* { dg-warning "builtin '__builtin_dfp_dtstsfi_ov_dd' is deprecated" "" { target *-*-* } dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
index f368c38204bb..b8eb5e68d8ce 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-73.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal64 *p)
 {
   _Decimal64 source = *p;
 
-  if (__builtin_dfp_dtstsfi_ov_dd (63, source))
+  if (__builtin_dfp_dtstsfi_ov_dd (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_ov_dd' is deprecated." } */
     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 c6ffd51d9f48..3902267fbf7f 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-74.c
@@ -6,8 +6,10 @@ 
 
 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_dd (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "builtin '__builtin_dfp_dtstsfi_ov_dd' is deprecated" "" {target *-*-* } dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" {target *-*-*} dtst_line } */
 }
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
index 910fb7d98c89..42bad77d0333 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-75.c
@@ -7,10 +7,10 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  return __builtin_dfp_dtstsfi_ov_td (5, source);
+  return __builtin_dfp_dtstsfi_ov_td (5, source); /* { dg-warning "'__builtin_dfp_dtstsfi_ov_td' is deprecated" } */
 }
 
 /* { 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 d867a987df85..0bf203b9cdba 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-76.c
@@ -6,9 +6,11 @@ 
 
 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_td (5, source); /* { dg-line dtst_line } */
+	/* { dg-warning "builtin '__builtin_dfp_dtstsfi_ov_td' is deprecated" "" {target *-*-* } dtst_line } */
+	/* { dg-error "'__builtin_dtstsfi_ov_td' requires" "" {target *-*-*} dtst_line  } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
index d279bfb5751d..8c815b6b4279 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-77.c
@@ -6,9 +6,11 @@ 
 
 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_td (65, source);/* { dg-line dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" { target *-*-* } dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_ov_td' is deprecated" "" { target *-*-* } dtst_line } */
 }
 
 
diff --git a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
index 3034300f72bf..47ffaeff3c25 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-78.c
@@ -6,11 +6,11 @@ 
 
 int doTestBCDSignificance (_Decimal128 *p)
 {
   _Decimal128 source = *p;
 
-  if (__builtin_dfp_dtstsfi_ov_td (63, source))
+  if (__builtin_dfp_dtstsfi_ov_td (63, source)) /* { dg-warning "'__builtin_dfp_dtstsfi_ov_td' is deprecated." } */
     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 b88b5a86bcb2..212e7826d976 100644
--- a/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
+++ b/gcc/testsuite/gcc.target/powerpc/dfp/dtstsfi-79.c
@@ -6,7 +6,9 @@ 
 
 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_td (significance, source); /* { dg-line dtst_line } */
+	/* { dg-warning "'__builtin_dfp_dtstsfi_ov_td' is deprecated" "" {target *-*-* } dtst_line } */
+	/* { dg-error "argument 1 must be a 6-bit unsigned literal" "" { target *-*-* } dtst_line } */
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92661.c b/gcc/testsuite/gcc.target/powerpc/pr92661.c
index d9500dbfdb71..76e6b757da5b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr92661.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr92661.c
@@ -6,11 +6,11 @@ 
 
 /* Test that a normal builtin function doesn't ICE.  */
 int
 foo (_Decimal64 src) /* { dg-error "decimal floating-point not supported for this target" "not supported" { target { ! dfp } } } */
 {
-  return __builtin_dfp_dtstsfi_lt_dd (5, src);
+  return __builtin_dfp_dtstsfi_lt_dd (5, src); /* { dg-warning "'__builtin_dfp_dtstsfi_lt_dd' is deprecated" } */
 }
 
 /* Test that an overloaded builtin function doesn't ICE.  */
 int
 bar (_Decimal64 src) /* { dg-error "decimal floating-point not supported for this target" "not supported" { target { ! dfp } } } */