GCC 4.2.0 release.

1 files changed, 139 insertions, 56 deletions

diff --git a/contrib/gcc/gthr-solaris.h b/contrib/gcc/gthr-solaris.h
index 33ddf7a..5665ecd 100644
--- a/contrib/gcc/gthr-solaris.h
+++ b/contrib/gcc/gthr-solaris.h
@@ -1,6 +1,7 @@
 /* Threads compatibility routines for libgcc2 and libobjc.  */
 /* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -16,8 +17,8 @@ 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.  */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  */
 
 /* As a special exception, if you link this library with other files,
    some of which are compiled with GCC, to produce an executable,
@@ -38,6 +39,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <thread.h>
 #include <errno.h>
 
+#ifdef __cplusplus
+#define UNUSED(x)
+#else
+#define UNUSED(x) x __attribute__((unused))
+#endif
+
 typedef thread_key_t __gthread_key_t;
 typedef struct {
   mutex_t mutex;
@@ -45,45 +52,60 @@ typedef struct {
 } __gthread_once_t;
 typedef mutex_t __gthread_mutex_t;
 
+typedef struct {
+  long depth;
+  thread_t owner;
+  mutex_t actual;
+} __gthread_recursive_mutex_t;
+
 #define __GTHREAD_ONCE_INIT { DEFAULTMUTEX, 0 }
 #define __GTHREAD_MUTEX_INIT DEFAULTMUTEX
+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
 
 #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 thr_keycreate
-#pragma weak thr_getspecific
-#pragma weak thr_setspecific
-#pragma weak thr_create
+__gthrw(thr_keycreate)
+__gthrw(thr_getspecific)
+__gthrw(thr_setspecific)
+__gthrw(thr_create)
+__gthrw(thr_self)
 
-#pragma weak mutex_lock
-#pragma weak mutex_trylock
-#pragma weak mutex_unlock
+__gthrw(mutex_init)
+__gthrw(mutex_destroy)
+__gthrw(mutex_lock)
+__gthrw(mutex_trylock)
+__gthrw(mutex_unlock)
 
 #ifdef _LIBOBJC
-#pragma weak thr_exit
-#pragma weak thr_keycreate
-#pragma weak thr_getprio
-#pragma weak thr_self
-#pragma weak thr_setprio
-#pragma weak thr_yield
-
-#pragma weak cond_init
-#pragma weak cond_destroy
-#pragma weak cond_wait
-#pragma weak cond_broadcast
-#pragma weak cond_signal
-
-#pragma weak mutex_init
-#pragma weak mutex_destroy
+__gthrw(thr_exit)
+__gthrw(thr_getprio)
+__gthrw(thr_setprio)
+__gthrw(thr_yield)
+
+__gthrw(cond_init)
+__gthrw(cond_destroy)
+__gthrw(cond_wait)
+__gthrw(cond_broadcast)
+__gthrw(cond_signal)
+
 #endif
 
+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+
 /* This will not actually work in Solaris 2.5, since libc contains
    dummy symbols of all thr_* routines.  */
 
 static inline int
 __gthread_active_p (void)
 {
-  static void *const __gthread_active_ptr = (void *) &thr_create;
+  static void *const __gthread_active_ptr = (void *) &__gthrw_(thr_create);
   return __gthread_active_ptr != 0;
 }
 
@@ -111,9 +133,9 @@ static void *thread_local_storage = NULL;
 static inline int
 __gthread_objc_init_thread_system (void)
 {
-  /* Initialize the thread storage key */
+  /* Initialize the thread storage key.  */
   if (__gthread_active_p ()
-      && thr_keycreate (&_objc_thread_storage, NULL) == 0)
+      && __gthrw_(thr_keycreate) (&_objc_thread_storage, NULL) == 0)
     return 0;
 
   return -1;
@@ -141,7 +163,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
   if (!__gthread_active_p ())
     return NULL;
 
