pthread1.cc: Do not invoke pthread_setconcurrency on Solaris 2.6 and below.

	* testsuite/thread/pthread1.cc: Do not invoke pthread_setconcurrency
	on Solaris 2.6 and below.
	* testsuite/thread/pthread2.cc: Likewise.
	* testsuite/thread/pthread3.cc: Likewise.
	* testsuite/thread/pthread4.cc: Likewise.
	* testsuite/thread/pthread5.cc: Likewise.
	* testsuite/thread/pthread6.cc: Likewise.

From-SVN: r95223

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a4405361487f744a26b5732be50f455c120ac6b6..4b86f63919184ab6186074fa7ae10d88f6446aa2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-18  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * testsuite/thread/pthread1.cc: Do not invoke pthread_setconcurrency
+       on Solaris 2.6 and below.
+       * testsuite/thread/pthread2.cc: Likewise.
+       * testsuite/thread/pthread3.cc: Likewise.
+       * testsuite/thread/pthread4.cc: Likewise.
+       * testsuite/thread/pthread5.cc: Likewise.
+       * testsuite/thread/pthread6.cc: Likewise.
+
 2005-02-02  Zack Weinberg  <zack@codesourcery.com>
 
        Backport from mainline:

diff --git a/libstdc++-v3/testsuite/thread/pthread1.cc b/libstdc++-v3/testsuite/thread/pthread1.cc
index a6af93fbe9a5bf04ac46eb4687c08b0cd3a71372..d517ea9e1bea21a4f4a97b44cd18bdfd7f1d06a4 100644 (file)
--- a/libstdc++-v3/testsuite/thread/pthread1.cc
+++ b/libstdc++-v3/testsuite/thread/pthread1.cc
@@ -107,7 +107,7 @@ main (int argc, char** argv)
 
   task_queue* tq[thread_pairs];
 
-#if defined(__sun) && defined(__svr4__)
+#if defined(__sun) && defined(__svr4__) && _XOPEN_VERSION >= 500
   pthread_setconcurrency (thread_pairs * 2);
 #endif
 

diff --git a/libstdc++-v3/testsuite/thread/pthread2.cc b/libstdc++-v3/testsuite/thread/pthread2.cc
index 2ce17b72ba9b10a99e5aeba825d21b52a9f23d2d..2692d010254f74e5fdeb3ca2b4f23ac69a9bb80f 100644 (file)
--- a/libstdc++-v3/testsuite/thread/pthread2.cc
+++ b/libstdc++-v3/testsuite/thread/pthread2.cc
@@ -50,7 +50,7 @@ main()
 {
   pthread_t tid[max_thread_count];
 
-#if defined(__sun) && defined(__svr4__)
+#if defined(__sun) && defined(__svr4__) && _XOPEN_VERSION >= 500
   pthread_setconcurrency (max_thread_count);
 #endif
 

diff --git a/libstdc++-v3/testsuite/thread/pthread3.cc b/libstdc++-v3/testsuite/thread/pthread3.cc
index 70fd9ead58a8c89fb06ebdc14398d00e4e3ff8a3..a1175b76ae035abd573eab7fd35641a99870e1b3 100644 (file)
--- a/libstdc++-v3/testsuite/thread/pthread3.cc
+++ b/libstdc++-v3/testsuite/thread/pthread3.cc
@@ -47,7 +47,7 @@ main()
 {
   pthread_t tid[max_thread_count];
 
-#if defined(__sun) && defined(__svr4__)
+#if defined(__sun) && defined(__svr4__) && _XOPEN_VERSION >= 500
   pthread_setconcurrency (max_thread_count);
 #endif
 

diff --git a/libstdc++-v3/testsuite/thread/pthread4.cc b/libstdc++-v3/testsuite/thread/pthread4.cc
index d4d03b3867c1de59d16564e5b3d848ca3794ea9d..08d4f425ed8a434b07dd86bce96e069927356d7f 100644 (file)
--- a/libstdc++-v3/testsuite/thread/pthread4.cc
+++ b/libstdc++-v3/testsuite/thread/pthread4.cc
@@ -93,7 +93,7 @@ consume (void*)
 int
 main (void)
 {
-#if defined(__sun) && defined(__svr4__)
+#if defined(__sun) && defined(__svr4__) && _XOPEN_VERSION >= 500
   pthread_setconcurrency (2);
 #endif
 

diff --git a/libstdc++-v3/testsuite/thread/pthread5.cc b/libstdc++-v3/testsuite/thread/pthread5.cc
index 955f3785a3998fb5aec93f51bbfbfdbbaa07cd81..4d6364abb4193cc4c7269cf3febeb9a1f0996a01 100644 (file)
--- a/libstdc++-v3/testsuite/thread/pthread5.cc
+++ b/libstdc++-v3/testsuite/thread/pthread5.cc
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
   int ids[NTHREADS];
   void* status;
 
-#if defined(__sun) && defined(__svr4__)
+#if defined(__sun) && defined(__svr4__) && _XOPEN_VERSION >= 500
   pthread_setconcurrency (NTHREADS);
 #endif
 

diff --git a/libstdc++-v3/testsuite/thread/pthread6.cc b/libstdc++-v3/testsuite/thread/pthread6.cc
index e5ea0f9861718a2f9ea64dbd55bb42a58cff963f..ca11073a0033e750c1c9198a6bf7146dcd9bc0a8 100644 (file)
--- a/libstdc++-v3/testsuite/thread/pthread6.cc
+++ b/libstdc++-v3/testsuite/thread/pthread6.cc
@@ -77,7 +77,7 @@ main (void)
 {
   pthread_t tid[max_thread_count];
 
-#if defined(__sun) && defined(__svr4__)
+#if defined(__sun) && defined(__svr4__) && _XOPEN_VERSION >= 500
   pthread_setconcurrency (max_thread_count);
 #endif