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 180 additions and 132 deletions
gcc/ChangeLog
2005-11-09 Alexandre Oliva <aoliva@redhat.com>
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_DEPRECATED): Adjust comment. Check for a DECL.
* c-common.c (handle_weakref_attribute): New.
......
gcc/gthr-dce.h
/* 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,59 @@ typedef pthread_once_t __gthread_once_t;
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_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
#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 +137,7 @@ __gthread_objc_init_thread_system (void)
{
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 +164,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
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 +201,7 @@ __gthread_objc_thread_set_priority (int priority)
}
/* 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 +216,7 @@ __gthread_objc_thread_get_priority (void)
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 +239,7 @@ static inline void
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
pthread_yield ();
__gthrw_pthread_yield ();
}
/* Terminate the current thread. */
......@@ -236,7 +248,7 @@ __gthread_objc_thread_exit (void)
{
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 +260,9 @@ __gthread_objc_thread_id (void)
{
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 +273,7 @@ static inline int
__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 +289,7 @@ __gthread_objc_thread_get_data (void)
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 +308,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex)
{
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 +326,7 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
{
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 +341,7 @@ static inline int
__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 +351,7 @@ static inline int
__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 +362,7 @@ static inline int
__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 +430,7 @@ static inline int
__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 +438,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
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 +452,7 @@ static inline void *
__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 +461,21 @@ __gthread_getspecific (__gthread_key_t key)
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 +484,7 @@ static inline int
__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 +493,7 @@ static inline int
__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 +506,13 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
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;
}
}
......
gcc/gthr-tpf.h
/* 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,26 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
#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_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
#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
__gthrw(pthread_once);
__gthrw(pthread_key_create);
__gthrw(pthread_key_delete);
__gthrw(pthread_getspecific);
__gthrw(pthread_setspecific);
__gthrw(pthread_create);
#endif /* SUPPORTS_WEAK */
__gthrw(pthread_mutex_lock);
__gthrw(pthread_mutex_trylock);
__gthrw(pthread_mutex_unlock);
static inline int
__gthread_active_p (void)
......@@ -93,7 +100,7 @@ static inline int
__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 +109,7 @@ static inline int
__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 +118,7 @@ static inline int
__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 +127,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key)
{
if (__tpf_pthread_active ())
return pthread_getspecific (key);
return __gthrw_pthread_getspecific (key);
else
return NULL;
}
......@@ -129,7 +136,7 @@ static inline int
__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 +145,7 @@ static inline int
__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 +154,7 @@ static inline int
__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 +163,7 @@ static inline int
__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;
}
......
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>
PR libobjc/23612
......
libobjc/thr-objc.c
......@@ -24,6 +24,10 @@ Boston, MA 02110-1301, USA. */
covered by the GNU General Public License. */
#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 "tconfig.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