diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c50feaf0777dbcd7d1956598ccfad6a063853a2e..e2d12fc897b0c45ad297478f4ecebd84ed405db9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Geoffrey Keating  <geoffk@apple.com>
+
+	* testsuite/22_locale/locale/cons/12658_thread-1.cc: Only xfail
+	on Linux.
+
 2004-10-29  Chris Jefferson  <chris@bubblescope.net>
 
 	* include/bit/stl_algo.h (find_first_of(,,,,pred)):
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
index 216d068f8706fdd98edf64db27ce1983d6d840c9..898b423f7dce9660daf546144e267a0e280da031 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
@@ -22,7 +22,7 @@
 
 // 22.1.1.2 locale constructors and destructors [lib.locale.cons]
 
-// { dg-do run { xfail *-*-* } }
+// { dg-do run { xfail *-*-linux* } }
 
 #include <locale>
 #include <pthread.h>