From 799cff46ec8fe37c60605f22d8a9d6a39dcdb364 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Fri, 18 Apr 2008 02:16:35 +0000 Subject: [PATCH] gthr-posix.h (__gthread_active_p): Use the Solaris implementation for FreeBSD as well. * gthr-posix.h (__gthread_active_p): Use the Solaris implementation for FreeBSD as well. * gthr-posix95.h: Likewise. From-SVN: r134423 --- gcc/ChangeLog | 6 ++++++ gcc/gthr-posix.h | 11 +++++++---- gcc/gthr-posix95.h | 11 +++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9e5fcfa4f81..f45e4a6895a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-04-18 Marius Strobl + + * gthr-posix.h (__gthread_active_p): Use the Solaris implementation + for FreeBSD as well. + * gthr-posix95.h: Likewise. + 2008-04-17 Richard Sandiford PR rtl-optimization/35838 diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h index a6c9ba3b54f..b16f9b31fe8 100644 --- a/gcc/gthr-posix.h +++ b/gcc/gthr-posix.h @@ -158,9 +158,12 @@ __gthrw(pthread_setschedparam) it is passed so we cannot pretend that the interface is active if -pthreads is not specified. On Solaris 2.5.1, the interface is not exposed at all so we need to play the usual game with weak symbols. On Solaris 10 and up, a - working interface is always exposed. */ + working interface is always exposed. On FreeBSD 6 and later, libc also + exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up + to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, + which means the alternate __gthread_active_p below cannot be used there. */ -#if defined(__sun) && defined(__svr4__) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) static volatile int __gthread_active = -1; @@ -203,7 +206,7 @@ __gthread_active_p (void) return __gthread_active_latest_value != 0; } -#else /* not Solaris */ +#else /* neither FreeBSD nor Solaris */ static inline int __gthread_active_p (void) @@ -213,7 +216,7 @@ __gthread_active_p (void) return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */ diff --git a/gcc/gthr-posix95.h b/gcc/gthr-posix95.h index b6332816c99..190b097d284 100644 --- a/gcc/gthr-posix95.h +++ b/gcc/gthr-posix95.h @@ -121,9 +121,12 @@ __gthrw(pthread_setschedparam) it is passed so we cannot pretend that the interface is active if -pthreads is not specified. On Solaris 2.5.1, the interface is not exposed at all so we need to play the usual game with weak symbols. On Solaris 10 and up, a - working interface is always exposed. */ + working interface is always exposed. On FreeBSD 6 and later, libc also + exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up + to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, + which means the alternate __gthread_active_p below cannot be used there. */ -#if defined(__sun) && defined(__svr4__) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) static volatile int __gthread_active = -1; @@ -166,7 +169,7 @@ __gthread_active_p (void) return __gthread_active_latest_value != 0; } -#else /* not Solaris */ +#else /* neither FreeBSD nor Solaris */ static inline int __gthread_active_p (void) @@ -176,7 +179,7 @@ __gthread_active_p (void) return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */