From ce2aa290dc72749eb7d38adefd9545fd8c5f81f4 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Sun, 25 May 2008 20:50:05 +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: r135880 --- 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 ab330d522840..b1a344694bd7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-05-23 Marius Strobl + + * gthr-posix.h (__gthread_active_p): Use the Solaris implementation + for FreeBSD as well. + * gthr-posix95.h: Likewise. + 2008-05-20 Adam Nemet PR middle-end/36194 diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h index 47d38a320bae..fd1ce2204d38 100644 --- a/gcc/gthr-posix.h +++ b/gcc/gthr-posix.h @@ -152,9 +152,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; @@ -197,7 +200,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) @@ -207,7 +210,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 fde264594f84..172439638afd 100644 --- a/gcc/gthr-posix95.h +++ b/gcc/gthr-posix95.h @@ -115,9 +115,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; @@ -160,7 +163,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) @@ -170,7 +173,7 @@ __gthread_active_p (void) return __gthread_active_ptr != 0; } -#endif /* Solaris */ +#endif /* FreeBSD or Solaris */ #else /* not SUPPORTS_WEAK */ -- 2.47.2