PR c++/43509

[pf3gnuchains/gcc-fork.git] / gcc / gthr-posix95.h

diff --git a/gcc/gthr-posix95.h b/gcc/gthr-posix95.h
index f10317d..55e254e 100644 (file)
--- a/gcc/gthr-posix95.h
+++ b/gcc/gthr-posix95.h
@@ -1,12 +1,12 @@
 /* Threads compatibility routines for libgcc2 and libobjc.  */
 /* Compile this one with gcc.  */
 /* Threads compatibility routines for libgcc2 and libobjc.  */
 /* Compile this one with gcc.  */

-/* Copyright (C) 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.

 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -14,17 +14,14 @@ WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 

-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.

 
 

-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */

 
 #ifndef GCC_GTHR_POSIX_H
 #define GCC_GTHR_POSIX_H
 
 #ifndef GCC_GTHR_POSIX_H
 #define GCC_GTHR_POSIX_H


@@ -45,6 +42,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 typedef pthread_key_t __gthread_key_t;
 typedef pthread_once_t __gthread_once_t;
 typedef pthread_mutex_t __gthread_mutex_t;
 typedef pthread_key_t __gthread_key_t;
 typedef pthread_once_t __gthread_once_t;
 typedef pthread_mutex_t __gthread_mutex_t;

