From 0ab6a7ba9c98756505d14e7e6e1ad88a3a87fd99 Mon Sep 17 00:00:00 2001
From: Mike Stump <mrs@gcc.gnu.org>
Date: Fri, 11 Jun 2004 20:33:54 +0000
Subject: [PATCH] Merge in xfails from PR14107.

From-SVN: r82999
---
 gcc/testsuite/g++.old-deja/g++.bugs/900205_03.C |  8 ++++----
 gcc/testsuite/g++.old-deja/g++.mike/p646.C      | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900205_03.C b/gcc/testsuite/g++.old-deja/g++.bugs/900205_03.C
index b22172d104d..192f2d0f952 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900205_03.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900205_03.C
@@ -18,10 +18,10 @@
 struct struct00 { };
 
 int global_function_0 () {
-}					// { dg-error "" } 
+}					// { dg-error "" "" { xfail *-*-* } }
 
 struct00 global_function_1 () {
-}					// { dg-error "" } 
+}					// { dg-error "" "" { xfail *-*-* } }
 
 struct struct0 {
 
@@ -41,9 +41,9 @@ struct struct1 {
 };
 
 int struct1_member_function_0 () {
-}					// { dg-error "" } 
+}					// { dg-error "" "" { xfail *-*-* } }
 
 struct1 struct1::struct1_member_function_1 () {
-}				        // { dg-error "" } 
+}				        // { dg-error "" "" { xfail *-*-* } }
 
 int main () { return 0; }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p646.C b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
index 6d5abcd91e5..bc9a203f20c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p646.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
@@ -1,5 +1,6 @@
 // { dg-do assemble  }
 // { dg-options "-Wno-deprecated -Wreturn-type" }
+//
 // GROUPS passed i960
 /*
   Bug Id: bnr
@@ -101,7 +102,7 @@ warn_return_1 ()
 {
   foo f;
   printf ("returning 1\n");
-}                              // { dg-warning "" } control reaches end
+}                              // { dg-warning "" "" { xfail *-*-* } } control reaches end
 
 int
 warn_return_arg (int arg)
@@ -109,7 +110,7 @@ warn_return_arg (int arg)
   foo f;
   printf ("returning %d\n", arg);
   arg;
-}                              // { dg-warning "" } control reaches end
+}                              // { dg-warning "" "" { xfail *-*-* } } control reaches end
 
 int
 warn_return_sum (int x, int y)
@@ -117,20 +118,20 @@ warn_return_sum (int x, int y)
   foo f;
   printf ("returning %d+%d\n", x, y);
   x + y;
-}                              // { dg-warning "" } control reaches end
+}                              // { dg-warning "" "" { xfail *-*-* } } control reaches end
 
 foo
 warn_return_foo ()
 {
   foo f;
   printf ("returning foo\n");
-}                              // { dg-warning "" } control reaches end
+}                              // { dg-warning "" "" { xfail *-*-* } } control reaches end
 
 foo
 warn_foo_parm_returns_foo (foo f)
 {
   f;
-}                              // { dg-warning "" } control reaches end
+}                              // { dg-warning "" "" { xfail *-*-* } } control reaches end
 
 main ()
 {				// { dg-warning "" } no type
-- 
2.30.2