diff -r 2b5c4cb5e70d gcc/testsuite/g++.old-deja/g++.oliva/dwarf2.C
--- a/gcc/testsuite/g++.old-deja/g++.oliva/dwarf2.C	Sat May 01 23:38:49 2010 +0200
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/dwarf2.C	Sun May 02 11:09:45 2010 +0200
@@ -1,5 +1,4 @@
 // { dg-do assemble }
-// { dg-xfail-if "" { i386-pc-solaris* } { "*" } { "" } }
 
 // Copyright (C) 1999 Free Software Foundation
 
diff -r 2b5c4cb5e70d gcc/testsuite/g++.old-deja/g++.oliva/dwarf3.C
--- a/gcc/testsuite/g++.old-deja/g++.oliva/dwarf3.C	Sat May 01 23:38:49 2010 +0200
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/dwarf3.C	Sun May 02 11:09:45 2010 +0200
@@ -1,5 +1,4 @@
 // { dg-do assemble }
-// { dg-xfail-if "" { i386-pc-solaris* } { "*" } { "" } }
 
 // Copyright (C) 1999 Free Software Foundation
 
diff -r 2b5c4cb5e70d gcc/testsuite/g++.old-deja/g++.other/init19.C
--- a/gcc/testsuite/g++.old-deja/g++.other/init19.C	Sat May 01 23:38:49 2010 +0200
+++ b/gcc/testsuite/g++.old-deja/g++.other/init19.C	Sun May 02 11:09:45 2010 +0200
@@ -1,4 +1,4 @@
-// { dg-do run { xfail { ! cxa_atexit } } }
+// { dg-do run { xfail { { ! cxa_atexit } && { ! *-*-solaris2* } } } }
 #include <stdlib.h>
 
 #define assert(x) do { if (! (x)) abort(); } while (0)