+typedef pthread_cond_t __gthread_cond_t;
+
+/* POSIX like conditional variables are supported.  Please look at comments
+   in gthr.h for details. */
+#define __GTHREAD_HAS_COND     1

 
 typedef struct {
   long depth;
 
 typedef struct {
   long depth;


@@ -55,68 +57,204 @@ typedef struct {
 #define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
 #define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
 #define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
 #define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
 #define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
 #define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function

+#define __GTHREAD_COND_INIT PTHREAD_COND_INITIALIZER

 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK

+# define __gthrw(name) \
+  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
+# define __gthrw_(name) __gthrw_ ## name
+#else
+# define __gthrw(name)
+# define __gthrw_(name) name
+#endif

 
 

-#pragma weak pthread_once
-#pragma weak pthread_key_create
-#pragma weak pthread_key_delete
-#pragma weak pthread_getspecific
-#pragma weak pthread_setspecific
-#pragma weak pthread_create
-#pragma weak pthread_self
-
-#pragma weak pthread_mutex_lock
-#pragma weak pthread_mutex_trylock
-#pragma weak pthread_mutex_unlock
-#pragma weak pthread_mutexattr_init
-#pragma weak pthread_mutexattr_settype
-#pragma weak pthread_mutexattr_destroy
-
-#pragma weak pthread_mutex_init
+__gthrw(pthread_once)
+__gthrw(pthread_key_create)
+__gthrw(pthread_key_delete)
+__gthrw(pthread_getspecific)
+__gthrw(pthread_setspecific)
+__gthrw(pthread_create)
+__gthrw(pthread_cancel)
+__gthrw(pthread_self)
+
+__gthrw(pthread_mutex_init)
+__gthrw(pthread_mutex_destroy)
+__gthrw(pthread_mutex_lock)
+__gthrw(pthread_mutex_trylock)
+__gthrw(pthread_mutex_unlock)
+__gthrw(pthread_mutexattr_init)
+__gthrw(pthread_mutexattr_destroy)
+
+__gthrw(pthread_cond_broadcast)
+__gthrw(pthread_cond_wait)

 
 #if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
 /* Objective-C.  */
 
 #if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
 /* Objective-C.  */

-#pragma weak pthread_cond_broadcast
-#pragma weak pthread_cond_destroy
-#pragma weak pthread_cond_init
-#pragma weak pthread_cond_signal
-#pragma weak pthread_cond_wait
-#pragma weak pthread_exit
-#pragma weak pthread_mutex_destroy
-#pragma weak pthread_self
+__gthrw(pthread_cond_destroy)
+__gthrw(pthread_cond_init)
+__gthrw(pthread_cond_signal)
+__gthrw(pthread_exit)

 #ifdef _POSIX_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
 #ifdef _POSIX_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING

-#pragma weak sched_get_priority_max
-#pragma weak sched_get_priority_min
+__gthrw(sched_get_priority_max)
+__gthrw(sched_get_priority_min)

 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
 #endif /* _POSIX_PRIORITY_SCHEDULING */
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
 #endif /* _POSIX_PRIORITY_SCHEDULING */

-#pragma weak sched_yield
-#pragma weak pthread_attr_destroy
-#pragma weak pthread_attr_init
-#pragma weak pthread_attr_setdetachstate
+__gthrw(sched_yield)
+__gthrw(pthread_attr_destroy)
+__gthrw(pthread_attr_init)
+__gthrw(pthread_attr_setdetachstate)

 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING

-#pragma weak pthread_getschedparam
-#pragma weak pthread_setschedparam
+__gthrw(pthread_getschedparam)
+__gthrw(pthread_setschedparam)

 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
 #endif /* _LIBOBJC || _LIBOBJC_WEAK */
 
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
 #endif /* _LIBOBJC || _LIBOBJC_WEAK */
 

+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+
+/* On Solaris 2.6 up to 9, the libc exposes a POSIX threads interface even if
+   -pthreads is not specified.  The functions are dummies and most return an
+   error value.  However pthread_once returns 0 without invoking the routine
+   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.  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(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
+
+static volatile int __gthread_active = -1;
+
+static void
+__gthread_trigger (void)
+{
+  __gthread_active = 1;
+}
+
+static inline int
+__gthread_active_p (void)
+{
+  static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
+  static pthread_once_t __gthread_active_once = PTHREAD_ONCE_INIT;
+
+  /* Avoid reading __gthread_active twice on the main code path.  */
+  int __gthread_active_latest_value = __gthread_active;
+
+  /* This test is not protected to avoid taking a lock on the main code
+     path so every update of __gthread_active in a threaded program must
+     be atomic with regard to the result of the test.  */
+  if (__builtin_expect (__gthread_active_latest_value < 0, 0))
+    {
+      if (__gthrw_(pthread_once))
+       {
+         /* If this really is a threaded program, then we must ensure that
+            __gthread_active has been set to 1 before exiting this block.  */
+         __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
+         __gthrw_(pthread_once) (&__gthread_active_once, __gthread_trigger);
+         __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
+       }
+
+      /* Make sure we'll never enter this block again.  */
+      if (__gthread_active < 0)
+       __gthread_active = 0;
+
+      __gthread_active_latest_value = __gthread_active;
+    }
+
+  return __gthread_active_latest_value != 0;
+}
+
+#else /* neither FreeBSD nor Solaris */
+

 static inline int
 __gthread_active_p (void)
 {
 static inline int
 __gthread_active_p (void)
 {

-  static void *const __gthread_active_ptr 
-    = __extension__ (void *) &pthread_create;
+  static void *const __gthread_active_ptr
+    = __extension__ (void *) &__gthrw_(pthread_cancel);

   return __gthread_active_ptr != 0;
 }
 
   return __gthread_active_ptr != 0;
 }
 

+#endif /* FreeBSD or Solaris */
+

 #else /* not SUPPORTS_WEAK */
 
 #else /* not SUPPORTS_WEAK */
 

+/* Similar to Solaris, HP-UX 11 for PA-RISC provides stubs for pthread
+   calls in shared flavors of the HP-UX C library.  Most of the stubs
+   have no functionality.  The details are described in the "libc cumulative
+   patch" for each subversion of HP-UX 11.  There are two special interfaces
+   provided for checking whether an application is linked to a pthread
+   library or not.  However, these interfaces aren't available in early
+   libc versions.  We also can't use pthread_once as some libc versions
+   call the init function.  So, we use pthread_create to check whether it
+   is possible to create a thread or not.  The stub implementation returns
+   the error number ENOSYS.  */
+
+#if defined(__hppa__) && defined(__hpux__)
+
+#include <errno.h>
+
+static volatile int __gthread_active = -1;
+
+static void *
+__gthread_start (void *arg __attribute__((unused)))
+{
+  return NULL;
+}
+
+static void __gthread_active_init (void) __attribute__((noinline));
+static void
+__gthread_active_init (void)
+{
+  static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
+  pthread_t t;
+  pthread_attr_t a;
+  int result;
+
+  __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
+  if (__gthread_active < 0)
+    {
+      __gthrw_(pthread_attr_init) (&a);
+      __gthrw_(pthread_attr_setdetachstate) (&a, PTHREAD_CREATE_DETACHED);
+      result = __gthrw_(pthread_create) (&t, &a, __gthread_start, NULL);
+      if (result != ENOSYS)
+       __gthread_active = 1;
+      else
+       __gthread_active = 0;
+      __gthrw_(pthread_attr_destroy) (&a);
+    }
+  __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
+}
+
+static inline int
+__gthread_active_p (void)
+{
+  /* Avoid reading __gthread_active twice on the main code path.  */
+  int __gthread_active_latest_value = __gthread_active;
+
+  /* This test is not protected to avoid taking a lock on the main code
+     path so every update of __gthread_active in a threaded program must
+     be atomic with regard to the result of the test.  */
+  if (__builtin_expect (__gthread_active_latest_value < 0, 0))
+    {
+      __gthread_active_init ();
+      __gthread_active_latest_value = __gthread_active;
+    }
+
+  return __gthread_active_latest_value != 0;
+}
+
+#else /* not hppa-hpux */
+

 static inline int
 __gthread_active_p (void)
 {
   return 1;
 }
 
 static inline int
 __gthread_active_p (void)
 {
   return 1;
 }
 

+#endif /* hppa-hpux */
+

 #endif /* SUPPORTS_WEAK */
 
 #ifdef _LIBOBJC
 #endif /* SUPPORTS_WEAK */
 
 #ifdef _LIBOBJC


@@ -144,13 +282,13 @@ __gthread_objc_init_thread_system (void)
   if (__gthread_active_p ())
     {
       /* Initialize the thread storage key.  */
   if (__gthread_active_p ())
     {
       /* Initialize the thread storage key.  */

-      if (pthread_key_create (&_objc_thread_storage, NULL) == 0)
+      if (__gthrw_(pthread_key_create) (&_objc_thread_storage, NULL) == 0)

        {
          /* The normal default detach state for threads is
           * PTHREAD_CREATE_JOINABLE which causes threads to not die
           * when you think they should.  */
        {
          /* The normal default detach state for threads is
           * PTHREAD_CREATE_JOINABLE which causes threads to not die
           * when you think they should.  */

-         if (pthread_attr_init (&_objc_thread_attribs) == 0
-             && pthread_attr_setdetachstate (&_objc_thread_attribs,
+         if (__gthrw_(pthread_attr_init) (&_objc_thread_attribs) == 0
+             && __gthrw_(pthread_attr_setdetachstate) (&_objc_thread_attribs,

                                              PTHREAD_CREATE_DETACHED) == 0)
            return 0;
        }
                                              PTHREAD_CREATE_DETACHED) == 0)
            return 0;
        }


@@ -164,8 +302,8 @@ static inline int
 __gthread_objc_close_thread_system (void)
 {
   if (__gthread_active_p ()
 __gthread_objc_close_thread_system (void)
 {
   if (__gthread_active_p ()

-      && pthread_key_delete (_objc_thread_storage) == 0
-      && pthread_attr_destroy (&_objc_thread_attribs) == 0)
+      && __gthrw_(pthread_key_delete) (_objc_thread_storage) == 0
+      && __gthrw_(pthread_attr_destroy) (&_objc_thread_attribs) == 0)

     return 0;
 
   return -1;
     return 0;
 
   return -1;


@@ -183,7 +321,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
   if (!__gthread_active_p ())
     return NULL;
 
   if (!__gthread_active_p ())
     return NULL;
 

-  if (!(pthread_create (&new_thread_handle, NULL, (void *) func, arg)))
+  if (!(__gthrw_(pthread_create) (&new_thread_handle, NULL, (void *) func, arg)))

     thread_id = (objc_thread_t) new_thread_handle;
   else
     thread_id = NULL;
     thread_id = (objc_thread_t) new_thread_handle;
   else
     thread_id = NULL;


@@ -201,17 +339,17 @@ __gthread_objc_thread_set_priority (int priority)
     {
 #ifdef _POSIX_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
     {
 #ifdef _POSIX_PRIORITY_SCHEDULING
 #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING

-      pthread_t thread_id = pthread_self ();
+      pthread_t thread_id = __gthrw_(pthread_self) ();

       int policy;
       struct sched_param params;
       int priority_min, priority_max;
 
       int policy;
       struct sched_param params;
       int priority_min, priority_max;
 

-      if (pthread_getschedparam (thread_id, &policy, &params) == 0)
+      if (__gthrw_(pthread_getschedparam) (thread_id, &policy, &params) == 0)

        {
        {

-         if ((priority_max = sched_get_priority_max (policy)) == -1)
+         if ((priority_max = __gthrw_(sched_get_priority_max) (policy)) == -1)

            return -1;
 
            return -1;
 

-         if ((priority_min = sched_get_priority_min (policy)) == -1)
+         if ((priority_min = __gthrw_(sched_get_priority_min) (policy)) == -1)

            return -1;
 
          if (priority > priority_max)
            return -1;
 
          if (priority > priority_max)


@@ -225,7 +363,7 @@ __gthread_objc_thread_set_priority (int priority)
           * this should be a pointer to policy but pthread.h is universally
           * at odds with this.
           */
           * this should be a pointer to policy but pthread.h is universally
           * at odds with this.
           */

-         if (pthread_setschedparam (thread_id, policy, &params) == 0)
+         if (__gthrw_(pthread_setschedparam) (thread_id, policy, &params) == 0)

            return 0;
        }
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
            return 0;
        }
 #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */


@@ -245,7 +383,7 @@ __gthread_objc_thread_get_priority (void)
       int policy;
       struct sched_param params;
 
       int policy;
       struct sched_param params;
 

-      if (pthread_getschedparam (pthread_self (), &policy, &params) == 0)
+      if (__gthrw_(pthread_getschedparam) (__gthrw_(pthread_self) (), &policy, &params) == 0)

        return params.sched_priority;
       else
        return -1;
        return params.sched_priority;
       else
        return -1;


@@ -261,7 +399,7 @@ static inline void
 __gthread_objc_thread_yield (void)
 {
   if (__gthread_active_p ())
 __gthread_objc_thread_yield (void)
 {
   if (__gthread_active_p ())

-    sched_yield ();
+    __gthrw_(sched_yield) ();

 }
 
 /* Terminate the current thread.  */
 }
 
 /* Terminate the current thread.  */


@@ -270,7 +408,7 @@ __gthread_objc_thread_exit (void)
 {
   if (__gthread_active_p ())
     /* exit the thread */
 {
   if (__gthread_active_p ())
     /* exit the thread */

-    pthread_exit (&__objc_thread_exit_status);
+    __gthrw_(pthread_exit) (&__objc_thread_exit_status);

 
   /* Failed if we reached here */
   return -1;
 
   /* Failed if we reached here */
   return -1;


@@ -281,7 +419,7 @@ static inline objc_thread_t
 __gthread_objc_thread_id (void)
 {
   if (__gthread_active_p ())
 __gthread_objc_thread_id (void)
 {
   if (__gthread_active_p ())

-    return (objc_thread_t) pthread_self ();
+    return (objc_thread_t) __gthrw_(pthread_self) ();

   else
     return (objc_thread_t) 1;
 }
   else
     return (objc_thread_t) 1;
 }


@@ -291,7 +429,7 @@ static inline int
 __gthread_objc_thread_set_data (void *value)
 {
   if (__gthread_active_p ())
 __gthread_objc_thread_set_data (void *value)
 {
   if (__gthread_active_p ())

-    return pthread_setspecific (_objc_thread_storage, value);
+    return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);

   else
     {
       thread_local_storage = value;
   else
     {
       thread_local_storage = value;


@@ -304,7 +442,7 @@ static inline void *
 __gthread_objc_thread_get_data (void)
 {
   if (__gthread_active_p ())
 __gthread_objc_thread_get_data (void)
 {
   if (__gthread_active_p ())

-    return pthread_getspecific (_objc_thread_storage);
+    return __gthrw_(pthread_getspecific) (_objc_thread_storage);

   else
     return thread_local_storage;
 }
   else
     return thread_local_storage;
 }


@@ -319,7 +457,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex)
     {
       mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
 
     {
       mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
 

-      if (pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL))
+      if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend, NULL))

        {
          objc_free (mutex->backend);
          mutex->backend = NULL;
        {
          objc_free (mutex->backend);
          mutex->backend = NULL;


@@ -340,18 +478,18 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
 
       /*
        * Posix Threads specifically require that the thread be unlocked
 
       /*
        * Posix Threads specifically require that the thread be unlocked

-       * for pthread_mutex_destroy to work.
+       * for __gthrw_(pthread_mutex_destroy) to work.

        */
 
       do
        {
        */
 
       do
        {

-         count = pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
+         count = __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);

          if (count < 0)
            return -1;
        }
       while (count);
 
          if (count < 0)
            return -1;
        }
       while (count);
 

-      if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
+      if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))

        return -1;
 
       objc_free (mutex->backend);
        return -1;
 
       objc_free (mutex->backend);


@@ -365,7 +503,7 @@ static inline int
 __gthread_objc_mutex_lock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
 __gthread_objc_mutex_lock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()

-      && pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0)
+      && __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend) != 0)

     {
       return -1;
     }
     {
       return -1;
     }


@@ -378,7 +516,7 @@ static inline int
 __gthread_objc_mutex_trylock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
 __gthread_objc_mutex_trylock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()

-      && pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0)
+      && __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 0)

     {
       return -1;
     }
     {
       return -1;
     }


@@ -391,7 +529,7 @@ static inline int
 __gthread_objc_mutex_unlock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
 __gthread_objc_mutex_unlock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()

-      && pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0)
+      && __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend) != 0)

     {
       return -1;
     }
     {
       return -1;
     }


@@ -409,7 +547,7 @@ __gthread_objc_condition_allocate (objc_condition_t condition)
     {
       condition->backend = objc_malloc (sizeof (pthread_cond_t));
 
     {
       condition->backend = objc_malloc (sizeof (pthread_cond_t));
 

-      if (pthread_cond_init ((pthread_cond_t *) condition->backend, NULL))
+      if (__gthrw_(pthread_cond_init) ((pthread_cond_t *) condition->backend, NULL))

        {
          objc_free (condition->backend);
          condition->backend = NULL;
        {
          objc_free (condition->backend);
          condition->backend = NULL;


@@ -426,7 +564,7 @@ __gthread_objc_condition_deallocate (objc_condition_t condition)
 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      if (pthread_cond_destroy ((pthread_cond_t *) condition->backend))
+      if (__gthrw_(pthread_cond_destroy) ((pthread_cond_t *) condition->backend))

        return -1;
 
       objc_free (condition->backend);
        return -1;
 
       objc_free (condition->backend);


@@ -440,7 +578,7 @@ static inline int
 __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
 __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
 {
   if (__gthread_active_p ())

-    return pthread_cond_wait ((pthread_cond_t *) condition->backend,
+    return __gthrw_(pthread_cond_wait) ((pthread_cond_t *) condition->backend,

                              (pthread_mutex_t *) mutex->backend);
   else
     return 0;
                              (pthread_mutex_t *) mutex->backend);
   else
     return 0;


@@ -451,7 +589,7 @@ static inline int
 __gthread_objc_condition_broadcast (objc_condition_t condition)
 {
   if (__gthread_active_p ())
 __gthread_objc_condition_broadcast (objc_condition_t condition)
 {
   if (__gthread_active_p ())

-    return pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
+    return __gthrw_(pthread_cond_broadcast) ((pthread_cond_t *) condition->backend);

   else
     return 0;
 }
   else
     return 0;
 }


@@ -461,7 +599,7 @@ static inline int
 __gthread_objc_condition_signal (objc_condition_t condition)
 {
   if (__gthread_active_p ())
 __gthread_objc_condition_signal (objc_condition_t condition)
 {
   if (__gthread_active_p ())

-    return pthread_cond_signal ((pthread_cond_t *) condition->backend);
+    return __gthrw_(pthread_cond_signal) ((pthread_cond_t *) condition->backend);

   else
     return 0;
 }
   else
     return 0;
 }


@@ -469,124 +607,152 @@ __gthread_objc_condition_signal (objc_condition_t condition)
 #else /* _LIBOBJC */
 
 static inline int
 #else /* _LIBOBJC */
 
 static inline int

-__gthread_once (__gthread_once_t *once, void (*func) (void))
+__gthread_once (__gthread_once_t *__once, void (*__func) (void))

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return pthread_once (once, func);
+    return __gthrw_(pthread_once) (__once, __func);

   else
     return -1;
 }
 
 static inline int
   else
     return -1;
 }
 
 static inline int

-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
+__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))

 {
 {

-  return pthread_key_create (key, dtor);
+  return __gthrw_(pthread_key_create) (__key, __dtor);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_key_delete (__gthread_key_t key)
+__gthread_key_delete (__gthread_key_t __key)

 {
 {

-  return pthread_key_delete (key);
+  return __gthrw_(pthread_key_delete) (__key);

 }
 
 static inline void *
 }
 
 static inline void *

-__gthread_getspecific (__gthread_key_t key)
+__gthread_getspecific (__gthread_key_t __key)
+{
+  return __gthrw_(pthread_getspecific) (__key);
+}
+
+static inline int
+__gthread_setspecific (__gthread_key_t __key, const void *__ptr)

 {
 {

-  return pthread_getspecific (key);
+  return __gthrw_(pthread_setspecific) (__key, __ptr);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_setspecific (__gthread_key_t key, const void *ptr)
+__gthread_mutex_destroy (__gthread_mutex_t *__mutex)

 {
 {

-  return pthread_setspecific (key, ptr);
+  if (__gthread_active_p ())
+    return __gthrw_(pthread_mutex_destroy) (__mutex);
+  else
+    return 0;

 }
 
 static inline int
 }
 
 static inline int

-__gthread_mutex_lock (__gthread_mutex_t *mutex)
+__gthread_mutex_lock (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return pthread_mutex_lock (mutex);
+    return __gthrw_(pthread_mutex_lock) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
+__gthread_mutex_trylock (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return pthread_mutex_trylock (mutex);
+    return __gthrw_(pthread_mutex_trylock) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
+__gthread_mutex_unlock (__gthread_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
 {
   if (__gthread_active_p ())

-    return pthread_mutex_unlock (mutex);
+    return __gthrw_(pthread_mutex_unlock) (__mutex);

   else
     return 0;
 }
 
 static inline int
   else
     return 0;
 }
 
 static inline int

-__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)

 {
 {

-  mutex->depth = 0;
-  mutex->owner = (pthread_t) 0;
-  return pthread_mutex_init (&mutex->actual, NULL);
+  __mutex->depth = 0;
+  __mutex->owner = (pthread_t) 0;
+  return __gthrw_(pthread_mutex_init) (&__mutex->actual, NULL);

 }
 
 static inline int
 }
 
 static inline int

-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      pthread_t me = pthread_self ();
+      pthread_t __me = __gthrw_(pthread_self) ();

 
 

-      if (mutex->owner != me)
+      if (__mutex->owner != __me)

        {
        {

-         pthread_mutex_lock (&mutex->actual);
-         mutex->owner = me;
+         __gthrw_(pthread_mutex_lock) (&__mutex->actual);
+         __mutex->owner = __me;

        }
 
        }
 

-      mutex->depth++;
+      __mutex->depth++;

     }
   return 0;
 }
 
 static inline int
     }
   return 0;
 }
 
 static inline int

-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      pthread_t me = pthread_self ();
+      pthread_t __me = __gthrw_(pthread_self) ();

 
 

-      if (mutex->owner != me)
+      if (__mutex->owner != __me)

        {
        {

-         if (pthread_mutex_trylock (&mutex->actual))
+         if (__gthrw_(pthread_mutex_trylock) (&__mutex->actual))

            return 1;
            return 1;

-         mutex->owner = me;
+         __mutex->owner = __me;

        }
 
        }
 

-      mutex->depth++;
+      __mutex->depth++;

     }
   return 0;
 }
 
 static inline int
     }
   return 0;
 }
 
 static inline int

