This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: RFC: weakref GCC attribute and .weakref assembly directive
- From: Alexandre Oliva <oliva at lsd dot ic dot unicamp dot br>
- To: gcc-patches at gcc dot gnu dot org
- Cc: jakub at redhat dot com, drepper at redhat dot com, rth at redhat dot com, bkoz at redhat dot com
- Date: Thu, 20 Oct 2005 05:01:51 -0200
- Subject: Re: RFC: weakref GCC attribute and .weakref assembly directive
- References: <orek6tca8g.fsf@livre.oliva.athome.lsd.ic.unicamp.br><orbr1ksmmn.fsf@livre.oliva.athome.lsd.ic.unicamp.br>
On Oct 20, 2005, Alexandre Oliva <aoliva@redhat.com> wrote:
> This patch only introduces the weakref attribute, without actually
> using it. I'm about to post a follow-up patch that uses this new
> feature to fix the libstdc++ bug that causes pthread functions to
> become weak by including libstdc++ headers.
This is the follow-up patch that depends on the patch that introduces
weakref support in the compiler unconditionally. I do have a simpler
patch that introduces weakrefs only if the assembler supports them,
but this would introduce a lot of complication in the headers, new
built-in preprocessor macros to communicate their availability, and
changes in libstdc++ to handle them.
Tested on amd64-linux-gnu with all alternatives available for
outputting weakrefs in the just-posted patch, namely .weakref support
in the assembler, ASM_WEAKEN_LABEL, and ASM_WEAKEN_DECL.
Ok to install?
(I realize this bug fix might not be acceptable at this stage, given
the complexity of the other patch it depends on, but I'd appreciate a
review for both nevertheless. Thanks)
:ADDPATCH weakref:
Index: gcc/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* 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.
Index: gcc/gthr-dce.h
===================================================================
--- gcc/gthr-dce.h.orig 2005-10-19 01:00:19.000000000 -0200
+++ gcc/gthr-dce.h 2005-10-19 01:54:35.000000000 -0200
@@ -1,6 +1,7 @@
/* Threads compatibility routines for libgcc2 and libobjc. */
/* 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.
@@ -54,48 +55,56 @@
typedef pthread_mutex_t __gthread_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_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
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+#else
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __asm (#name)
+#endif
-#pragma weak pthread_once
-#pragma weak pthread_once_init
-#pragma weak pthread_keycreate
-#pragma weak pthread_key_delete
-#pragma weak pthread_getspecific
-#pragma weak pthread_setspecific
-#pragma weak pthread_create
-#pragma weak pthread_mutex_init
-#pragma weak pthread_mutex_lock
-#pragma weak pthread_mutex_trylock
-#pragma weak pthread_mutex_unlock
-#pragma weak pthread_mutexattr_create
-#pragma weak pthread_mutexattr_setkind_np
-#pragma weak pthread_mutexattr_delete
+__gthrw(pthread_once);
+__gthrw(pthread_once_init);
+__gthrw(pthread_keycreate);
+__gthrw(pthread_key_delete);
+__gthrw(pthread_getspecific);
+__gthrw(pthread_setspecific);
+__gthrw(pthread_create);
+__gthrw(pthread_mutex_init);
+__gthrw(pthread_mutex_lock);
+__gthrw(pthread_mutex_trylock);
+__gthrw(pthread_mutex_unlock);
+__gthrw(pthread_mutexattr_create);
+__gthrw(pthread_mutexattr_setkind_np);
+__gthrw(pthread_mutexattr_delete);
#ifdef _LIBOBJC
/* 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_getunique_np
-#pragma weak pthread_mutex_destroy
-#pragma weak pthread_self
-#pragma weak pthread_yield
+__gthrw(pthread_cond_broadcast);
+__gthrw(pthread_cond_destroy);
+__gthrw(pthread_cond_init);
+__gthrw(pthread_cond_signal);
+__gthrw(pthread_cond_wait);
+__gthrw(pthread_exit);
+__gthrw(pthread_getunique_np);
+__gthrw(pthread_mutex_destroy);
+__gthrw(pthread_self);
+__gthrw(pthread_yield);
#endif
+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+
static inline int
__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;
}
@@ -125,7 +134,7 @@
{
if (__gthread_active_p ())
/* Initialize the thread storage key. */
- return pthread_keycreate (&_objc_thread_storage, NULL);
+ return __gthrw_pthread_keycreate (&_objc_thread_storage, NULL);
else
return -1;
}
@@ -152,7 +161,7 @@
if (!__gthread_active_p ())
return NULL;
- if (!(pthread_create (&new_thread_handle, pthread_attr_default,
+ if (!(__gthrw_pthread_create (&new_thread_handle, pthread_attr_default,
(void *) func, arg)))
{
/* ??? May not work! (64bit) */
@@ -189,7 +198,7 @@
}
/* Change the priority. */
- if (pthread_setprio (pthread_self (), sys_priority) >= 0)
+ if (pthread_setprio (__gthrw_pthread_self (), sys_priority) >= 0)
return 0;
else
/* Failed */
@@ -204,7 +213,7 @@
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
&& sys_priority <= PRI_FG_MAX_NP)
@@ -227,7 +236,7 @@
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
- pthread_yield ();
+ __gthrw_pthread_yield ();
}
/* Terminate the current thread. */
@@ -236,7 +245,7 @@
{
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;
@@ -248,9 +257,9 @@
{
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
return (objc_thread_t) 1;
@@ -261,7 +270,7 @@
__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;
@@ -277,7 +286,7 @@
if (__gthread_active_p ())
{
- if (!(pthread_getspecific (_objc_thread_storage, &value)))
+ if (!(__gthrw_pthread_getspecific (_objc_thread_storage, &value)))
return value;
return NULL;
@@ -296,7 +305,7 @@
{
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))
{
objc_free (mutex->backend);
@@ -314,7 +323,7 @@
{
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;
objc_free (mutex->backend);
@@ -329,7 +338,7 @@
__gthread_objc_mutex_lock (objc_mutex_t mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_lock ((pthread_mutex_t *) mutex->backend);
+ return __gthrw_pthread_mutex_lock ((pthread_mutex_t *) mutex->backend);
else
return 0;
}
@@ -339,7 +348,7 @@
__gthread_objc_mutex_trylock (objc_mutex_t mutex)
{
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 0;
@@ -350,7 +359,7 @@
__gthread_objc_mutex_unlock (objc_mutex_t mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
+ return __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
else
return 0;
}
@@ -418,7 +427,7 @@
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__gthread_active_p ())
- return pthread_once (once, func);
+ return __gthrw_pthread_once (once, func);
else
return -1;
}
@@ -426,7 +435,7 @@
static inline int
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{
- return pthread_keycreate (key, dtor);
+ return __gthrw_pthread_keycreate (key, dtor);
}
static inline int
@@ -440,7 +449,7 @@
__gthread_getspecific (__gthread_key_t key)
{
void *ptr;
- if (pthread_getspecific (key, &ptr) == 0)
+ if (__gthrw_pthread_getspecific (key, &ptr) == 0)
return ptr;
else
return 0;
@@ -449,21 +458,21 @@
static inline int
__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
__gthread_mutex_init_function (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- pthread_mutex_init (mutex, pthread_mutexattr_default);
+ __gthrw_pthread_mutex_init (mutex, pthread_mutexattr_default);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_lock (mutex);
+ return __gthrw_pthread_mutex_lock (mutex);
else
return 0;
}
@@ -472,7 +481,7 @@
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_trylock (mutex);
+ return __gthrw_pthread_mutex_trylock (mutex);
else
return 0;
}
@@ -481,7 +490,7 @@
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_unlock (mutex);
+ return __gthrw_pthread_mutex_unlock (mutex);
else
return 0;
}
@@ -494,13 +503,13 @@
pthread_mutexattr_t attr;
int r;
- r = pthread_mutexattr_create (&attr);
+ r = __gthrw_pthread_mutexattr_create (&attr);
if (!r)
- r = pthread_mutexattr_setkind_np (&attr, MUTEX_RECURSIVE_NP);
+ r = __gthrw_pthread_mutexattr_setkind_np (&attr, MUTEX_RECURSIVE_NP);
if (!r)
- r = pthread_mutex_init (mutex, attr);
+ r = __gthrw_pthread_mutex_init (mutex, attr);
if (!r)
- r = pthread_mutexattr_delete (&attr);
+ r = __gthrw_pthread_mutexattr_delete (&attr);
return r;
}
}
Index: gcc/gthr-posix.h
===================================================================
--- gcc/gthr-posix.h.orig 2005-10-19 01:00:21.000000000 -0200
+++ gcc/gthr-posix.h 2005-10-19 01:45:49.000000000 -0200
@@ -59,55 +59,63 @@
#endif
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+#else
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __asm (#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_cancel
-
-#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
+__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_mutex_lock);
+__gthrw(pthread_mutex_trylock);
+__gthrw(pthread_mutex_unlock);
+__gthrw(pthread_mutexattr_init);
+__gthrw(pthread_mutexattr_settype);
+__gthrw(pthread_mutexattr_destroy);
-#pragma weak pthread_mutex_init
+__gthrw(pthread_mutex_init);
#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_broadcast);
+__gthrw(pthread_cond_destroy);
+__gthrw(pthread_cond_init);
+__gthrw(pthread_cond_signal);
+__gthrw(pthread_cond_wait);
+__gthrw(pthread_exit);
+__gthrw(pthread_mutex_destroy);
+__gthrw(pthread_self);
#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 */
-#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
-#pragma weak pthread_getschedparam
-#pragma weak pthread_setschedparam
+__gthrw(pthread_getschedparam);
+__gthrw(pthread_setschedparam);
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _LIBOBJC || _LIBOBJC_WEAK */
+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+
static inline int
__gthread_active_p (void)
{
static void *const __gthread_active_ptr
- = __extension__ (void *) &pthread_cancel;
+ = __extension__ (void *) &__gthrw_pthread_cancel;
return __gthread_active_ptr != 0;
}
@@ -146,13 +154,13 @@
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. */
- 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;
}
@@ -166,8 +174,8 @@
__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;
@@ -185,7 +193,7 @@
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;
@@ -203,17 +211,17 @@
{
#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;
- if (pthread_getschedparam (thread_id, &policy, ¶ms) == 0)
+ if (__gthrw_pthread_getschedparam (thread_id, &policy, ¶ms) == 0)
{
- if ((priority_max = sched_get_priority_max (policy)) == -1)
+ if ((priority_max = __gthrw_sched_get_priority_max (policy)) == -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)
@@ -227,7 +235,7 @@
* this should be a pointer to policy but pthread.h is universally
* at odds with this.
*/
- if (pthread_setschedparam (thread_id, policy, ¶ms) == 0)
+ if (__gthrw_pthread_setschedparam (thread_id, policy, ¶ms) == 0)
return 0;
}
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
@@ -247,7 +255,7 @@
int policy;
struct sched_param params;
- if (pthread_getschedparam (pthread_self (), &policy, ¶ms) == 0)
+ if (__gthrw_pthread_getschedparam (__gthrw_pthread_self (), &policy, ¶ms) == 0)
return params.sched_priority;
else
return -1;
@@ -263,7 +271,7 @@
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
- sched_yield ();
+ __gthrw_sched_yield ();
}
/* Terminate the current thread. */
@@ -272,7 +280,7 @@
{
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;
@@ -283,7 +291,7 @@
__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;
}
@@ -293,7 +301,7 @@
__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;
@@ -306,7 +314,7 @@
__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;
}
@@ -321,7 +329,7 @@
{
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;
@@ -342,18 +350,18 @@
/*
* Posix Threads specifically require that the thread be unlocked
- * for pthread_mutex_destroy to work.
+ * for __gthrw_pthread_mutex_destroy to work.
*/
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 (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
+ if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
return -1;
objc_free (mutex->backend);
@@ -367,7 +375,7 @@
__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;
}
@@ -380,7 +388,7 @@
__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;
}
@@ -393,7 +401,7 @@
__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;
}
@@ -411,7 +419,7 @@
{
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;
@@ -428,7 +436,7 @@
{
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);
@@ -442,7 +450,7 @@
__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;
@@ -453,7 +461,7 @@
__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;
}
@@ -463,7 +471,7 @@
__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;
}
@@ -474,7 +482,7 @@
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__gthread_active_p ())
- return pthread_once (once, func);
+ return __gthrw_pthread_once (once, func);
else
return -1;
}
@@ -482,32 +490,32 @@
static inline int
__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
__gthread_key_delete (__gthread_key_t key)
{
- return pthread_key_delete (key);
+ return __gthrw_pthread_key_delete (key);
}
static inline void *
__gthread_getspecific (__gthread_key_t key)
{
- return pthread_getspecific (key);
+ return __gthrw_pthread_getspecific (key);
}
static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
- return pthread_setspecific (key, ptr);
+ return __gthrw_pthread_setspecific (key, ptr);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_lock (mutex);
+ return __gthrw_pthread_mutex_lock (mutex);
else
return 0;
}
@@ -516,7 +524,7 @@
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_trylock (mutex);
+ return __gthrw_pthread_mutex_trylock (mutex);
else
return 0;
}
@@ -525,7 +533,7 @@
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_unlock (mutex);
+ return __gthrw_pthread_mutex_unlock (mutex);
else
return 0;
}
@@ -539,13 +547,13 @@
pthread_mutexattr_t attr;
int r;
- r = pthread_mutexattr_init (&attr);
+ r = __gthrw_pthread_mutexattr_init (&attr);
if (!r)
- r = pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
+ r = __gthrw_pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
if (!r)
- r = pthread_mutex_init (mutex, &attr);
+ r = __gthrw_pthread_mutex_init (mutex, &attr);
if (!r)
- r = pthread_mutexattr_destroy (&attr);
+ r = __gthrw_pthread_mutexattr_destroy (&attr);
return r;
}
return 0;
Index: gcc/gthr-posix95.h
===================================================================
--- gcc/gthr-posix95.h.orig 2005-10-19 01:00:21.000000000 -0200
+++ gcc/gthr-posix95.h 2005-10-19 01:24:12.000000000 -0200
@@ -57,56 +57,64 @@
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+#else
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __asm (#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_cancel
-#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
+__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_lock);
+__gthrw(pthread_mutex_trylock);
+__gthrw(pthread_mutex_unlock);
+__gthrw(pthread_mutexattr_init);
+__gthrw(pthread_mutexattr_settype);
+__gthrw(pthread_mutexattr_destroy);
-#pragma weak pthread_mutex_init
+__gthrw(pthread_mutex_init);
#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_broadcast);
+__gthrw(pthread_cond_destroy);
+__gthrw(pthread_cond_init);
+__gthrw(pthread_cond_signal);
+__gthrw(pthread_cond_wait);
+__gthrw(pthread_exit);
+__gthrw(pthread_mutex_destroy);
+__gthrw(pthread_self);
#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 */
-#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
-#pragma weak pthread_getschedparam
-#pragma weak pthread_setschedparam
+__gthrw(pthread_getschedparam);
+__gthrw(pthread_setschedparam);
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _LIBOBJC || _LIBOBJC_WEAK */
+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+
static inline int
__gthread_active_p (void)
{
static void *const __gthread_active_ptr
- = __extension__ (void *) &pthread_cancel;
+ = __extension__ (void *) &__gthrw_pthread_cancel;
return __gthread_active_ptr != 0;
}
@@ -145,13 +153,13 @@
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. */
- 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;
}
@@ -165,8 +173,8 @@
__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;
@@ -184,7 +192,7 @@
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;
@@ -202,17 +210,17 @@
{
#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;
- if (pthread_getschedparam (thread_id, &policy, ¶ms) == 0)
+ if (__gthrw_pthread_getschedparam (thread_id, &policy, ¶ms) == 0)
{
- if ((priority_max = sched_get_priority_max (policy)) == -1)
+ if ((priority_max = __gthrw_sched_get_priority_max (policy)) == -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)
@@ -226,7 +234,7 @@
* this should be a pointer to policy but pthread.h is universally
* at odds with this.
*/
- if (pthread_setschedparam (thread_id, policy, ¶ms) == 0)
+ if (__gthrw_pthread_setschedparam (thread_id, policy, ¶ms) == 0)
return 0;
}
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
@@ -246,7 +254,7 @@
int policy;
struct sched_param params;
- if (pthread_getschedparam (pthread_self (), &policy, ¶ms) == 0)
+ if (__gthrw_pthread_getschedparam (__gthrw_pthread_self (), &policy, ¶ms) == 0)
return params.sched_priority;
else
return -1;
@@ -262,7 +270,7 @@
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
- sched_yield ();
+ __gthrw_sched_yield ();
}
/* Terminate the current thread. */
@@ -271,7 +279,7 @@
{
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;
@@ -282,7 +290,7 @@
__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;
}
@@ -292,7 +300,7 @@
__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;
@@ -305,7 +313,7 @@
__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;
}
@@ -320,7 +328,7 @@
{
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;
@@ -341,18 +349,18 @@
/*
* Posix Threads specifically require that the thread be unlocked
- * for pthread_mutex_destroy to work.
+ * for __gthrw_pthread_mutex_destroy to work.
*/
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 (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
+ if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
return -1;
objc_free (mutex->backend);
@@ -366,7 +374,7 @@
__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;
}
@@ -379,7 +387,7 @@
__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;
}
@@ -392,7 +400,7 @@
__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;
}
@@ -410,7 +418,7 @@
{
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;
@@ -427,7 +435,7 @@
{
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);
@@ -441,7 +449,7 @@
__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;
@@ -452,7 +460,7 @@
__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;
}
@@ -462,7 +470,7 @@
__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;
}
@@ -473,7 +481,7 @@
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__gthread_active_p ())
- return pthread_once (once, func);
+ return __gthrw_pthread_once (once, func);
else
return -1;
}
@@ -481,32 +489,32 @@
static inline int
__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
__gthread_key_delete (__gthread_key_t key)
{
- return pthread_key_delete (key);
+ return __gthrw_pthread_key_delete (key);
}
static inline void *
__gthread_getspecific (__gthread_key_t key)
{
- return pthread_getspecific (key);
+ return __gthrw_pthread_getspecific (key);
}
static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
- return pthread_setspecific (key, ptr);
+ return __gthrw_pthread_setspecific (key, ptr);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_lock (mutex);
+ return __gthrw_pthread_mutex_lock (mutex);
else
return 0;
}
@@ -515,7 +523,7 @@
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_trylock (mutex);
+ return __gthrw_pthread_mutex_trylock (mutex);
else
return 0;
}
@@ -524,7 +532,7 @@
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return pthread_mutex_unlock (mutex);
+ return __gthrw_pthread_mutex_unlock (mutex);
else
return 0;
}
@@ -534,7 +542,7 @@
{
mutex->depth = 0;
mutex->owner = (pthread_t) 0;
- return pthread_mutex_init (&mutex->actual, NULL);
+ return __gthrw_pthread_mutex_init (&mutex->actual, NULL);
}
static inline int
@@ -542,11 +550,11 @@
{
if (__gthread_active_p ())
{
- pthread_t me = pthread_self ();
+ pthread_t me = __gthrw_pthread_self ();
if (mutex->owner != me)
{
- pthread_mutex_lock (&mutex->actual);
+ __gthrw_pthread_mutex_lock (&mutex->actual);
mutex->owner = me;
}
@@ -560,11 +568,11 @@
{
if (__gthread_active_p ())
{
- pthread_t me = pthread_self ();
+ pthread_t me = __gthrw_pthread_self ();
if (mutex->owner != me)
{
- if (pthread_mutex_trylock (&mutex->actual))
+ if (__gthrw_pthread_mutex_trylock (&mutex->actual))
return 1;
mutex->owner = me;
}
@@ -582,7 +590,7 @@
if (--mutex->depth == 0)
{
mutex->owner = (pthread_t) 0;
- pthread_mutex_unlock (&mutex->actual);
+ __gthrw_pthread_mutex_unlock (&mutex->actual);
}
}
return 0;
Index: gcc/gthr-solaris.h
===================================================================
--- gcc/gthr-solaris.h.orig 2005-10-19 01:00:24.000000000 -0200
+++ gcc/gthr-solaris.h 2005-10-19 01:54:16.000000000 -0200
@@ -1,6 +1,7 @@
/* Threads compatibility routines for libgcc2 and libobjc. */
/* 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.
@@ -56,41 +57,49 @@
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+#else
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __asm (#name)
+#endif
-#pragma weak thr_keycreate
-#pragma weak thr_getspecific
-#pragma weak thr_setspecific
-#pragma weak thr_create
-
-#pragma weak mutex_lock
-#pragma weak mutex_trylock
-#pragma weak mutex_unlock
+__gthrw(thr_keycreate);
+__gthrw(thr_getspecific);
+__gthrw(thr_setspecific);
+__gthrw(thr_create);
+
+__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
+__gthrw(thr_exit);
+__gthrw(thr_keycreate);
+__gthrw(thr_getprio);
+__gthrw(thr_self);
+__gthrw(thr_setprio);
+__gthrw(thr_yield);
+
+__gthrw(cond_init);
+__gthrw(cond_destroy);
+__gthrw(cond_wait);
+__gthrw(cond_broadcast);
+__gthrw(cond_signal);
-#pragma weak mutex_init
-#pragma weak mutex_destroy
+__gthrw(mutex_init);
+__gthrw(mutex_destroy);
#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;
}
@@ -120,7 +129,7 @@
{
/* 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;
@@ -148,7 +157,7 @@
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;
@@ -182,7 +191,7 @@
}
/* 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;
@@ -197,7 +206,7 @@
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;
@@ -215,7 +224,7 @@
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
- thr_yield ();
+ __gthrw_thr_yield ();
}
/* Terminate the current thread. */
@@ -224,7 +233,7 @@
{
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;
@@ -235,7 +244,7 @@
__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;
}
@@ -246,7 +255,7 @@
{
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;
@@ -266,7 +275,7 @@
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;
@@ -282,7 +291,7 @@
__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;
@@ -293,7 +302,7 @@
__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;
}
@@ -303,7 +312,7 @@
__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;
@@ -314,7 +323,7 @@
__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;
@@ -325,7 +334,7 @@
__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;
@@ -338,7 +347,7 @@
__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;
@@ -349,7 +358,7 @@
__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;
}
@@ -359,7 +368,7 @@
__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;
@@ -370,7 +379,7 @@
__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;
}
@@ -380,7 +389,7 @@
__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;
}
@@ -398,7 +407,7 @@
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)
@@ -406,7 +415,7 @@
(*func) ();
once->once++;
}
- mutex_unlock (&once->mutex);
+ __gthrw_mutex_unlock (&once->mutex);
}
return 0;
}
@@ -417,7 +426,7 @@
/* 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 = (__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;
else
return 0;
@@ -434,7 +443,7 @@
__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;
@@ -443,14 +452,14 @@
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;
}
@@ -459,7 +468,7 @@
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return mutex_trylock (mutex);
+ return __gthrw_mutex_trylock (mutex);
else
return 0;
}
@@ -468,7 +477,7 @@
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
- return mutex_unlock (mutex);
+ return __gthrw_mutex_unlock (mutex);
else
return 0;
}
@@ -478,7 +487,7 @@
{
mutex->depth = 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
@@ -486,11 +495,11 @@
{
if (__gthread_active_p ())
{
- thread_t me = thr_self ();
+ thread_t me = __gthrw_thr_self ();
if (mutex->owner != me)
{
- mutex_lock (&mutex->actual);
+ __gthrw_mutex_lock (&mutex->actual);
mutex->owner = me;
}
@@ -504,11 +513,11 @@
{
if (__gthread_active_p ())
{
- thread_t me = thr_self ();
+ thread_t me = __gthrw_thr_self ();
if (mutex->owner != me)
{
- if (mutex_trylock (&mutex->actual))
+ if (__gthrw_mutex_trylock (&mutex->actual))
return 1;
mutex->owner = me;
}
@@ -526,7 +535,7 @@
if (--mutex->depth == 0)
{
mutex->owner = (thread_t) 0;
- mutex_unlock (&mutex->actual);
+ __gthrw_mutex_unlock (&mutex->actual);
}
}
return 0;
Index: gcc/gthr-tpf.h
===================================================================
--- gcc/gthr-tpf.h.orig 2005-10-19 01:00:24.000000000 -0200
+++ gcc/gthr-tpf.h 2005-10-19 01:54:05.000000000 -0200
@@ -1,6 +1,6 @@
/* Threads compatibility routines for libgcc2 and libobjc.
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.
@@ -69,19 +69,23 @@
#define __tpf_pthread_active() (CE2THRCPTR != NOTATHREAD)
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
+#else
+# define __gthrw(name) \
+ extern __typeof(name) __gthrw_ ## name __asm (#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_mutex_lock
-#pragma weak pthread_mutex_trylock
-#pragma weak pthread_mutex_unlock
-
-#endif /* SUPPORTS_WEAK */
+__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);
static inline int
__gthread_active_p (void)
@@ -93,7 +97,7 @@
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__tpf_pthread_active ())
- return pthread_once (once, func);
+ return __gthrw_pthread_once (once, func);
else
return -1;
}
@@ -102,7 +106,7 @@
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{
if (__tpf_pthread_active ())
- return pthread_key_create (key, dtor);
+ return __gthrw_pthread_key_create (key, dtor);
else
return -1;
}
@@ -111,7 +115,7 @@
__gthread_key_delete (__gthread_key_t key)
{
if (__tpf_pthread_active ())
- return pthread_key_delete (key);
+ return __gthrw_pthread_key_delete (key);
else
return -1;
}
@@ -120,7 +124,7 @@
__gthread_getspecific (__gthread_key_t key)
{
if (__tpf_pthread_active ())
- return pthread_getspecific (key);
+ return __gthrw_pthread_getspecific (key);
else
return NULL;
}
@@ -129,7 +133,7 @@
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
if (__tpf_pthread_active ())
- return pthread_setspecific (key, ptr);
+ return __gthrw_pthread_setspecific (key, ptr);
else
return -1;
}
@@ -138,7 +142,7 @@
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
- return pthread_mutex_lock (mutex);
+ return __gthrw_pthread_mutex_lock (mutex);
else
return 0;
}
@@ -147,7 +151,7 @@
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
- return pthread_mutex_trylock (mutex);
+ return __gthrw_pthread_mutex_trylock (mutex);
else
return 0;
}
@@ -156,7 +160,7 @@
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
- return pthread_mutex_unlock (mutex);
+ return __gthrw_pthread_mutex_unlock (mutex);
else
return 0;
}
--
Alexandre Oliva http://www.lsd.ic.unicamp.br/~oliva/
Red Hat Compiler Engineer aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist oliva@{lsd.ic.unicamp.br, gnu.org}