-  if (thr_create (NULL, 0, (void *) func, arg,
+  if (__gthrw_(thr_create) (NULL, 0, (void *) func, arg,
 		  THR_DETACHED | THR_NEW_LWP,
 		  &new_thread_id) == 0)
     thread_id = *(objc_thread_t *) &new_thread_id;
@@ -175,7 +197,7 @@ __gthread_objc_thread_set_priority (int priority)
     }
 
   /* Change priority */
-  if (thr_setprio (thr_self (), sys_priority) == 0)
+  if (__gthrw_(thr_setprio) (__gthrw_(thr_self) (), sys_priority) == 0)
     return 0;
   else
     return -1;
@@ -190,7 +212,7 @@ __gthread_objc_thread_get_priority (void)
   if (!__gthread_active_p ())
     return OBJC_THREAD_INTERACTIVE_PRIORITY;
 
-  if (thr_getprio (thr_self (), &sys_priority) == 0)
+  if (__gthrw_(thr_getprio) (__gthrw_(thr_self) (), &sys_priority) == 0)
     {
       if (sys_priority >= 250)
 	return OBJC_THREAD_INTERACTIVE_PRIORITY;
@@ -208,7 +230,7 @@ static inline void
 __gthread_objc_thread_yield (void)
 {
   if (__gthread_active_p ())
-    thr_yield ();
+    __gthrw_(thr_yield) ();
 }
 
 /* Terminate the current thread.  */
@@ -217,7 +239,7 @@ __gthread_objc_thread_exit (void)
 {
   if (__gthread_active_p ())
     /* exit the thread */
-    thr_exit (&__objc_thread_exit_status);
+    __gthrw_(thr_exit) (&__objc_thread_exit_status);
 
   /* Failed if we reached here */
   return -1;
@@ -228,7 +250,7 @@ static inline objc_thread_t
 __gthread_objc_thread_id (void)
 {
   if (__gthread_active_p ())
-    return (objc_thread_t) thr_self ();
+    return (objc_thread_t) __gthrw_(thr_self) ();
   else
     return (objc_thread_t) 1;
 }
@@ -239,7 +261,7 @@ __gthread_objc_thread_set_data (void *value)
 {
   if (__gthread_active_p ())
     {
-      if (thr_setspecific (_objc_thread_storage, value) == 0)
+      if (__gthrw_(thr_setspecific) (_objc_thread_storage, value) == 0)
 	return 0;
       else
 	return -1;
@@ -259,7 +281,7 @@ __gthread_objc_thread_get_data (void)
 
   if (__gthread_active_p ())
     {
-      if (thr_getspecific (_objc_thread_storage, &value) == 0)
+      if (__gthrw_(thr_getspecific) (_objc_thread_storage, &value) == 0)
 	return value;
       else
 	return NULL;
@@ -275,7 +297,7 @@ static inline int
 __gthread_objc_mutex_allocate (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && mutex_init ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
+      && __gthrw_(mutex_init) ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
     return -1;
 
   return 0;
@@ -286,7 +308,7 @@ static inline int
 __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
-    mutex_destroy ((mutex_t *) (&(mutex->backend)));
+    __gthrw_(mutex_destroy) ((mutex_t *) (&(mutex->backend)));
 
   return 0;
 }
@@ -296,7 +318,7 @@ static inline int
 __gthread_objc_mutex_lock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && mutex_lock ((mutex_t *) (&(mutex->backend))) != 0)
+      && __gthrw_(mutex_lock) ((mutex_t *) (&(mutex->backend))) != 0)
     return -1;
 
   return 0;
@@ -307,7 +329,7 @@ static inline int
 __gthread_objc_mutex_trylock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && mutex_trylock ((mutex_t *) (&(mutex->backend))) != 0)
+      && __gthrw_(mutex_trylock) ((mutex_t *) (&(mutex->backend))) != 0)
     return -1;
 
   return 0;
@@ -318,7 +340,7 @@ static inline int
 __gthread_objc_mutex_unlock (objc_mutex_t mutex)
 {
   if (__gthread_active_p ()
-      && mutex_unlock ((mutex_t *) (&(mutex->backend))) != 0)
+      && __gthrw_(mutex_unlock) ((mutex_t *) (&(mutex->backend))) != 0)
     return -1;
 
   return 0;
@@ -331,7 +353,7 @@ static inline int
 __gthread_objc_condition_allocate (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return cond_init ((cond_t *) (&(condition->backend)), USYNC_THREAD,
+    return __gthrw_(cond_init) ((cond_t *) (&(condition->backend)), USYNC_THREAD,
 		      NULL);
   else
     return 0;
@@ -342,7 +364,7 @@ static inline int
 __gthread_objc_condition_deallocate (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return cond_destroy ((cond_t *) (&(condition->backend)));
+    return __gthrw_(cond_destroy) ((cond_t *) (&(condition->backend)));
   else
     return 0;
 }
@@ -352,7 +374,7 @@ static inline int
 __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
 {
   if (__gthread_active_p ())
-    return cond_wait ((cond_t *) (&(condition->backend)),
+    return __gthrw_(cond_wait) ((cond_t *) (&(condition->backend)),
 		      (mutex_t *) (&(mutex->backend)));
   else
     return 0;
@@ -363,7 +385,7 @@ static inline int
 __gthread_objc_condition_broadcast (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return cond_broadcast ((cond_t *) (&(condition->backend)));
+    return __gthrw_(cond_broadcast) ((cond_t *) (&(condition->backend)));
   else
     return 0;
 }
@@ -373,7 +395,7 @@ static inline int
 __gthread_objc_condition_signal (objc_condition_t condition)
 {
   if (__gthread_active_p ())
-    return cond_signal ((cond_t *) (&(condition->backend)));
+    return __gthrw_(cond_signal) ((cond_t *) (&(condition->backend)));
   else
     return 0;
 }
@@ -391,7 +413,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
 
   if (once->once == 0)
     {
-      int status = mutex_lock (&once->mutex);
+      int status = __gthrw_(mutex_lock) (&once->mutex);
       if (status != 0)
 	return status;
       if (once->once == 0)
@@ -399,7 +421,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
 	  (*func) ();
 	  once->once++;
 	}
-      mutex_unlock (&once->mutex);
+      __gthrw_(mutex_unlock) (&once->mutex);
     }
   return 0;
 }
@@ -409,15 +431,15 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 {
   /* Solaris 2.5 contains thr_* routines no-op in libc, so test if we actually
      got a reasonable key value, and if not, fail.  */
-  *key = -1;
-  if (thr_keycreate (key, dtor) != 0 || *key == -1)
+  *key = (__gthread_key_t)-1;
+  if (__gthrw_(thr_keycreate) (key, dtor) != 0 || *key == (__gthread_key_t)-1)
     return -1;
   else
     return 0;
 }
 
 static inline int
-__gthread_key_delete (__gthread_key_t key)
+__gthread_key_delete (__gthread_key_t UNUSED (key))
 {
   /* Not possible.  */
   return -1;
@@ -427,7 +449,7 @@ static inline void *
 __gthread_getspecific (__gthread_key_t key)
 {
   void *ptr;
-  if (thr_getspecific (key, &ptr) == 0)
+  if (__gthrw_(thr_getspecific) (key, &ptr) == 0)
     return ptr;
   else
     return 0;
@@ -436,14 +458,14 @@ __gthread_getspecific (__gthread_key_t key)
 static inline int
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
-  return thr_setspecific (key, (void *) ptr);
+  return __gthrw_(thr_setspecific) (key, (void *) ptr);
 }
 
 static inline int
 __gthread_mutex_lock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return mutex_lock (mutex);
+    return __gthrw_(mutex_lock) (mutex);
   else
     return 0;
 }
@@ -452,7 +474,7 @@ static inline int
 __gthread_mutex_trylock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return mutex_trylock (mutex);
+    return __gthrw_(mutex_trylock) (mutex);
   else
     return 0;
 }
@@ -461,11 +483,72 @@ static inline int
 __gthread_mutex_unlock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return mutex_unlock (mutex);
+    return __gthrw_(mutex_unlock) (mutex);
   else
     return 0;
 }
 
+static inline int
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+{
+  mutex->depth = 0;
+  mutex->owner = (thread_t) 0;
+  return __gthrw_(mutex_init) (&mutex->actual, USYNC_THREAD, 0);
+}
+
+static inline int
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    {
+      thread_t me = __gthrw_(thr_self) ();
+
+      if (mutex->owner != me)
+	{
+	  __gthrw_(mutex_lock) (&mutex->actual);
+	  mutex->owner = me;
+	}
+
+      mutex->depth++;
+    }
+  return 0;
+}
+
+static inline int
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    {
+      thread_t me = __gthrw_(thr_self) ();
+
+      if (mutex->owner != me)
+	{
+	  if (__gthrw_(mutex_trylock) (&mutex->actual))
+	    return 1;
+	  mutex->owner = me;
+	}
+
+      mutex->depth++;
+    }
+  return 0;
+}
+
+static inline int
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    {
+      if (--mutex->depth == 0)
+	{
+	   mutex->owner = (thread_t) 0;
+	   __gthrw_(mutex_unlock) (&mutex->actual);
+	}
+    }
+  return 0;
+}
+
 #endif /* _LIBOBJC */
 
+#undef UNUSED
+
 #endif /* ! GCC_GTHR_SOLARIS_H */