2008-06-15 Mark Shinwell <shinwell@codesourcery.com>

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

diff --git a/gcc/gthr-tpf.h b/gcc/gthr-tpf.h
index f797a49..fd80bd4 100644 (file)
--- a/gcc/gthr-tpf.h
+++ b/gcc/gthr-tpf.h
@@ -61,6 +61,7 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
 
 #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 NOTATHREAD   00
 #define ECBBASEPTR (unsigned long int) *(unsigned int *)0x00000514u
@@ -70,25 +71,28 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
 # define __gthrw(name) \
-  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
+# define __gthrw_(name) __gthrw_ ## name
 #else
-# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
-# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
-# define __gthrw_string(x) #x
-# define __gthrw(name) \
-  extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
+# define __gthrw(name)
+# define __gthrw_(name) name
 #endif
 
-__gthrw(pthread_once);
-__gthrw(pthread_key_create);
-__gthrw(pthread_key_delete);
-__gthrw(pthread_getspecific);
-__gthrw(pthread_setspecific);
-__gthrw(pthread_create);
-
-__gthrw(pthread_mutex_lock);
-__gthrw(pthread_mutex_trylock);
-__gthrw(pthread_mutex_unlock);
+__gthrw(pthread_once)
+__gthrw(pthread_key_create)
+__gthrw(pthread_key_delete)
+__gthrw(pthread_getspecific)
+__gthrw(pthread_setspecific)
+__gthrw(pthread_create)
+
+__gthrw(pthread_mutex_lock)
+__gthrw(pthread_mutex_trylock)
+__gthrw(pthread_mutex_unlock)
+__gthrw(pthread_mutexattr_init)
+__gthrw(pthread_mutexattr_settype)
+__gthrw(pthread_mutexattr_destroy)
+__gthrw(pthread_mutex_init)
+__gthrw(pthread_mutex_destroy)
 
 static inline int
 __gthread_active_p (void)
@@ -100,7 +104,7 @@ static inline int
 __gthread_once (__gthread_once_t *once, void (*func) (void))
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_once (once, func);
+    return __gthrw_(pthread_once) (once, func);
   else
     return -1;
 }
@@ -109,7 +113,7 @@ static inline int
 __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_key_create (key, dtor);
+    return __gthrw_(pthread_key_create) (key, dtor);
   else
     return -1;
 }
@@ -118,7 +122,7 @@ static inline int
 __gthread_key_delete (__gthread_key_t key)
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_key_delete (key);
+    return __gthrw_(pthread_key_delete) (key);
   else
     return -1;
 }
@@ -127,7 +131,7 @@ static inline void *
 __gthread_getspecific (__gthread_key_t key)
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_getspecific (key);
+    return __gthrw_(pthread_getspecific) (key);
   else
     return NULL;
 }
@@ -136,16 +140,25 @@ static inline int
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_setspecific (key, ptr);
+    return __gthrw_(pthread_setspecific) (key, ptr);
   else
     return -1;
 }
 
 static inline int
+__gthread_mutex_destroy (__gthread_mutex_t *mutex)
+{
+  if (__tpf_pthread_active ())
+    return __gthrw_(pthread_mutex_destroy) (mutex);
+  else
+    return 0;
+}
+
+static inline int
 __gthread_mutex_lock (__gthread_mutex_t *mutex)
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_mutex_lock (mutex);
+    return __gthrw_(pthread_mutex_lock) (mutex);
   else
     return 0;
 }
@@ -154,7 +167,7 @@ static inline int
 __gthread_mutex_trylock (__gthread_mutex_t *mutex)
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_mutex_trylock (mutex);
+    return __gthrw_(pthread_mutex_trylock) (mutex);
   else
     return 0;
 }
@@ -163,7 +176,7 @@ static inline int
 __gthread_mutex_unlock (__gthread_mutex_t *mutex)
 {
   if (__tpf_pthread_active ())
-    return __gthrw_pthread_mutex_unlock (mutex);
+    return __gthrw_(pthread_mutex_unlock) (mutex);
   else
     return 0;
 }
@@ -195,4 +208,25 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
     return 0;
 }
 
+static inline int
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+{ 
+  if (__tpf_pthread_active ())
+    {
+      pthread_mutexattr_t attr;
+      int r;
+
+      r = __gthrw_(pthread_mutexattr_init) (&attr);
+      if (!r)
+       r = __gthrw_(pthread_mutexattr_settype) (&attr, PTHREAD_MUTEX_RECURSIVE);
+      if (!r)
+       r = __gthrw_(pthread_mutex_init) (mutex, &attr);
+      if (!r)
+       r = __gthrw_(pthread_mutexattr_destroy) (&attr);
+      return r;
+    }
+  return 0;
+}
+
+
 #endif /* ! GCC_GTHR_TPF_H */