diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1fcc308663..c38ac3d3e6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-07  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.threads/manythreads.c (main): Check if PTHREAD_STACK_MIN is
+	defined before referencing it.
+
 2009-06-03  Doug Evans  <dje@google.com>
 
 	* gdb.arch/i386-sse.exp: Test xmm[8-15] if amd64.
diff --git a/gdb/testsuite/gdb.threads/manythreads.c b/gdb/testsuite/gdb.threads/manythreads.c
index 93128ebf4c..1eb2caba20 100644
--- a/gdb/testsuite/gdb.threads/manythreads.c
+++ b/gdb/testsuite/gdb.threads/manythreads.c
@@ -42,7 +42,10 @@ main (int argc, char **argv)
   int i, j;
 
   pthread_attr_init (&attr);
+
+#ifdef PTHREAD_STACK_MIN
   pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
+#endif
 
   /* Create a ton of quick-executing threads, then wait for them to
      complete.  */