-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)

 {
   if (__gthread_active_p ())
     {
 {
   if (__gthread_active_p ())
     {

-      if (--mutex->depth == 0)
+      if (--__mutex->depth == 0)

        {
        {

-          mutex->owner = (pthread_t) 0;
-          pthread_mutex_unlock (&mutex->actual);
+          __mutex->owner = (pthread_t) 0;
+          __gthrw_(pthread_mutex_unlock) (&__mutex->actual);

        }
     }
   return 0;
 }
 
        }
     }
   return 0;
 }
 

+static inline int
+__gthread_cond_broadcast (__gthread_cond_t *__cond)
+{
+  return __gthrw_(pthread_cond_broadcast) (__cond);
+}
+
+static inline int
+__gthread_cond_wait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex)
+{
+  return __gthrw_(pthread_cond_wait) (__cond, __mutex);
+}
+
+static inline int
+__gthread_cond_wait_recursive (__gthread_cond_t *__cond,
+                              __gthread_recursive_mutex_t *__mutex)
+{
+  return __gthrw_(pthread_cond_wait) (__cond, &__mutex->actual);
+}
+

 #endif /* _LIBOBJC */
 
 #endif /* ! GCC_GTHR_POSIX_H */
 #endif /* _LIBOBJC */
 
 #endif /* ! GCC_GTHR_POSIX_H */