From 87bd0274cc73911840adafeb1593e5b592a91a35 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 18 Feb 2005 12:53:18 +0100 Subject: [PATCH] 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. * testsuite/thread/pthread7-rope.cc: Likewise. From-SVN: r95220 --- libstdc++-v3/ChangeLog | 11 +++++++++++ libstdc++-v3/testsuite/thread/pthread1.cc | 2 +- libstdc++-v3/testsuite/thread/pthread2.cc | 2 +- libstdc++-v3/testsuite/thread/pthread3.cc | 2 +- libstdc++-v3/testsuite/thread/pthread4.cc | 2 +- libstdc++-v3/testsuite/thread/pthread5.cc | 2 +- libstdc++-v3/testsuite/thread/pthread6.cc | 2 +- libstdc++-v3/testsuite/thread/pthread7-rope.cc | 2 +- 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0ddd1a52fa6..576318f0e43 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2005-02-18 Eric Botcazou + + * 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. + * testsuite/thread/pthread7-rope.cc: Likewise. + 2005-02-17 Matt Austern * include/tr1/functional (hash): New function object. diff --git a/libstdc++-v3/testsuite/thread/pthread1.cc b/libstdc++-v3/testsuite/thread/pthread1.cc index 26d198a755e..f83e20595af 100644 --- a/libstdc++-v3/testsuite/thread/pthread1.cc +++ b/libstdc++-v3/testsuite/thread/pthread1.cc @@ -111,7 +111,7 @@ main () 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 7a0efd067a2..84485165cd2 100644 --- a/libstdc++-v3/testsuite/thread/pthread2.cc +++ b/libstdc++-v3/testsuite/thread/pthread2.cc @@ -48,7 +48,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 4696fb76cdc..23f4e04e180 100644 --- a/libstdc++-v3/testsuite/thread/pthread3.cc +++ b/libstdc++-v3/testsuite/thread/pthread3.cc @@ -45,7 +45,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 a9ec9b84e38..b58445fb68e 100644 --- a/libstdc++-v3/testsuite/thread/pthread4.cc +++ b/libstdc++-v3/testsuite/thread/pthread4.cc @@ -98,7 +98,7 @@ template class __gnu_cxx::__mt_alloc >; 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 93f03a22761..30086d4584d 100644 --- a/libstdc++-v3/testsuite/thread/pthread5.cc +++ b/libstdc++-v3/testsuite/thread/pthread5.cc @@ -100,7 +100,7 @@ main () 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 ba8c341c3f8..44b2b897146 100644 --- a/libstdc++-v3/testsuite/thread/pthread6.cc +++ b/libstdc++-v3/testsuite/thread/pthread6.cc @@ -80,7 +80,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 diff --git a/libstdc++-v3/testsuite/thread/pthread7-rope.cc b/libstdc++-v3/testsuite/thread/pthread7-rope.cc index 307973c202d..3f5a338d086 100644 --- a/libstdc++-v3/testsuite/thread/pthread7-rope.cc +++ b/libstdc++-v3/testsuite/thread/pthread7-rope.cc @@ -68,7 +68,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 -- 2.30.2