Skip to content

R
riscv-gcc-1
Commit 7ef67393 by Alexandre Oliva Committed by Alexandre Oliva
Options

re PR other/4372 (#pragma weak pthread* inclusion causes applications to crash… 

re PR other/4372 (#pragma weak pthread* inclusion causes applications to crash without a linker error when one forgets to link with -lpthread)

gcc/ChangeLog:
PR other/4372
* gthr-dce.h, gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
gthr-tpf.h: Define __gthrw.  For all identifiers that might
be weak, introduce weakrefs or non-weak aliases with __gthrw,
and prefix all uses with __ghtrw.
libobjc/ChangeLog:
PR other/4372
* thr-objc.c (_XOPEN_SOURCE): Define.

From-SVN: r106704
parent a0203ca7
Showing with 349 additions and 279 deletions
gcc/ChangeLog
2005-11-09 Alexandre Oliva <aoliva@redhat.com> 2005-11-09 Alexandre Oliva <aoliva@redhat.com>
PR other/4372 PR other/4372
* gthr-dce.h, gthr-posix.h, gthr-posix95.h, gthr-solaris.h,
gthr-tpf.h: Define __gthrw. For all identifiers that might
be weak, introduce weakrefs or non-weak aliases with __gthrw,
and prefix all uses with __ghtrw.
2005-11-09 Alexandre Oliva <aoliva@redhat.com>
PR other/4372
* tree.h (IDENTIFIER_TRANSPARENT_ALIAS): New. * tree.h (IDENTIFIER_TRANSPARENT_ALIAS): New.
(TREE_DEPRECATED): Adjust comment. Check for a DECL. (TREE_DEPRECATED): Adjust comment. Check for a DECL.
* c-common.c (handle_weakref_attribute): New. * c-common.c (handle_weakref_attribute): New.
......
gcc/gthr-dce.h
/* Threads compatibility routines for libgcc2 and libobjc. */ /* Threads compatibility routines for libgcc2 and libobjc. */
/* Compile this one with gcc. */ /* Compile this one with gcc. */
/* Copyright (C) 1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. /* Copyright (C) 1997, 1999, 2000, 2001, 2004, 2005
Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -54,48 +55,59 @@ typedef pthread_once_t __gthread_once_t; ...@@ -54,48 +55,59 @@ typedef pthread_once_t __gthread_once_t;
typedef pthread_mutex_t __gthread_mutex_t; typedef pthread_mutex_t __gthread_mutex_t;
typedef pthread_mutex_t __gthread_recursive_mutex_t; typedef pthread_mutex_t __gthread_recursive_mutex_t;
#define __GTHREAD_ONCE_INIT pthread_once_init #define __GTHREAD_ONCE_INIT __gthrw_pthread_once_init
#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function #define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function #define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#define __GTHREAD_MUTEX_INIT_DEFAULT pthread_once_init #define __GTHREAD_MUTEX_INIT_DEFAULT __gthrw_pthread_once_init
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#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))
#endif
#pragma weak pthread_once __gthrw(pthread_once);
#pragma weak pthread_once_init __gthrw(pthread_once_init);
#pragma weak pthread_keycreate __gthrw(pthread_keycreate);
#pragma weak pthread_key_delete __gthrw(pthread_key_delete);
#pragma weak pthread_getspecific __gthrw(pthread_getspecific);
#pragma weak pthread_setspecific __gthrw(pthread_setspecific);
#pragma weak pthread_create __gthrw(pthread_create);
#pragma weak pthread_mutex_init __gthrw(pthread_mutex_init);
#pragma weak pthread_mutex_lock __gthrw(pthread_mutex_lock);
#pragma weak pthread_mutex_trylock __gthrw(pthread_mutex_trylock);
#pragma weak pthread_mutex_unlock __gthrw(pthread_mutex_unlock);
#pragma weak pthread_mutexattr_create __gthrw(pthread_mutexattr_create);
#pragma weak pthread_mutexattr_setkind_np __gthrw(pthread_mutexattr_setkind_np);
#pragma weak pthread_mutexattr_delete __gthrw(pthread_mutexattr_delete);
#ifdef _LIBOBJC #ifdef _LIBOBJC
/* Objective-C. */ /* Objective-C. */
#pragma weak pthread_cond_broadcast __gthrw(pthread_cond_broadcast);
#pragma weak pthread_cond_destroy __gthrw(pthread_cond_destroy);
#pragma weak pthread_cond_init __gthrw(pthread_cond_init);
#pragma weak pthread_cond_signal __gthrw(pthread_cond_signal);
#pragma weak pthread_cond_wait __gthrw(pthread_cond_wait);
#pragma weak pthread_exit __gthrw(pthread_exit);
#pragma weak pthread_getunique_np __gthrw(pthread_getunique_np);
#pragma weak pthread_mutex_destroy __gthrw(pthread_mutex_destroy);
#pragma weak pthread_self __gthrw(pthread_self);
#pragma weak pthread_yield __gthrw(pthread_yield);
#endif #endif
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
static inline int static inline int
__gthread_active_p (void) __gthread_active_p (void)
{ {
static void *const __gthread_active_ptr = (void *) &pthread_create; static void *const __gthread_active_ptr = (void *) &__gthrw_pthread_create;
return __gthread_active_ptr != 0; return __gthread_active_ptr != 0;
} }
...@@ -125,7 +137,7 @@ __gthread_objc_init_thread_system (void) ...@@ -125,7 +137,7 @@ __gthread_objc_init_thread_system (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
/* Initialize the thread storage key. */ /* Initialize the thread storage key. */
return pthread_keycreate (&_objc_thread_storage, NULL); return __gthrw_pthread_keycreate (&_objc_thread_storage, NULL);
else else
return -1; return -1;
} }
...@@ -152,7 +164,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg) ...@@ -152,7 +164,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ()) if (!__gthread_active_p ())
return NULL; return NULL;
if (!(pthread_create (&new_thread_handle, pthread_attr_default, if (!(__gthrw_pthread_create (&new_thread_handle, pthread_attr_default,
(void *) func, arg))) (void *) func, arg)))
{ {
/* ??? May not work! (64bit) */ /* ??? May not work! (64bit) */
...@@ -189,7 +201,7 @@ __gthread_objc_thread_set_priority (int priority) ...@@ -189,7 +201,7 @@ __gthread_objc_thread_set_priority (int priority)
} }
/* Change the priority. */ /* Change the priority. */
if (pthread_setprio (pthread_self (), sys_priority) >= 0) if (pthread_setprio (__gthrw_pthread_self (), sys_priority) >= 0)
return 0; return 0;
else else
/* Failed */ /* Failed */
...@@ -204,7 +216,7 @@ __gthread_objc_thread_get_priority (void) ...@@ -204,7 +216,7 @@ __gthread_objc_thread_get_priority (void)
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
if ((sys_priority = pthread_getprio (pthread_self ())) >= 0) if ((sys_priority = pthread_getprio (__gthrw_pthread_self ())) >= 0)
{ {
if (sys_priority >= PRI_FG_MIN_NP if (sys_priority >= PRI_FG_MIN_NP
&& sys_priority <= PRI_FG_MAX_NP) && sys_priority <= PRI_FG_MAX_NP)
...@@ -227,7 +239,7 @@ static inline void ...@@ -227,7 +239,7 @@ static inline void
__gthread_objc_thread_yield (void) __gthread_objc_thread_yield (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
pthread_yield (); __gthrw_pthread_yield ();
} }
/* Terminate the current thread. */ /* Terminate the current thread. */
...@@ -236,7 +248,7 @@ __gthread_objc_thread_exit (void) ...@@ -236,7 +248,7 @@ __gthread_objc_thread_exit (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
/* exit the thread */ /* exit the thread */
pthread_exit (&__objc_thread_exit_status); __gthrw_pthread_exit (&__objc_thread_exit_status);
/* Failed if we reached here */ /* Failed if we reached here */
return -1; return -1;
...@@ -248,9 +260,9 @@ __gthread_objc_thread_id (void) ...@@ -248,9 +260,9 @@ __gthread_objc_thread_id (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
pthread_t self = pthread_self (); pthread_t self = __gthrw_pthread_self ();
return (objc_thread_t) pthread_getunique_np (&self); return (objc_thread_t) __gthrw_pthread_getunique_np (&self);
} }
else else
return (objc_thread_t) 1; return (objc_thread_t) 1;
...@@ -261,7 +273,7 @@ static inline int ...@@ -261,7 +273,7 @@ static inline int
__gthread_objc_thread_set_data (void *value) __gthread_objc_thread_set_data (void *value)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_setspecific (_objc_thread_storage, value); return __gthrw_pthread_setspecific (_objc_thread_storage, value);
else else
{ {
thread_local_storage = value; thread_local_storage = value;
...@@ -277,7 +289,7 @@ __gthread_objc_thread_get_data (void) ...@@ -277,7 +289,7 @@ __gthread_objc_thread_get_data (void)
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
if (!(pthread_getspecific (_objc_thread_storage, &value))) if (!(__gthrw_pthread_getspecific (_objc_thread_storage, &value)))
return value; return value;
return NULL; return NULL;
...@@ -296,7 +308,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex) ...@@ -296,7 +308,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, if (__gthrw_pthread_mutex_init ((pthread_mutex_t *) mutex->backend,
pthread_mutexattr_default)) pthread_mutexattr_default))
{ {
objc_free (mutex->backend); objc_free (mutex->backend);
...@@ -314,7 +326,7 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex) ...@@ -314,7 +326,7 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend)) if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
return -1; return -1;
objc_free (mutex->backend); objc_free (mutex->backend);
...@@ -329,7 +341,7 @@ static inline int ...@@ -329,7 +341,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex) __gthread_objc_mutex_lock (objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_mutex_lock ((pthread_mutex_t *) mutex->backend); return __gthrw_pthread_mutex_lock ((pthread_mutex_t *) mutex->backend);
else else
return 0; return 0;
} }
...@@ -339,7 +351,7 @@ static inline int ...@@ -339,7 +351,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex) __gthread_objc_mutex_trylock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () if (__gthread_active_p ()
&& pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 1) && __gthrw_pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 1)
return -1; return -1;
return 0; return 0;
...@@ -350,7 +362,7 @@ static inline int ...@@ -350,7 +362,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex) __gthread_objc_mutex_unlock (objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend); return __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
else else
return 0; return 0;
} }
...@@ -418,7 +430,7 @@ static inline int ...@@ -418,7 +430,7 @@ 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 else
return -1; return -1;
} }
...@@ -426,7 +438,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) ...@@ -426,7 +438,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
static inline int 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_keycreate (key, dtor); return __gthrw_pthread_keycreate (key, dtor);
} }
static inline int static inline int
...@@ -440,7 +452,7 @@ static inline void * ...@@ -440,7 +452,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key) __gthread_getspecific (__gthread_key_t key)
{ {
void *ptr; void *ptr;
if (pthread_getspecific (key, &ptr) == 0) if (__gthrw_pthread_getspecific (key, &ptr) == 0)
return ptr; return ptr;
else else
return 0; return 0;
...@@ -449,21 +461,21 @@ __gthread_getspecific (__gthread_key_t key) ...@@ -449,21 +461,21 @@ __gthread_getspecific (__gthread_key_t key)
static inline int static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr) __gthread_setspecific (__gthread_key_t key, const void *ptr)
{ {
return pthread_setspecific (key, (void *) ptr); return __gthrw_pthread_setspecific (key, (void *) ptr);
} }
static inline void static inline void
__gthread_mutex_init_function (__gthread_mutex_t *mutex) __gthread_mutex_init_function (__gthread_mutex_t *mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
pthread_mutex_init (mutex, pthread_mutexattr_default); __gthrw_pthread_mutex_init (mutex, pthread_mutexattr_default);
} }
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 else
return 0; return 0;
} }
...@@ -472,7 +484,7 @@ static inline int ...@@ -472,7 +484,7 @@ 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 else
return 0; return 0;
} }
...@@ -481,7 +493,7 @@ static inline int ...@@ -481,7 +493,7 @@ 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 else
return 0; return 0;
} }
...@@ -494,13 +506,13 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) ...@@ -494,13 +506,13 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
int r; int r;
r = pthread_mutexattr_create (&attr); r = __gthrw_pthread_mutexattr_create (&attr);
if (!r) if (!r)
r = pthread_mutexattr_setkind_np (&attr, MUTEX_RECURSIVE_NP); r = __gthrw_pthread_mutexattr_setkind_np (&attr, MUTEX_RECURSIVE_NP);
if (!r) if (!r)
r = pthread_mutex_init (mutex, attr); r = __gthrw_pthread_mutex_init (mutex, attr);
if (!r) if (!r)
r = pthread_mutexattr_delete (&attr); r = __gthrw_pthread_mutexattr_delete (&attr);
return r; return r;
} }
} }
......
gcc/gthr-posix.h
...@@ -59,55 +59,66 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t; ...@@ -59,55 +59,66 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
#endif #endif
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#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))
#endif
#pragma weak pthread_once __gthrw(pthread_once);
#pragma weak pthread_key_create __gthrw(pthread_key_create);
#pragma weak pthread_key_delete __gthrw(pthread_key_delete);
#pragma weak pthread_getspecific __gthrw(pthread_getspecific);
#pragma weak pthread_setspecific __gthrw(pthread_setspecific);
#pragma weak pthread_create __gthrw(pthread_create);
#pragma weak pthread_cancel __gthrw(pthread_cancel);
#pragma weak pthread_mutex_lock __gthrw(pthread_mutex_lock);
#pragma weak pthread_mutex_trylock __gthrw(pthread_mutex_trylock);
#pragma weak pthread_mutex_unlock __gthrw(pthread_mutex_unlock);
#pragma weak pthread_mutexattr_init __gthrw(pthread_mutexattr_init);
#pragma weak pthread_mutexattr_settype __gthrw(pthread_mutexattr_settype);
#pragma weak pthread_mutexattr_destroy __gthrw(pthread_mutexattr_destroy);
#pragma weak pthread_mutex_init __gthrw(pthread_mutex_init);
#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK) #if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
/* Objective-C. */ /* Objective-C. */
#pragma weak pthread_cond_broadcast __gthrw(pthread_cond_broadcast);
#pragma weak pthread_cond_destroy __gthrw(pthread_cond_destroy);
#pragma weak pthread_cond_init __gthrw(pthread_cond_init);
#pragma weak pthread_cond_signal __gthrw(pthread_cond_signal);
#pragma weak pthread_cond_wait __gthrw(pthread_cond_wait);
#pragma weak pthread_exit __gthrw(pthread_exit);
#pragma weak pthread_mutex_destroy __gthrw(pthread_mutex_destroy);
#pragma weak pthread_self __gthrw(pthread_self);
#ifdef _POSIX_PRIORITY_SCHEDULING #ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
#pragma weak sched_get_priority_max __gthrw(sched_get_priority_max);
#pragma weak sched_get_priority_min __gthrw(sched_get_priority_min);
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _POSIX_PRIORITY_SCHEDULING */ #endif /* _POSIX_PRIORITY_SCHEDULING */
#pragma weak sched_yield __gthrw(sched_yield);
#pragma weak pthread_attr_destroy __gthrw(pthread_attr_destroy);
#pragma weak pthread_attr_init __gthrw(pthread_attr_init);
#pragma weak pthread_attr_setdetachstate __gthrw(pthread_attr_setdetachstate);
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
#pragma weak pthread_getschedparam __gthrw(pthread_getschedparam);
#pragma weak pthread_setschedparam __gthrw(pthread_setschedparam);
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _LIBOBJC || _LIBOBJC_WEAK */ #endif /* _LIBOBJC || _LIBOBJC_WEAK */
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
static inline int static inline int
__gthread_active_p (void) __gthread_active_p (void)
{ {
static void *const __gthread_active_ptr static void *const __gthread_active_ptr
= __extension__ (void *) &pthread_cancel; = __extension__ (void *) &__gthrw_pthread_cancel;
return __gthread_active_ptr != 0; return __gthread_active_ptr != 0;
} }
...@@ -146,13 +157,13 @@ __gthread_objc_init_thread_system (void) ...@@ -146,13 +157,13 @@ __gthread_objc_init_thread_system (void)
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
/* Initialize the thread storage key. */ /* 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 /* The normal default detach state for threads is
* PTHREAD_CREATE_JOINABLE which causes threads to not die * PTHREAD_CREATE_JOINABLE which causes threads to not die
* when you think they should. */ * when you think they should. */
if (pthread_attr_init (&_objc_thread_attribs) == 0 if (__gthrw_pthread_attr_init (&_objc_thread_attribs) == 0
&& pthread_attr_setdetachstate (&_objc_thread_attribs, && __gthrw_pthread_attr_setdetachstate (&_objc_thread_attribs,
PTHREAD_CREATE_DETACHED) == 0) PTHREAD_CREATE_DETACHED) == 0)
return 0; return 0;
} }
...@@ -166,8 +177,8 @@ static inline int ...@@ -166,8 +177,8 @@ static inline int
__gthread_objc_close_thread_system (void) __gthread_objc_close_thread_system (void)
{ {
if (__gthread_active_p () if (__gthread_active_p ()
&& pthread_key_delete (_objc_thread_storage) == 0 && __gthrw_pthread_key_delete (_objc_thread_storage) == 0
&& pthread_attr_destroy (&_objc_thread_attribs) == 0) && __gthrw_pthread_attr_destroy (&_objc_thread_attribs) == 0)
return 0; return 0;
return -1; return -1;
...@@ -185,7 +196,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg) ...@@ -185,7 +196,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ()) if (!__gthread_active_p ())
return NULL; 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; thread_id = (objc_thread_t) new_thread_handle;
else else
thread_id = NULL; thread_id = NULL;
...@@ -203,17 +214,17 @@ __gthread_objc_thread_set_priority (int priority) ...@@ -203,17 +214,17 @@ __gthread_objc_thread_set_priority (int priority)
{ {
#ifdef _POSIX_PRIORITY_SCHEDULING #ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_t thread_id = pthread_self (); pthread_t thread_id = __gthrw_pthread_self ();
int policy; int policy;
struct sched_param params; struct sched_param params;
int priority_min, priority_max; 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; return -1;
if (priority > priority_max) if (priority > priority_max)
...@@ -227,7 +238,7 @@ __gthread_objc_thread_set_priority (int priority) ...@@ -227,7 +238,7 @@ __gthread_objc_thread_set_priority (int priority)
* this should be a pointer to policy but pthread.h is universally * this should be a pointer to policy but pthread.h is universally
* at odds with this. * at odds with this.
*/ */
if (pthread_setschedparam (thread_id, policy, &params) == 0) if (__gthrw_pthread_setschedparam (thread_id, policy, &params) == 0)
return 0; return 0;
} }
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
...@@ -247,7 +258,7 @@ __gthread_objc_thread_get_priority (void) ...@@ -247,7 +258,7 @@ __gthread_objc_thread_get_priority (void)
int policy; int policy;
struct sched_param params; 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; return params.sched_priority;
else else
return -1; return -1;
...@@ -263,7 +274,7 @@ static inline void ...@@ -263,7 +274,7 @@ static inline void
__gthread_objc_thread_yield (void) __gthread_objc_thread_yield (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
sched_yield (); __gthrw_sched_yield ();
} }
/* Terminate the current thread. */ /* Terminate the current thread. */
...@@ -272,7 +283,7 @@ __gthread_objc_thread_exit (void) ...@@ -272,7 +283,7 @@ __gthread_objc_thread_exit (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
/* exit the thread */ /* exit the thread */
pthread_exit (&__objc_thread_exit_status); __gthrw_pthread_exit (&__objc_thread_exit_status);
/* Failed if we reached here */ /* Failed if we reached here */
return -1; return -1;
...@@ -283,7 +294,7 @@ static inline objc_thread_t ...@@ -283,7 +294,7 @@ static inline objc_thread_t
__gthread_objc_thread_id (void) __gthread_objc_thread_id (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return (objc_thread_t) pthread_self (); return (objc_thread_t) __gthrw_pthread_self ();
else else
return (objc_thread_t) 1; return (objc_thread_t) 1;
} }
...@@ -293,7 +304,7 @@ static inline int ...@@ -293,7 +304,7 @@ static inline int
__gthread_objc_thread_set_data (void *value) __gthread_objc_thread_set_data (void *value)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_setspecific (_objc_thread_storage, value); return __gthrw_pthread_setspecific (_objc_thread_storage, value);
else else
{ {
thread_local_storage = value; thread_local_storage = value;
...@@ -306,7 +317,7 @@ static inline void * ...@@ -306,7 +317,7 @@ static inline void *
__gthread_objc_thread_get_data (void) __gthread_objc_thread_get_data (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_getspecific (_objc_thread_storage); return __gthrw_pthread_getspecific (_objc_thread_storage);
else else
return thread_local_storage; return thread_local_storage;
} }
...@@ -321,7 +332,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex) ...@@ -321,7 +332,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); objc_free (mutex->backend);
mutex->backend = NULL; mutex->backend = NULL;
...@@ -342,18 +353,18 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex) ...@@ -342,18 +353,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) if (count < 0)
return -1; return -1;
} }
while (count); while (count);
if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend)) if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
return -1; return -1;
objc_free (mutex->backend); objc_free (mutex->backend);
...@@ -367,7 +378,7 @@ static inline int ...@@ -367,7 +378,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex) __gthread_objc_mutex_lock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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;
} }
...@@ -380,7 +391,7 @@ static inline int ...@@ -380,7 +391,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex) __gthread_objc_mutex_trylock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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;
} }
...@@ -393,7 +404,7 @@ static inline int ...@@ -393,7 +404,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex) __gthread_objc_mutex_unlock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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;
} }
...@@ -411,7 +422,7 @@ __gthread_objc_condition_allocate (objc_condition_t condition) ...@@ -411,7 +422,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); objc_free (condition->backend);
condition->backend = NULL; condition->backend = NULL;
...@@ -428,7 +439,7 @@ __gthread_objc_condition_deallocate (objc_condition_t condition) ...@@ -428,7 +439,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; return -1;
objc_free (condition->backend); objc_free (condition->backend);
...@@ -442,7 +453,7 @@ static inline int ...@@ -442,7 +453,7 @@ static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex) __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) 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); (pthread_mutex_t *) mutex->backend);
else else
return 0; return 0;
...@@ -453,7 +464,7 @@ static inline int ...@@ -453,7 +464,7 @@ static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition) __gthread_objc_condition_broadcast (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_cond_broadcast ((pthread_cond_t *) condition->backend); return __gthrw_pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
else else
return 0; return 0;
} }
...@@ -463,7 +474,7 @@ static inline int ...@@ -463,7 +474,7 @@ static inline int
__gthread_objc_condition_signal (objc_condition_t condition) __gthread_objc_condition_signal (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_cond_signal ((pthread_cond_t *) condition->backend); return __gthrw_pthread_cond_signal ((pthread_cond_t *) condition->backend);
else else
return 0; return 0;
} }
...@@ -474,7 +485,7 @@ static inline int ...@@ -474,7 +485,7 @@ 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 else
return -1; return -1;
} }
...@@ -482,32 +493,32 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) ...@@ -482,32 +493,32 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
static inline int 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 pthread_getspecific (key); return __gthrw_pthread_getspecific (key);
} }
static inline int static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr) __gthread_setspecific (__gthread_key_t key, const void *ptr)
{ {
return pthread_setspecific (key, ptr); return __gthrw_pthread_setspecific (key, ptr);
} }
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 else
return 0; return 0;
} }
...@@ -516,7 +527,7 @@ static inline int ...@@ -516,7 +527,7 @@ 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 else
return 0; return 0;
} }
...@@ -525,7 +536,7 @@ static inline int ...@@ -525,7 +536,7 @@ 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 else
return 0; return 0;
} }
...@@ -539,13 +550,13 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) ...@@ -539,13 +550,13 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
int r; int r;
r = pthread_mutexattr_init (&attr); r = __gthrw_pthread_mutexattr_init (&attr);
if (!r) if (!r)
r = pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); r = __gthrw_pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
if (!r) if (!r)
r = pthread_mutex_init (mutex, &attr); r = __gthrw_pthread_mutex_init (mutex, &attr);
if (!r) if (!r)
r = pthread_mutexattr_destroy (&attr); r = __gthrw_pthread_mutexattr_destroy (&attr);
return r; return r;
} }
return 0; return 0;
......
gcc/gthr-posix95.h
...@@ -57,56 +57,67 @@ typedef struct { ...@@ -57,56 +57,67 @@ typedef struct {
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function #define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#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))
#endif
#pragma weak pthread_once __gthrw(pthread_once);
#pragma weak pthread_key_create __gthrw(pthread_key_create);
#pragma weak pthread_key_delete __gthrw(pthread_key_delete);
#pragma weak pthread_getspecific __gthrw(pthread_getspecific);
#pragma weak pthread_setspecific __gthrw(pthread_setspecific);
#pragma weak pthread_create __gthrw(pthread_create);
#pragma weak pthread_cancel __gthrw(pthread_cancel);
#pragma weak pthread_self __gthrw(pthread_self);
#pragma weak pthread_mutex_lock __gthrw(pthread_mutex_lock);
#pragma weak pthread_mutex_trylock __gthrw(pthread_mutex_trylock);
#pragma weak pthread_mutex_unlock __gthrw(pthread_mutex_unlock);
#pragma weak pthread_mutexattr_init __gthrw(pthread_mutexattr_init);
#pragma weak pthread_mutexattr_settype __gthrw(pthread_mutexattr_settype);
#pragma weak pthread_mutexattr_destroy __gthrw(pthread_mutexattr_destroy);
#pragma weak pthread_mutex_init __gthrw(pthread_mutex_init);
#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK) #if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
/* Objective-C. */ /* Objective-C. */
#pragma weak pthread_cond_broadcast __gthrw(pthread_cond_broadcast);
#pragma weak pthread_cond_destroy __gthrw(pthread_cond_destroy);
#pragma weak pthread_cond_init __gthrw(pthread_cond_init);
#pragma weak pthread_cond_signal __gthrw(pthread_cond_signal);
#pragma weak pthread_cond_wait __gthrw(pthread_cond_wait);
#pragma weak pthread_exit __gthrw(pthread_exit);
#pragma weak pthread_mutex_destroy __gthrw(pthread_mutex_destroy);
#pragma weak pthread_self __gthrw(pthread_self);
#ifdef _POSIX_PRIORITY_SCHEDULING #ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
#pragma weak sched_get_priority_max __gthrw(sched_get_priority_max);
#pragma weak sched_get_priority_min __gthrw(sched_get_priority_min);
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _POSIX_PRIORITY_SCHEDULING */ #endif /* _POSIX_PRIORITY_SCHEDULING */
#pragma weak sched_yield __gthrw(sched_yield);
#pragma weak pthread_attr_destroy __gthrw(pthread_attr_destroy);
#pragma weak pthread_attr_init __gthrw(pthread_attr_init);
#pragma weak pthread_attr_setdetachstate __gthrw(pthread_attr_setdetachstate);
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
#pragma weak pthread_getschedparam __gthrw(pthread_getschedparam);
#pragma weak pthread_setschedparam __gthrw(pthread_setschedparam);
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _LIBOBJC || _LIBOBJC_WEAK */ #endif /* _LIBOBJC || _LIBOBJC_WEAK */
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
static inline int static inline int
__gthread_active_p (void) __gthread_active_p (void)
{ {
static void *const __gthread_active_ptr static void *const __gthread_active_ptr
= __extension__ (void *) &pthread_cancel; = __extension__ (void *) &__gthrw_pthread_cancel;
return __gthread_active_ptr != 0; return __gthread_active_ptr != 0;
} }
...@@ -145,13 +156,13 @@ __gthread_objc_init_thread_system (void) ...@@ -145,13 +156,13 @@ __gthread_objc_init_thread_system (void)
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
/* Initialize the thread storage key. */ /* 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 /* The normal default detach state for threads is
* PTHREAD_CREATE_JOINABLE which causes threads to not die * PTHREAD_CREATE_JOINABLE which causes threads to not die
* when you think they should. */ * when you think they should. */
if (pthread_attr_init (&_objc_thread_attribs) == 0 if (__gthrw_pthread_attr_init (&_objc_thread_attribs) == 0
&& pthread_attr_setdetachstate (&_objc_thread_attribs, && __gthrw_pthread_attr_setdetachstate (&_objc_thread_attribs,
PTHREAD_CREATE_DETACHED) == 0) PTHREAD_CREATE_DETACHED) == 0)
return 0; return 0;
} }
...@@ -165,8 +176,8 @@ static inline int ...@@ -165,8 +176,8 @@ static inline int
__gthread_objc_close_thread_system (void) __gthread_objc_close_thread_system (void)
{ {
if (__gthread_active_p () if (__gthread_active_p ()
&& pthread_key_delete (_objc_thread_storage) == 0 && __gthrw_pthread_key_delete (_objc_thread_storage) == 0
&& pthread_attr_destroy (&_objc_thread_attribs) == 0) && __gthrw_pthread_attr_destroy (&_objc_thread_attribs) == 0)
return 0; return 0;
return -1; return -1;
...@@ -184,7 +195,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg) ...@@ -184,7 +195,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ()) if (!__gthread_active_p ())
return NULL; 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; thread_id = (objc_thread_t) new_thread_handle;
else else
thread_id = NULL; thread_id = NULL;
...@@ -202,17 +213,17 @@ __gthread_objc_thread_set_priority (int priority) ...@@ -202,17 +213,17 @@ __gthread_objc_thread_set_priority (int priority)
{ {
#ifdef _POSIX_PRIORITY_SCHEDULING #ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_t thread_id = pthread_self (); pthread_t thread_id = __gthrw_pthread_self ();
int policy; int policy;
struct sched_param params; struct sched_param params;
int priority_min, priority_max; 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; return -1;
if (priority > priority_max) if (priority > priority_max)
...@@ -226,7 +237,7 @@ __gthread_objc_thread_set_priority (int priority) ...@@ -226,7 +237,7 @@ __gthread_objc_thread_set_priority (int priority)
* this should be a pointer to policy but pthread.h is universally * this should be a pointer to policy but pthread.h is universally
* at odds with this. * at odds with this.
*/ */
if (pthread_setschedparam (thread_id, policy, &params) == 0) if (__gthrw_pthread_setschedparam (thread_id, policy, &params) == 0)
return 0; return 0;
} }
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ #endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
...@@ -246,7 +257,7 @@ __gthread_objc_thread_get_priority (void) ...@@ -246,7 +257,7 @@ __gthread_objc_thread_get_priority (void)
int policy; int policy;
struct sched_param params; 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; return params.sched_priority;
else else
return -1; return -1;
...@@ -262,7 +273,7 @@ static inline void ...@@ -262,7 +273,7 @@ static inline void
__gthread_objc_thread_yield (void) __gthread_objc_thread_yield (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
sched_yield (); __gthrw_sched_yield ();
} }
/* Terminate the current thread. */ /* Terminate the current thread. */
...@@ -271,7 +282,7 @@ __gthread_objc_thread_exit (void) ...@@ -271,7 +282,7 @@ __gthread_objc_thread_exit (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
/* exit the thread */ /* exit the thread */
pthread_exit (&__objc_thread_exit_status); __gthrw_pthread_exit (&__objc_thread_exit_status);
/* Failed if we reached here */ /* Failed if we reached here */
return -1; return -1;
...@@ -282,7 +293,7 @@ static inline objc_thread_t ...@@ -282,7 +293,7 @@ static inline objc_thread_t
__gthread_objc_thread_id (void) __gthread_objc_thread_id (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return (objc_thread_t) pthread_self (); return (objc_thread_t) __gthrw_pthread_self ();
else else
return (objc_thread_t) 1; return (objc_thread_t) 1;
} }
...@@ -292,7 +303,7 @@ static inline int ...@@ -292,7 +303,7 @@ static inline int
__gthread_objc_thread_set_data (void *value) __gthread_objc_thread_set_data (void *value)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_setspecific (_objc_thread_storage, value); return __gthrw_pthread_setspecific (_objc_thread_storage, value);
else else
{ {
thread_local_storage = value; thread_local_storage = value;
...@@ -305,7 +316,7 @@ static inline void * ...@@ -305,7 +316,7 @@ static inline void *
__gthread_objc_thread_get_data (void) __gthread_objc_thread_get_data (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_getspecific (_objc_thread_storage); return __gthrw_pthread_getspecific (_objc_thread_storage);
else else
return thread_local_storage; return thread_local_storage;
} }
...@@ -320,7 +331,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex) ...@@ -320,7 +331,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); objc_free (mutex->backend);
mutex->backend = NULL; mutex->backend = NULL;
...@@ -341,18 +352,18 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex) ...@@ -341,18 +352,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) if (count < 0)
return -1; return -1;
} }
while (count); while (count);
if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend)) if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
return -1; return -1;
objc_free (mutex->backend); objc_free (mutex->backend);
...@@ -366,7 +377,7 @@ static inline int ...@@ -366,7 +377,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex) __gthread_objc_mutex_lock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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;
} }
...@@ -379,7 +390,7 @@ static inline int ...@@ -379,7 +390,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex) __gthread_objc_mutex_trylock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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;
} }
...@@ -392,7 +403,7 @@ static inline int ...@@ -392,7 +403,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex) __gthread_objc_mutex_unlock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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;
} }
...@@ -410,7 +421,7 @@ __gthread_objc_condition_allocate (objc_condition_t condition) ...@@ -410,7 +421,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); objc_free (condition->backend);
condition->backend = NULL; condition->backend = NULL;
...@@ -427,7 +438,7 @@ __gthread_objc_condition_deallocate (objc_condition_t condition) ...@@ -427,7 +438,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; return -1;
objc_free (condition->backend); objc_free (condition->backend);
...@@ -441,7 +452,7 @@ static inline int ...@@ -441,7 +452,7 @@ static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex) __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) 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); (pthread_mutex_t *) mutex->backend);
else else
return 0; return 0;
...@@ -452,7 +463,7 @@ static inline int ...@@ -452,7 +463,7 @@ static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition) __gthread_objc_condition_broadcast (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_cond_broadcast ((pthread_cond_t *) condition->backend); return __gthrw_pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
else else
return 0; return 0;
} }
...@@ -462,7 +473,7 @@ static inline int ...@@ -462,7 +473,7 @@ static inline int
__gthread_objc_condition_signal (objc_condition_t condition) __gthread_objc_condition_signal (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return pthread_cond_signal ((pthread_cond_t *) condition->backend); return __gthrw_pthread_cond_signal ((pthread_cond_t *) condition->backend);
else else
return 0; return 0;
} }
...@@ -473,7 +484,7 @@ static inline int ...@@ -473,7 +484,7 @@ 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 else
return -1; return -1;
} }
...@@ -481,32 +492,32 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) ...@@ -481,32 +492,32 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
static inline int 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 pthread_getspecific (key); return __gthrw_pthread_getspecific (key);
} }
static inline int static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr) __gthread_setspecific (__gthread_key_t key, const void *ptr)
{ {
return pthread_setspecific (key, ptr); return __gthrw_pthread_setspecific (key, ptr);
} }
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 else
return 0; return 0;
} }
...@@ -515,7 +526,7 @@ static inline int ...@@ -515,7 +526,7 @@ 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 else
return 0; return 0;
} }
...@@ -524,7 +535,7 @@ static inline int ...@@ -524,7 +535,7 @@ 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 else
return 0; return 0;
} }
...@@ -534,7 +545,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) ...@@ -534,7 +545,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
{ {
mutex->depth = 0; mutex->depth = 0;
mutex->owner = (pthread_t) 0; mutex->owner = (pthread_t) 0;
return pthread_mutex_init (&mutex->actual, NULL); return __gthrw_pthread_mutex_init (&mutex->actual, NULL);
} }
static inline int static inline int
...@@ -542,11 +553,11 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) ...@@ -542,11 +553,11 @@ __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); __gthrw_pthread_mutex_lock (&mutex->actual);
mutex->owner = me; mutex->owner = me;
} }
...@@ -560,11 +571,11 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) ...@@ -560,11 +571,11 @@ __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;
} }
...@@ -582,7 +593,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) ...@@ -582,7 +593,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
if (--mutex->depth == 0) if (--mutex->depth == 0)
{ {
mutex->owner = (pthread_t) 0; mutex->owner = (pthread_t) 0;
pthread_mutex_unlock (&mutex->actual); __gthrw_pthread_mutex_unlock (&mutex->actual);
} }
} }
return 0; return 0;
......
gcc/gthr-solaris.h
/* Threads compatibility routines for libgcc2 and libobjc. */ /* Threads compatibility routines for libgcc2 and libobjc. */
/* Compile this one with gcc. */ /* Compile this one with gcc. */
/* Copyright (C) 1997, 1999, 2000, 2004 Free Software Foundation, Inc. /* Copyright (C) 1997, 1999, 2000, 2004, 2005
Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -56,41 +57,52 @@ typedef struct { ...@@ -56,41 +57,52 @@ typedef struct {
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function #define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#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))
#endif
#pragma weak thr_keycreate __gthrw(thr_keycreate);
#pragma weak thr_getspecific __gthrw(thr_getspecific);
#pragma weak thr_setspecific __gthrw(thr_setspecific);
#pragma weak thr_create __gthrw(thr_create);
#pragma weak mutex_lock __gthrw(mutex_lock);
#pragma weak mutex_trylock __gthrw(mutex_trylock);
#pragma weak mutex_unlock __gthrw(mutex_unlock);
#ifdef _LIBOBJC #ifdef _LIBOBJC
#pragma weak thr_exit __gthrw(thr_exit);
#pragma weak thr_keycreate __gthrw(thr_keycreate);
#pragma weak thr_getprio __gthrw(thr_getprio);
#pragma weak thr_self __gthrw(thr_self);
#pragma weak thr_setprio __gthrw(thr_setprio);
#pragma weak thr_yield __gthrw(thr_yield);
#pragma weak cond_init __gthrw(cond_init);
#pragma weak cond_destroy __gthrw(cond_destroy);
#pragma weak cond_wait __gthrw(cond_wait);
#pragma weak cond_broadcast __gthrw(cond_broadcast);
#pragma weak cond_signal __gthrw(cond_signal);
#pragma weak mutex_init __gthrw(mutex_init);
#pragma weak mutex_destroy __gthrw(mutex_destroy);
#endif #endif
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
/* This will not actually work in Solaris 2.5, since libc contains /* This will not actually work in Solaris 2.5, since libc contains
dummy symbols of all thr_* routines. */ dummy symbols of all thr_* routines. */
static inline int static inline int
__gthread_active_p (void) __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; return __gthread_active_ptr != 0;
} }
...@@ -120,7 +132,7 @@ __gthread_objc_init_thread_system (void) ...@@ -120,7 +132,7 @@ __gthread_objc_init_thread_system (void)
{ {
/* Initialize the thread storage key. */ /* Initialize the thread storage key. */
if (__gthread_active_p () if (__gthread_active_p ()
&& thr_keycreate (&_objc_thread_storage, NULL) == 0) && __gthrw_thr_keycreate (&_objc_thread_storage, NULL) == 0)
return 0; return 0;
return -1; return -1;
...@@ -148,7 +160,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg) ...@@ -148,7 +160,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ()) if (!__gthread_active_p ())
return NULL; return NULL;
if (thr_create (NULL, 0, (void *) func, arg, if (__gthrw_thr_create (NULL, 0, (void *) func, arg,
THR_DETACHED | THR_NEW_LWP, THR_DETACHED | THR_NEW_LWP,
&new_thread_id) == 0) &new_thread_id) == 0)
thread_id = *(objc_thread_t *) &new_thread_id; thread_id = *(objc_thread_t *) &new_thread_id;
...@@ -182,7 +194,7 @@ __gthread_objc_thread_set_priority (int priority) ...@@ -182,7 +194,7 @@ __gthread_objc_thread_set_priority (int priority)
} }
/* Change priority */ /* Change priority */
if (thr_setprio (thr_self (), sys_priority) == 0) if (__gthrw_thr_setprio (__gthrw_thr_self (), sys_priority) == 0)
return 0; return 0;
else else
return -1; return -1;
...@@ -197,7 +209,7 @@ __gthread_objc_thread_get_priority (void) ...@@ -197,7 +209,7 @@ __gthread_objc_thread_get_priority (void)
if (!__gthread_active_p ()) if (!__gthread_active_p ())
return OBJC_THREAD_INTERACTIVE_PRIORITY; 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) if (sys_priority >= 250)
return OBJC_THREAD_INTERACTIVE_PRIORITY; return OBJC_THREAD_INTERACTIVE_PRIORITY;
...@@ -215,7 +227,7 @@ static inline void ...@@ -215,7 +227,7 @@ static inline void
__gthread_objc_thread_yield (void) __gthread_objc_thread_yield (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
thr_yield (); __gthrw_thr_yield ();
} }
/* Terminate the current thread. */ /* Terminate the current thread. */
...@@ -224,7 +236,7 @@ __gthread_objc_thread_exit (void) ...@@ -224,7 +236,7 @@ __gthread_objc_thread_exit (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
/* exit the thread */ /* exit the thread */
thr_exit (&__objc_thread_exit_status); __gthrw_thr_exit (&__objc_thread_exit_status);
/* Failed if we reached here */ /* Failed if we reached here */
return -1; return -1;
...@@ -235,7 +247,7 @@ static inline objc_thread_t ...@@ -235,7 +247,7 @@ static inline objc_thread_t
__gthread_objc_thread_id (void) __gthread_objc_thread_id (void)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return (objc_thread_t) thr_self (); return (objc_thread_t) __gthrw_thr_self ();
else else
return (objc_thread_t) 1; return (objc_thread_t) 1;
} }
...@@ -246,7 +258,7 @@ __gthread_objc_thread_set_data (void *value) ...@@ -246,7 +258,7 @@ __gthread_objc_thread_set_data (void *value)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
if (thr_setspecific (_objc_thread_storage, value) == 0) if (__gthrw_thr_setspecific (_objc_thread_storage, value) == 0)
return 0; return 0;
else else
return -1; return -1;
...@@ -266,7 +278,7 @@ __gthread_objc_thread_get_data (void) ...@@ -266,7 +278,7 @@ __gthread_objc_thread_get_data (void)
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
if (thr_getspecific (_objc_thread_storage, &value) == 0) if (__gthrw_thr_getspecific (_objc_thread_storage, &value) == 0)
return value; return value;
else else
return NULL; return NULL;
...@@ -282,7 +294,7 @@ static inline int ...@@ -282,7 +294,7 @@ static inline int
__gthread_objc_mutex_allocate (objc_mutex_t mutex) __gthread_objc_mutex_allocate (objc_mutex_t mutex)
{ {
if (__gthread_active_p () 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 -1;
return 0; return 0;
...@@ -293,7 +305,7 @@ static inline int ...@@ -293,7 +305,7 @@ static inline int
__gthread_objc_mutex_deallocate (objc_mutex_t mutex) __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
mutex_destroy ((mutex_t *) (&(mutex->backend))); __gthrw_mutex_destroy ((mutex_t *) (&(mutex->backend)));
return 0; return 0;
} }
...@@ -303,7 +315,7 @@ static inline int ...@@ -303,7 +315,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex) __gthread_objc_mutex_lock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () if (__gthread_active_p ()
&& mutex_lock ((mutex_t *) (&(mutex->backend))) != 0) && __gthrw_mutex_lock ((mutex_t *) (&(mutex->backend))) != 0)
return -1; return -1;
return 0; return 0;
...@@ -314,7 +326,7 @@ static inline int ...@@ -314,7 +326,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex) __gthread_objc_mutex_trylock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () if (__gthread_active_p ()
&& mutex_trylock ((mutex_t *) (&(mutex->backend))) != 0) && __gthrw_mutex_trylock ((mutex_t *) (&(mutex->backend))) != 0)
return -1; return -1;
return 0; return 0;
...@@ -325,7 +337,7 @@ static inline int ...@@ -325,7 +337,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex) __gthread_objc_mutex_unlock (objc_mutex_t mutex)
{ {
if (__gthread_active_p () if (__gthread_active_p ()
&& mutex_unlock ((mutex_t *) (&(mutex->backend))) != 0) && __gthrw_mutex_unlock ((mutex_t *) (&(mutex->backend))) != 0)
return -1; return -1;
return 0; return 0;
...@@ -338,7 +350,7 @@ static inline int ...@@ -338,7 +350,7 @@ static inline int
__gthread_objc_condition_allocate (objc_condition_t condition) __gthread_objc_condition_allocate (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return cond_init ((cond_t *) (&(condition->backend)), USYNC_THREAD, return __gthrw_cond_init ((cond_t *) (&(condition->backend)), USYNC_THREAD,
NULL); NULL);
else else
return 0; return 0;
...@@ -349,7 +361,7 @@ static inline int ...@@ -349,7 +361,7 @@ static inline int
__gthread_objc_condition_deallocate (objc_condition_t condition) __gthread_objc_condition_deallocate (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return cond_destroy ((cond_t *) (&(condition->backend))); return __gthrw_cond_destroy ((cond_t *) (&(condition->backend)));
else else
return 0; return 0;
} }
...@@ -359,7 +371,7 @@ static inline int ...@@ -359,7 +371,7 @@ static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex) __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return cond_wait ((cond_t *) (&(condition->backend)), return __gthrw_cond_wait ((cond_t *) (&(condition->backend)),
(mutex_t *) (&(mutex->backend))); (mutex_t *) (&(mutex->backend)));
else else
return 0; return 0;
...@@ -370,7 +382,7 @@ static inline int ...@@ -370,7 +382,7 @@ static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition) __gthread_objc_condition_broadcast (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return cond_broadcast ((cond_t *) (&(condition->backend))); return __gthrw_cond_broadcast ((cond_t *) (&(condition->backend)));
else else
return 0; return 0;
} }
...@@ -380,7 +392,7 @@ static inline int ...@@ -380,7 +392,7 @@ static inline int
__gthread_objc_condition_signal (objc_condition_t condition) __gthread_objc_condition_signal (objc_condition_t condition)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
return cond_signal ((cond_t *) (&(condition->backend))); return __gthrw_cond_signal ((cond_t *) (&(condition->backend)));
else else
return 0; return 0;
} }
...@@ -398,7 +410,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) ...@@ -398,7 +410,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
if (once->once == 0) if (once->once == 0)
{ {
int status = mutex_lock (&once->mutex); int status = __gthrw_mutex_lock (&once->mutex);
if (status != 0) if (status != 0)
return status; return status;
if (once->once == 0) if (once->once == 0)
...@@ -406,7 +418,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) ...@@ -406,7 +418,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
(*func) (); (*func) ();
once->once++; once->once++;
} }
mutex_unlock (&once->mutex); __gthrw_mutex_unlock (&once->mutex);
} }
return 0; return 0;
} }
...@@ -417,7 +429,7 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) ...@@ -417,7 +429,7 @@ __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 /* Solaris 2.5 contains thr_* routines no-op in libc, so test if we actually
got a reasonable key value, and if not, fail. */ got a reasonable key value, and if not, fail. */
*key = (__gthread_key_t)-1; *key = (__gthread_key_t)-1;
if (thr_keycreate (key, dtor) != 0 || *key == (__gthread_key_t)-1) if (__gthrw_thr_keycreate (key, dtor) != 0 || *key == (__gthread_key_t)-1)
return -1; return -1;
else else
return 0; return 0;
...@@ -434,7 +446,7 @@ static inline void * ...@@ -434,7 +446,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key) __gthread_getspecific (__gthread_key_t key)
{ {
void *ptr; void *ptr;
if (thr_getspecific (key, &ptr) == 0) if (__gthrw_thr_getspecific (key, &ptr) == 0)
return ptr; return ptr;
else else
return 0; return 0;
...@@ -443,14 +455,14 @@ __gthread_getspecific (__gthread_key_t key) ...@@ -443,14 +455,14 @@ __gthread_getspecific (__gthread_key_t key)
static inline int static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr) __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 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 mutex_lock (mutex); return __gthrw_mutex_lock (mutex);
else else
return 0; return 0;
} }
...@@ -459,7 +471,7 @@ static inline int ...@@ -459,7 +471,7 @@ 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 mutex_trylock (mutex); return __gthrw_mutex_trylock (mutex);
else else
return 0; return 0;
} }
...@@ -468,7 +480,7 @@ static inline int ...@@ -468,7 +480,7 @@ 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 mutex_unlock (mutex); return __gthrw_mutex_unlock (mutex);
else else
return 0; return 0;
} }
...@@ -478,7 +490,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) ...@@ -478,7 +490,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
{ {
mutex->depth = 0; mutex->depth = 0;
mutex->owner = (thread_t) 0; mutex->owner = (thread_t) 0;
return mutex_init (&mutex->actual, USYNC_THREAD, 0); return __gthrw_mutex_init (&mutex->actual, USYNC_THREAD, 0);
} }
static inline int static inline int
...@@ -486,11 +498,11 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) ...@@ -486,11 +498,11 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
thread_t me = thr_self (); thread_t me = __gthrw_thr_self ();
if (mutex->owner != me) if (mutex->owner != me)
{ {
mutex_lock (&mutex->actual); __gthrw_mutex_lock (&mutex->actual);
mutex->owner = me; mutex->owner = me;
} }
...@@ -504,11 +516,11 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) ...@@ -504,11 +516,11 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
{ {
if (__gthread_active_p ()) if (__gthread_active_p ())
{ {
thread_t me = thr_self (); thread_t me = __gthrw_thr_self ();
if (mutex->owner != me) if (mutex->owner != me)
{ {
if (mutex_trylock (&mutex->actual)) if (__gthrw_mutex_trylock (&mutex->actual))
return 1; return 1;
mutex->owner = me; mutex->owner = me;
} }
...@@ -526,7 +538,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) ...@@ -526,7 +538,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
if (--mutex->depth == 0) if (--mutex->depth == 0)
{ {
mutex->owner = (thread_t) 0; mutex->owner = (thread_t) 0;
mutex_unlock (&mutex->actual); __gthrw_mutex_unlock (&mutex->actual);
} }
} }
return 0; return 0;
......
gcc/gthr-tpf.h
/* Threads compatibility routines for libgcc2 and libobjc. /* Threads compatibility routines for libgcc2 and libobjc.
Compile this one with gcc. Compile this one with gcc.
Copyright (C) 2004 Free Software Foundation, Inc. Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GCC. This file is part of GCC.
...@@ -69,19 +69,26 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t; ...@@ -69,19 +69,26 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
#define __tpf_pthread_active() (CE2THRCPTR != NOTATHREAD) #define __tpf_pthread_active() (CE2THRCPTR != NOTATHREAD)
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#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))
#endif
#pragma weak pthread_once __gthrw(pthread_once);
#pragma weak pthread_key_create __gthrw(pthread_key_create);
#pragma weak pthread_key_delete __gthrw(pthread_key_delete);
#pragma weak pthread_getspecific __gthrw(pthread_getspecific);
#pragma weak pthread_setspecific __gthrw(pthread_setspecific);
#pragma weak pthread_create __gthrw(pthread_create);
#pragma weak pthread_mutex_lock
#pragma weak pthread_mutex_trylock
#pragma weak pthread_mutex_unlock
#endif /* SUPPORTS_WEAK */ __gthrw(pthread_mutex_lock);
__gthrw(pthread_mutex_trylock);
__gthrw(pthread_mutex_unlock);
static inline int static inline int
__gthread_active_p (void) __gthread_active_p (void)
...@@ -93,7 +100,7 @@ static inline int ...@@ -93,7 +100,7 @@ static inline int
__gthread_once (__gthread_once_t *once, void (*func) (void)) __gthread_once (__gthread_once_t *once, void (*func) (void))
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_once (once, func); return __gthrw_pthread_once (once, func);
else else
return -1; return -1;
} }
...@@ -102,7 +109,7 @@ static inline int ...@@ -102,7 +109,7 @@ static inline int
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_key_create (key, dtor); return __gthrw_pthread_key_create (key, dtor);
else else
return -1; return -1;
} }
...@@ -111,7 +118,7 @@ static inline int ...@@ -111,7 +118,7 @@ static inline int
__gthread_key_delete (__gthread_key_t key) __gthread_key_delete (__gthread_key_t key)
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_key_delete (key); return __gthrw_pthread_key_delete (key);
else else
return -1; return -1;
} }
...@@ -120,7 +127,7 @@ static inline void * ...@@ -120,7 +127,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key) __gthread_getspecific (__gthread_key_t key)
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_getspecific (key); return __gthrw_pthread_getspecific (key);
else else
return NULL; return NULL;
} }
...@@ -129,7 +136,7 @@ static inline int ...@@ -129,7 +136,7 @@ static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr) __gthread_setspecific (__gthread_key_t key, const void *ptr)
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_setspecific (key, ptr); return __gthrw_pthread_setspecific (key, ptr);
else else
return -1; return -1;
} }
...@@ -138,7 +145,7 @@ static inline int ...@@ -138,7 +145,7 @@ static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex) __gthread_mutex_lock (__gthread_mutex_t *mutex)
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_mutex_lock (mutex); return __gthrw_pthread_mutex_lock (mutex);
else else
return 0; return 0;
} }
...@@ -147,7 +154,7 @@ static inline int ...@@ -147,7 +154,7 @@ static inline int
__gthread_mutex_trylock (__gthread_mutex_t *mutex) __gthread_mutex_trylock (__gthread_mutex_t *mutex)
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_mutex_trylock (mutex); return __gthrw_pthread_mutex_trylock (mutex);
else else
return 0; return 0;
} }
...@@ -156,7 +163,7 @@ static inline int ...@@ -156,7 +163,7 @@ static inline int
__gthread_mutex_unlock (__gthread_mutex_t *mutex) __gthread_mutex_unlock (__gthread_mutex_t *mutex)
{ {
if (__tpf_pthread_active ()) if (__tpf_pthread_active ())
return pthread_mutex_unlock (mutex); return __gthrw_pthread_mutex_unlock (mutex);
else else
return 0; return 0;
} }
......
libobjc/ChangeLog
2005-11-09 Alexandre Oliva <aoliva@redhat.com>
PR other/4372
* thr-objc.c (_XOPEN_SOURCE): Define.
2005-10-07 Ulrich Weigand <uweigand@de.ibm.com> 2005-10-07 Ulrich Weigand <uweigand@de.ibm.com>
PR libobjc/23612 PR libobjc/23612
......
libobjc/thr-objc.c
...@@ -24,6 +24,10 @@ Boston, MA 02110-1301, USA. */ ...@@ -24,6 +24,10 @@ Boston, MA 02110-1301, USA. */
covered by the GNU General Public License. */ covered by the GNU General Public License. */
#define _LIBOBJC #define _LIBOBJC
/* The line below is needed for declarations of functions such as
pthread_mutexattr_settype, without which gthr-posix.h may fail to
compile within libobjc. */
#define _XOPEN_SOURCE 500
#include "config.h" #include "config.h"
#include "tconfig.h" #include "tconfig.h"
#include "coretypes.h" #include "coretypes.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment