diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fff3281e51200862b2b1c58fbbf5745e0aa29769..a1dd9869d658b5afc350ec3704aad1ef426bb1fc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-18  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	* testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc:
+	Add xfail on all targets except darwin.
+	* libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/
+	1674.cc: Same.
+	* libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc: Correct syntax
+	for xfailing on all targets except linux.
+
 2008-12-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure: Regenerate.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc
index 3f61fa6ce32211cd710a9bf493baf55136ae7cea..bd2261830fe619f45a4e11a0df445237145ae5bb 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc
@@ -1,6 +1,6 @@
+// { dg-do run { xfail { ! { *-*-darwin* } } } }
 // { dg-require-debug-mode "" }
 // { dg-options "-O0 -D_GLIBCXX_DEBUG" }
-// { dg-do run { xfail *-*-* } }
 
 // Copyright (C) 2005 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc
index 7c27e2b6a4e0f81d1b4a4caa921263300c40a4f6..438bbadb9f117119248bde8abe63b5872e30775a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc
@@ -1,6 +1,6 @@
+// { dg-do run { xfail { ! { *-*-darwin* } } } }
 // { dg-require-debug-mode "" }
 // { dg-options "-O0 -D_GLIBCXX_DEBUG" }
-// { dg-do run { xfail *-*-* } }
 
 // Copyright (C) 2005 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
index fe4bf71241682679a64f567f990249c9a3d16985..7cd3944b7158c318747d3573cab8d4e543036386 100644
--- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-do run { xfail *-*-![linux]* } }
+// { dg-do run { xfail { ! { *-*-linux* } } } }
 // { dg-require-namedlocale "" }
 
 // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005