From 6898e884dba655385074271f41fbd32515b47d87 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Mon, 30 May 2005 20:50:53 +0000 Subject: [PATCH] libc_r has to provide strong versions of the public symbols to override the stubs in libc. Otherwise mixing e.g. of pthread_cond_init from libc and pthread_cond_timedwait from libc_r can occur and result in panics. --- lib/libc_r/uthread/uthread_attr_destroy.c | 6 ++--- lib/libc_r/uthread/uthread_attr_get_np.c | 6 ++--- .../uthread/uthread_attr_getdetachstate.c | 6 ++--- .../uthread/uthread_attr_getinheritsched.c | 6 ++--- .../uthread/uthread_attr_getschedparam.c | 6 ++--- .../uthread/uthread_attr_getschedpolicy.c | 6 ++--- lib/libc_r/uthread/uthread_attr_getscope.c | 6 ++--- lib/libc_r/uthread/uthread_attr_getstack.c | 5 ++--- .../uthread/uthread_attr_getstackaddr.c | 6 ++--- .../uthread/uthread_attr_getstacksize.c | 6 ++--- lib/libc_r/uthread/uthread_attr_init.c | 6 ++--- .../uthread_attr_setcreatesuspend_np.c | 6 ++--- .../uthread/uthread_attr_setdetachstate.c | 6 ++--- .../uthread/uthread_attr_setinheritsched.c | 6 ++--- .../uthread/uthread_attr_setschedparam.c | 6 ++--- .../uthread/uthread_attr_setschedpolicy.c | 6 ++--- lib/libc_r/uthread/uthread_attr_setscope.c | 6 ++--- lib/libc_r/uthread/uthread_attr_setstack.c | 5 ++--- .../uthread/uthread_attr_setstackaddr.c | 6 ++--- .../uthread/uthread_attr_setstacksize.c | 6 ++--- lib/libc_r/uthread/uthread_cancel.c | 12 +++++----- lib/libc_r/uthread/uthread_clean.c | 7 +++--- lib/libc_r/uthread/uthread_concurrency.c | 8 +++---- lib/libc_r/uthread/uthread_cond.c | 16 +++++++------- lib/libc_r/uthread/uthread_condattr_destroy.c | 6 ++--- lib/libc_r/uthread/uthread_condattr_init.c | 6 ++--- lib/libc_r/uthread/uthread_create.c | 6 ++--- lib/libc_r/uthread/uthread_detach.c | 6 ++--- lib/libc_r/uthread/uthread_equal.c | 6 ++--- lib/libc_r/uthread/uthread_exit.c | 6 ++--- lib/libc_r/uthread/uthread_getprio.c | 6 ++--- lib/libc_r/uthread/uthread_getschedparam.c | 6 ++--- lib/libc_r/uthread/uthread_info.c | 6 ++--- lib/libc_r/uthread/uthread_join.c | 6 ++--- lib/libc_r/uthread/uthread_kevent.c | 6 ++--- lib/libc_r/uthread/uthread_kill.c | 6 ++--- lib/libc_r/uthread/uthread_kqueue.c | 6 ++--- lib/libc_r/uthread/uthread_main_np.c | 6 ++--- lib/libc_r/uthread/uthread_mattr_init.c | 6 ++--- lib/libc_r/uthread/uthread_mattr_kind_np.c | 12 +++++----- lib/libc_r/uthread/uthread_multi_np.c | 6 ++--- lib/libc_r/uthread/uthread_mutex.c | 13 +++++------ .../uthread/uthread_mutex_prioceiling.c | 12 +++++----- lib/libc_r/uthread/uthread_mutex_protocol.c | 7 +++--- .../uthread/uthread_mutexattr_destroy.c | 6 ++--- lib/libc_r/uthread/uthread_once.c | 6 ++--- lib/libc_r/uthread/uthread_resume_np.c | 8 +++---- lib/libc_r/uthread/uthread_rwlock.c | 17 +++++++------- lib/libc_r/uthread/uthread_rwlockattr.c | 11 +++++----- lib/libc_r/uthread/uthread_self.c | 6 ++--- lib/libc_r/uthread/uthread_sem.c | 22 +++++++++---------- lib/libc_r/uthread/uthread_setprio.c | 6 ++--- lib/libc_r/uthread/uthread_setschedparam.c | 6 ++--- lib/libc_r/uthread/uthread_sigmask.c | 6 ++--- lib/libc_r/uthread/uthread_single_np.c | 6 ++--- lib/libc_r/uthread/uthread_spec.c | 13 +++++------ lib/libc_r/uthread/uthread_suspend_np.c | 8 +++---- lib/libc_r/uthread/uthread_switch_np.c | 8 +++---- lib/libc_r/uthread/uthread_yield.c | 8 +++---- 59 files changed, 215 insertions(+), 223 deletions(-) diff --git a/lib/libc_r/uthread/uthread_attr_destroy.c b/lib/libc_r/uthread/uthread_attr_destroy.c index f738617359..828c3d28f5 100644 --- a/lib/libc_r/uthread/uthread_attr_destroy.c +++ b/lib/libc_r/uthread/uthread_attr_destroy.c @@ -30,15 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_destroy.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_destroy.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_destroy.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_destroy, pthread_attr_destroy); - int _pthread_attr_destroy(pthread_attr_t *attr) { @@ -61,3 +59,5 @@ _pthread_attr_destroy(pthread_attr_t *attr) } return(ret); } + +__strong_reference(_pthread_attr_destroy, pthread_attr_destroy); diff --git a/lib/libc_r/uthread/uthread_attr_get_np.c b/lib/libc_r/uthread/uthread_attr_get_np.c index 98401779fa..fa9a20ac2f 100644 --- a/lib/libc_r/uthread/uthread_attr_get_np.c +++ b/lib/libc_r/uthread/uthread_attr_get_np.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_get_np.c,v 1.2.2.2 2003/02/03 10:13:28 phantom Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_get_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_get_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -32,8 +32,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_attr_get_np, pthread_attr_get_np); - int _pthread_attr_get_np(pthread_t pid, pthread_attr_t *dst) { @@ -56,3 +54,5 @@ _pthread_attr_get_np(pthread_t pid, pthread_attr_t *dst) return (0); } + +__strong_reference(_pthread_attr_get_np, pthread_attr_get_np); diff --git a/lib/libc_r/uthread/uthread_attr_getdetachstate.c b/lib/libc_r/uthread/uthread_attr_getdetachstate.c index f65a8346b6..eba7ceb59e 100644 --- a/lib/libc_r/uthread/uthread_attr_getdetachstate.c +++ b/lib/libc_r/uthread/uthread_attr_getdetachstate.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getdetachstate.c,v 1.3.2.2 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getdetachstate.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getdetachstate.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate); - int _pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate) { @@ -58,3 +56,5 @@ _pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate) } return(ret); } + +__strong_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libc_r/uthread/uthread_attr_getinheritsched.c b/lib/libc_r/uthread/uthread_attr_getinheritsched.c index 9d0399b317..e7ca124514 100644 --- a/lib/libc_r/uthread/uthread_attr_getinheritsched.c +++ b/lib/libc_r/uthread/uthread_attr_getinheritsched.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getinheritsched.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getinheritsched.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getinheritsched.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched); - int _pthread_attr_getinheritsched(const pthread_attr_t *attr, int *sched_inherit) { @@ -50,3 +48,5 @@ _pthread_attr_getinheritsched(const pthread_attr_t *attr, int *sched_inherit) return(ret); } + +__strong_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched); diff --git a/lib/libc_r/uthread/uthread_attr_getschedparam.c b/lib/libc_r/uthread/uthread_attr_getschedparam.c index 922ad6f7d4..201a3ac317 100644 --- a/lib/libc_r/uthread/uthread_attr_getschedparam.c +++ b/lib/libc_r/uthread/uthread_attr_getschedparam.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getschedparam.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getschedparam.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getschedparam.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam); - int _pthread_attr_getschedparam(const pthread_attr_t *attr, struct sched_param *param) { @@ -50,3 +48,5 @@ _pthread_attr_getschedparam(const pthread_attr_t *attr, struct sched_param *para return(ret); } + +__strong_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam); diff --git a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c index 1fc58c0a00..f0d0e81cc0 100644 --- a/lib/libc_r/uthread/uthread_attr_getschedpolicy.c +++ b/lib/libc_r/uthread/uthread_attr_getschedpolicy.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getschedpolicy.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getschedpolicy.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getschedpolicy.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy); - int _pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy) { @@ -50,3 +48,5 @@ _pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy) return(ret); } + +__strong_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy); diff --git a/lib/libc_r/uthread/uthread_attr_getscope.c b/lib/libc_r/uthread/uthread_attr_getscope.c index 91889931ca..b2d2af1333 100644 --- a/lib/libc_r/uthread/uthread_attr_getscope.c +++ b/lib/libc_r/uthread/uthread_attr_getscope.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getscope.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getscope.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getscope.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getscope, pthread_attr_getscope); - int _pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope) { @@ -53,3 +51,5 @@ _pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope) return(ret); } + +__strong_reference(_pthread_attr_getscope, pthread_attr_getscope); diff --git a/lib/libc_r/uthread/uthread_attr_getstack.c b/lib/libc_r/uthread/uthread_attr_getstack.c index 79b39660bc..c7a78f00f5 100644 --- a/lib/libc_r/uthread/uthread_attr_getstack.c +++ b/lib/libc_r/uthread/uthread_attr_getstack.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstack.c,v 1.1.2.1 2003/03/04 16:49:54 phantom Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getstack.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getstack.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getstack, pthread_attr_getstack); - int _pthread_attr_getstack(const pthread_attr_t * __restrict attr, void ** __restrict stackaddr, @@ -58,3 +56,4 @@ _pthread_attr_getstack(const pthread_attr_t * __restrict attr, return(ret); } +__strong_reference(_pthread_attr_getstack, pthread_attr_getstack); diff --git a/lib/libc_r/uthread/uthread_attr_getstackaddr.c b/lib/libc_r/uthread/uthread_attr_getstackaddr.c index c4615d8d54..3195097293 100644 --- a/lib/libc_r/uthread/uthread_attr_getstackaddr.c +++ b/lib/libc_r/uthread/uthread_attr_getstackaddr.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstackaddr.c,v 1.3.2.2 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getstackaddr.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getstackaddr.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr); - int _pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr) { @@ -53,3 +51,5 @@ _pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr) } return(ret); } + +__strong_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr); diff --git a/lib/libc_r/uthread/uthread_attr_getstacksize.c b/lib/libc_r/uthread/uthread_attr_getstacksize.c index 0885cf9bba..2bd05eae63 100644 --- a/lib/libc_r/uthread/uthread_attr_getstacksize.c +++ b/lib/libc_r/uthread/uthread_attr_getstacksize.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_getstacksize.c,v 1.3.2.2 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getstacksize.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_getstacksize.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize); - int _pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize) { @@ -53,3 +51,5 @@ _pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize) } return(ret); } + +__strong_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize); diff --git a/lib/libc_r/uthread/uthread_attr_init.c b/lib/libc_r/uthread/uthread_attr_init.c index 7bb2e7d97f..86a717e6a3 100644 --- a/lib/libc_r/uthread/uthread_attr_init.c +++ b/lib/libc_r/uthread/uthread_attr_init.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_init.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_init.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_init.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,8 +38,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_attr_init, pthread_attr_init); - int _pthread_attr_init(pthread_attr_t *attr) { @@ -60,3 +58,5 @@ _pthread_attr_init(pthread_attr_t *attr) } return(ret); } + +__strong_reference(_pthread_attr_init, pthread_attr_init); diff --git a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c index 83ed95f7fd..be4cd25530 100644 --- a/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c +++ b/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c,v 1.3.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); - int _pthread_attr_setcreatesuspend_np(pthread_attr_t *attr) { @@ -51,3 +49,5 @@ _pthread_attr_setcreatesuspend_np(pthread_attr_t *attr) } return(ret); } + +__strong_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); diff --git a/lib/libc_r/uthread/uthread_attr_setdetachstate.c b/lib/libc_r/uthread/uthread_attr_setdetachstate.c index 3dc832a336..ede5757134 100644 --- a/lib/libc_r/uthread/uthread_attr_setdetachstate.c +++ b/lib/libc_r/uthread/uthread_attr_setdetachstate.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setdetachstate.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setdetachstate.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setdetachstate.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate); - int _pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate) { @@ -60,3 +58,5 @@ _pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate) } return(ret); } + +__strong_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate); diff --git a/lib/libc_r/uthread/uthread_attr_setinheritsched.c b/lib/libc_r/uthread/uthread_attr_setinheritsched.c index ed5cbaa784..b5c1eb7281 100644 --- a/lib/libc_r/uthread/uthread_attr_setinheritsched.c +++ b/lib/libc_r/uthread/uthread_attr_setinheritsched.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setinheritsched.c,v 1.3.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setinheritsched.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setinheritsched.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched); - int _pthread_attr_setinheritsched(pthread_attr_t *attr, int sched_inherit) { @@ -50,3 +48,5 @@ _pthread_attr_setinheritsched(pthread_attr_t *attr, int sched_inherit) return(ret); } + +__strong_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched); diff --git a/lib/libc_r/uthread/uthread_attr_setschedparam.c b/lib/libc_r/uthread/uthread_attr_setschedparam.c index 176c87304f..212c7c68d1 100644 --- a/lib/libc_r/uthread/uthread_attr_setschedparam.c +++ b/lib/libc_r/uthread/uthread_attr_setschedparam.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setschedparam.c,v 1.4.2.3 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setschedparam.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setschedparam.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam); - int _pthread_attr_setschedparam(pthread_attr_t *attr, const struct sched_param *param) { @@ -56,3 +54,5 @@ _pthread_attr_setschedparam(pthread_attr_t *attr, const struct sched_param *para return(ret); } + +__strong_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam); diff --git a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c index 08be96db15..01817e3daf 100644 --- a/lib/libc_r/uthread/uthread_attr_setschedpolicy.c +++ b/lib/libc_r/uthread/uthread_attr_setschedpolicy.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setschedpolicy.c,v 1.3.2.2 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setschedpolicy.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setschedpolicy.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy); - int _pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy) { @@ -52,3 +50,5 @@ _pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy) return(ret); } + +__strong_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy); diff --git a/lib/libc_r/uthread/uthread_attr_setscope.c b/lib/libc_r/uthread/uthread_attr_setscope.c index 81fdbc6184..a3441fb77a 100644 --- a/lib/libc_r/uthread/uthread_attr_setscope.c +++ b/lib/libc_r/uthread/uthread_attr_setscope.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setscope.c,v 1.3.2.3 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setscope.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setscope.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setscope, pthread_attr_setscope); - int _pthread_attr_setscope(pthread_attr_t *attr, int contentionscope) { @@ -55,3 +53,5 @@ _pthread_attr_setscope(pthread_attr_t *attr, int contentionscope) return(ret); } + +__strong_reference(_pthread_attr_setscope, pthread_attr_setscope); diff --git a/lib/libc_r/uthread/uthread_attr_setstack.c b/lib/libc_r/uthread/uthread_attr_setstack.c index b21f1c0fb6..b8111bba52 100644 --- a/lib/libc_r/uthread/uthread_attr_setstack.c +++ b/lib/libc_r/uthread/uthread_attr_setstack.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstack.c,v 1.1.2.1 2003/03/04 16:49:54 phantom Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setstack.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setstack.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setstack, pthread_attr_setstack); - int _pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr, size_t stacksize) @@ -57,3 +55,4 @@ _pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr, return(ret); } +__strong_reference(_pthread_attr_setstack, pthread_attr_setstack); diff --git a/lib/libc_r/uthread/uthread_attr_setstackaddr.c b/lib/libc_r/uthread/uthread_attr_setstackaddr.c index b76d9f01bf..fe9a78fce6 100644 --- a/lib/libc_r/uthread/uthread_attr_setstackaddr.c +++ b/lib/libc_r/uthread/uthread_attr_setstackaddr.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstackaddr.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setstackaddr.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setstackaddr.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr); - int _pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr) { @@ -53,3 +51,5 @@ _pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr) } return(ret); } + +__strong_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr); diff --git a/lib/libc_r/uthread/uthread_attr_setstacksize.c b/lib/libc_r/uthread/uthread_attr_setstacksize.c index 4f4893fa2c..0566b0b71d 100644 --- a/lib/libc_r/uthread/uthread_attr_setstacksize.c +++ b/lib/libc_r/uthread/uthread_attr_setstacksize.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_attr_setstacksize.c,v 1.5.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setstacksize.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_attr_setstacksize.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize); - int _pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize) { @@ -53,3 +51,5 @@ _pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize) } return(ret); } + +__strong_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize); diff --git a/lib/libc_r/uthread/uthread_cancel.c b/lib/libc_r/uthread/uthread_cancel.c index 0fea4c8a71..ec663a2dab 100644 --- a/lib/libc_r/uthread/uthread_cancel.c +++ b/lib/libc_r/uthread/uthread_cancel.c @@ -1,7 +1,7 @@ /* * David Leonard , 1999. Public domain. * $FreeBSD: src/lib/libc_r/uthread/uthread_cancel.c,v 1.3.2.9 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_cancel.c,v 1.3 2005/05/09 13:28:40 davidxu Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_cancel.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -9,11 +9,6 @@ static void finish_cancellation(void *arg); -__weak_reference(_pthread_cancel, pthread_cancel); -__weak_reference(_pthread_setcancelstate, pthread_setcancelstate); -__weak_reference(_pthread_setcanceltype, pthread_setcanceltype); -__weak_reference(_pthread_testcancel, pthread_testcancel); - int _pthread_cancel(pthread_t pthread) { @@ -229,3 +224,8 @@ finish_cancellation(void *arg) pthread_exit(PTHREAD_CANCELED); } } + +__strong_reference(_pthread_cancel, pthread_cancel); +__strong_reference(_pthread_setcancelstate, pthread_setcancelstate); +__strong_reference(_pthread_setcanceltype, pthread_setcanceltype); +__strong_reference(_pthread_testcancel, pthread_testcancel); diff --git a/lib/libc_r/uthread/uthread_clean.c b/lib/libc_r/uthread/uthread_clean.c index 761c187814..3c484955b2 100644 --- a/lib/libc_r/uthread/uthread_clean.c +++ b/lib/libc_r/uthread/uthread_clean.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_clean.c,v 1.4.2.2 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_clean.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_clean.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,9 +38,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_cleanup_push, pthread_cleanup_push); -__weak_reference(_pthread_cleanup_pop, pthread_cleanup_pop); - void _pthread_cleanup_push(void (*routine) (void *), void *routine_arg) { @@ -71,3 +68,5 @@ _pthread_cleanup_pop(int execute) } } +__strong_reference(_pthread_cleanup_push, pthread_cleanup_push); +__strong_reference(_pthread_cleanup_pop, pthread_cleanup_pop); diff --git a/lib/libc_r/uthread/uthread_concurrency.c b/lib/libc_r/uthread/uthread_concurrency.c index 3ae59034c6..5b7624b178 100644 --- a/lib/libc_r/uthread/uthread_concurrency.c +++ b/lib/libc_r/uthread/uthread_concurrency.c @@ -30,16 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_concurrency.c,v 1.1.2.1 2003/05/27 18:18:01 jdp Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_concurrency.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_concurrency.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include static int current_concurrency = 0; -__weak_reference(_pthread_getconcurrency, pthread_getconcurrency); -__weak_reference(_pthread_setconcurrency, pthread_setconcurrency); - int _pthread_getconcurrency(void) { @@ -59,3 +56,6 @@ _pthread_setconcurrency(int new_level) } return(ret); } + +__strong_reference(_pthread_getconcurrency, pthread_getconcurrency); +__strong_reference(_pthread_setconcurrency, pthread_setconcurrency); diff --git a/lib/libc_r/uthread/uthread_cond.c b/lib/libc_r/uthread/uthread_cond.c index 2e00b5f20f..f61f857e48 100644 --- a/lib/libc_r/uthread/uthread_cond.c +++ b/lib/libc_r/uthread/uthread_cond.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_cond.c,v 1.22.2.8 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_cond.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_cond.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -45,13 +45,6 @@ static inline pthread_t cond_queue_deq(pthread_cond_t); static inline void cond_queue_remove(pthread_cond_t, pthread_t); static inline void cond_queue_enq(pthread_cond_t, pthread_t); -__weak_reference(_pthread_cond_init, pthread_cond_init); -__weak_reference(_pthread_cond_destroy, pthread_cond_destroy); -__weak_reference(_pthread_cond_wait, pthread_cond_wait); -__weak_reference(_pthread_cond_timedwait, pthread_cond_timedwait); -__weak_reference(_pthread_cond_signal, pthread_cond_signal); -__weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast); - /* Reinitialize a condition variable to defaults. */ int @@ -733,3 +726,10 @@ cond_queue_enq(pthread_cond_t cond, pthread_t pthread) pthread->flags |= PTHREAD_FLAGS_IN_CONDQ; pthread->data.cond = cond; } + +__strong_reference(_pthread_cond_init, pthread_cond_init); +__strong_reference(_pthread_cond_destroy, pthread_cond_destroy); +__strong_reference(_pthread_cond_wait, pthread_cond_wait); +__strong_reference(_pthread_cond_timedwait, pthread_cond_timedwait); +__strong_reference(_pthread_cond_signal, pthread_cond_signal); +__strong_reference(_pthread_cond_broadcast, pthread_cond_broadcast); diff --git a/lib/libc_r/uthread/uthread_condattr_destroy.c b/lib/libc_r/uthread/uthread_condattr_destroy.c index 2b278b09bf..51dd44179f 100644 --- a/lib/libc_r/uthread/uthread_condattr_destroy.c +++ b/lib/libc_r/uthread/uthread_condattr_destroy.c @@ -30,15 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_condattr_destroy.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_condattr_destroy.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_condattr_destroy.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include #include "pthread_private.h" -__weak_reference(_pthread_condattr_destroy, pthread_condattr_destroy); - int _pthread_condattr_destroy(pthread_condattr_t *attr) { @@ -52,3 +50,5 @@ _pthread_condattr_destroy(pthread_condattr_t *attr) } return(ret); } + +__strong_reference(_pthread_condattr_destroy, pthread_condattr_destroy); diff --git a/lib/libc_r/uthread/uthread_condattr_init.c b/lib/libc_r/uthread/uthread_condattr_init.c index 37eaf6f998..65146fd174 100644 --- a/lib/libc_r/uthread/uthread_condattr_init.c +++ b/lib/libc_r/uthread/uthread_condattr_init.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_condattr_init.c,v 1.4.2.1 2002/10/22 14:44:02 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_condattr_init.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_condattr_init.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,8 +38,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_condattr_init, pthread_condattr_init); - int _pthread_condattr_init(pthread_condattr_t *attr) { @@ -57,3 +55,5 @@ _pthread_condattr_init(pthread_condattr_t *attr) } return(ret); } + +__strong_reference(_pthread_condattr_init, pthread_condattr_init); diff --git a/lib/libc_r/uthread/uthread_create.c b/lib/libc_r/uthread/uthread_create.c index 6778814056..0d6bcbde00 100644 --- a/lib/libc_r/uthread/uthread_create.c +++ b/lib/libc_r/uthread/uthread_create.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.24.2.6 2003/01/08 05:04:26 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_create.c,v 1.5 2005/05/11 19:47:00 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_create.c,v 1.6 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -59,8 +59,6 @@ int _thread_ctx_offset = OFF(ctx); int _thread_PS_RUNNING_value = PS_RUNNING; int _thread_PS_DEAD_value = PS_DEAD; -__weak_reference(_pthread_create, pthread_create); - int _pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg) @@ -328,3 +326,5 @@ _thread_start(void) /* This point should never be reached. */ PANIC("Thread has resumed after exit"); } + +__strong_reference(_pthread_create, pthread_create); diff --git a/lib/libc_r/uthread/uthread_detach.c b/lib/libc_r/uthread/uthread_detach.c index c580441114..9488e194bf 100644 --- a/lib/libc_r/uthread/uthread_detach.c +++ b/lib/libc_r/uthread/uthread_detach.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_detach.c,v 1.11.2.4 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_detach.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_detach.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_detach, pthread_detach); - int _pthread_detach(pthread_t pthread) { @@ -89,3 +87,5 @@ _pthread_detach(pthread_t pthread) /* Return the completion status: */ return (rval); } + +__strong_reference(_pthread_detach, pthread_detach); diff --git a/lib/libc_r/uthread/uthread_equal.c b/lib/libc_r/uthread/uthread_equal.c index 8ed8b8f826..f0ecc9779b 100644 --- a/lib/libc_r/uthread/uthread_equal.c +++ b/lib/libc_r/uthread/uthread_equal.c @@ -30,16 +30,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_equal.c,v 1.3.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_equal.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_equal.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include "pthread_private.h" -__weak_reference(_pthread_equal, pthread_equal); - int _pthread_equal(pthread_t t1, pthread_t t2) { /* Compare the two thread pointers: */ return (t1 == t2); } + +__strong_reference(_pthread_equal, pthread_equal); diff --git a/lib/libc_r/uthread/uthread_exit.c b/lib/libc_r/uthread/uthread_exit.c index 9a8d2fd7af..a9efcba0ac 100644 --- a/lib/libc_r/uthread/uthread_exit.c +++ b/lib/libc_r/uthread/uthread_exit.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.16.2.8 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_exit.c,v 1.3 2005/05/09 13:28:40 davidxu Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_exit.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -44,8 +44,6 @@ #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) -__weak_reference(_pthread_exit, pthread_exit); - void __exit(int status) { int flags; @@ -232,3 +230,5 @@ _pthread_exit(void *status) /* This point should not be reached. */ PANIC("Dead thread has resumed"); } + +__strong_reference(_pthread_exit, pthread_exit); diff --git a/lib/libc_r/uthread/uthread_getprio.c b/lib/libc_r/uthread/uthread_getprio.c index 164b4ad15c..a552992396 100644 --- a/lib/libc_r/uthread/uthread_getprio.c +++ b/lib/libc_r/uthread/uthread_getprio.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_getprio.c,v 1.6.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_getprio.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_getprio.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_getprio, pthread_getprio); - int _pthread_getprio(pthread_t pthread) { @@ -55,3 +53,5 @@ _pthread_getprio(pthread_t pthread) /* Return the thread priority or an error status: */ return (ret); } + +__strong_reference(_pthread_getprio, pthread_getprio); diff --git a/lib/libc_r/uthread/uthread_getschedparam.c b/lib/libc_r/uthread/uthread_getschedparam.c index 4fbb9ebaf8..163203e2a1 100644 --- a/lib/libc_r/uthread/uthread_getschedparam.c +++ b/lib/libc_r/uthread/uthread_getschedparam.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_getschedparam.c,v 1.4.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_getschedparam.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_getschedparam.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_getschedparam, pthread_getschedparam); - int _pthread_getschedparam(pthread_t pthread, int *policy, struct sched_param *param) @@ -58,3 +56,5 @@ _pthread_getschedparam(pthread_t pthread, int *policy, return(ret); } + +__strong_reference(_pthread_getschedparam, pthread_getschedparam); diff --git a/lib/libc_r/uthread/uthread_info.c b/lib/libc_r/uthread/uthread_info.c index c2ae69e036..362577badd 100644 --- a/lib/libc_r/uthread/uthread_info.c +++ b/lib/libc_r/uthread/uthread_info.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_info.c,v 1.14.2.9 2003/02/15 05:35:31 kris Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_info.c,v 1.3 2005/05/09 13:28:40 davidxu Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_info.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -48,8 +48,6 @@ static void dump_thread(int fd, pthread_t pthread, int long_version); -__weak_reference(_pthread_set_name_np, pthread_set_name_np); - struct s_thread_info { enum pthread_state state; char *name; @@ -288,3 +286,5 @@ _pthread_set_name_np(pthread_t thread, const char *name) thread->name = strdup(name); } } + +__strong_reference(_pthread_set_name_np, pthread_set_name_np); diff --git a/lib/libc_r/uthread/uthread_join.c b/lib/libc_r/uthread/uthread_join.c index baed8dfdbe..f3dfcf3b1f 100644 --- a/lib/libc_r/uthread/uthread_join.c +++ b/lib/libc_r/uthread/uthread_join.c @@ -30,14 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_join.c,v 1.12.2.8 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_join.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_join.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_join, pthread_join); - int _pthread_join(pthread_t pthread, void **thread_return) { @@ -161,3 +159,5 @@ _pthread_join(pthread_t pthread, void **thread_return) /* Return the completion status: */ return (ret); } + +__strong_reference(_pthread_join, pthread_join); diff --git a/lib/libc_r/uthread/uthread_kevent.c b/lib/libc_r/uthread/uthread_kevent.c index 18c4cefea0..bb78f4be0b 100644 --- a/lib/libc_r/uthread/uthread_kevent.c +++ b/lib/libc_r/uthread/uthread_kevent.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_kevent.c,v 1.2.2.6 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_kevent.c,v 1.3 2005/03/20 18:45:15 joerg Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_kevent.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include @@ -35,8 +35,6 @@ #include #include "pthread_private.h" -__weak_reference(_kevent, kevent); - int _kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout) @@ -76,3 +74,5 @@ _kevent(int kq, const struct kevent *changelist, int nchanges, } return (rc); } + +__strong_reference(_kevent, kevent); diff --git a/lib/libc_r/uthread/uthread_kill.c b/lib/libc_r/uthread/uthread_kill.c index 1451f53e14..0fcdd7c888 100644 --- a/lib/libc_r/uthread/uthread_kill.c +++ b/lib/libc_r/uthread/uthread_kill.c @@ -30,15 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_kill.c,v 1.10.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_kill.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_kill.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include #include "pthread_private.h" -__weak_reference(_pthread_kill, pthread_kill); - int _pthread_kill(pthread_t pthread, int sig) { @@ -73,3 +71,5 @@ _pthread_kill(pthread_t pthread, int sig) /* Return the completion status: */ return (ret); } + +__strong_reference(_pthread_kill, pthread_kill); diff --git a/lib/libc_r/uthread/uthread_kqueue.c b/lib/libc_r/uthread/uthread_kqueue.c index d69e1f196f..937db04fcb 100644 --- a/lib/libc_r/uthread/uthread_kqueue.c +++ b/lib/libc_r/uthread/uthread_kqueue.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_kqueue.c,v 1.1 2003/07/25 17:02:33 mp Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_kqueue.c,v 1.1 2005/03/20 17:46:31 joerg Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_kqueue.c,v 1.2 2005/05/30 20:50:53 joerg Exp $ */ #include @@ -34,8 +34,6 @@ #include #include "pthread_private.h" -__weak_reference(_kqueue, kqueue); - int _kqueue(void) { @@ -52,3 +50,5 @@ _kqueue(void) } return (fd); } + +__strong_reference(_kqueue, kqueue); diff --git a/lib/libc_r/uthread/uthread_main_np.c b/lib/libc_r/uthread/uthread_main_np.c index 1d4f18ed68..699f4837d6 100644 --- a/lib/libc_r/uthread/uthread_main_np.c +++ b/lib/libc_r/uthread/uthread_main_np.c @@ -25,15 +25,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_main_np.c,v 1.4.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_main_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_main_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_main_np, pthread_main_np); - /* * Provide the equivalent to Solaris thr_main() function */ @@ -46,3 +44,5 @@ _pthread_main_np() else return (pthread_equal(pthread_self(), _thread_initial) ? 1 : 0); } + +__strong_reference(_pthread_main_np, pthread_main_np); diff --git a/lib/libc_r/uthread/uthread_mattr_init.c b/lib/libc_r/uthread/uthread_mattr_init.c index 3804b157d1..a54703740e 100644 --- a/lib/libc_r/uthread/uthread_mattr_init.c +++ b/lib/libc_r/uthread/uthread_mattr_init.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_mattr_init.c,v 1.5.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_mattr_init.c,v 1.3 2005/01/08 03:27:21 hsu Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_mattr_init.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,8 +38,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_mutexattr_init, pthread_mutexattr_init); - int _pthread_mutexattr_init(pthread_mutexattr_t *attr) { @@ -57,3 +55,5 @@ _pthread_mutexattr_init(pthread_mutexattr_t *attr) } return(ret); } + +__strong_reference(_pthread_mutexattr_init, pthread_mutexattr_init); diff --git a/lib/libc_r/uthread/uthread_mattr_kind_np.c b/lib/libc_r/uthread/uthread_mattr_kind_np.c index 86aaa2e531..dd68151f0e 100644 --- a/lib/libc_r/uthread/uthread_mattr_kind_np.c +++ b/lib/libc_r/uthread/uthread_mattr_kind_np.c @@ -30,17 +30,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_mattr_kind_np.c,v 1.4.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_mattr_kind_np.c,v 1.3 2005/01/08 03:27:21 hsu Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_mattr_kind_np.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include "pthread_private.h" -__weak_reference(_pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np); -__weak_reference(_pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np); -__weak_reference(_pthread_mutexattr_gettype, pthread_mutexattr_gettype); -__weak_reference(_pthread_mutexattr_settype, pthread_mutexattr_settype); - int _pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind) { @@ -96,3 +91,8 @@ _pthread_mutexattr_gettype(pthread_mutexattr_t *attr, int *type) } return ret; } + +__strong_reference(_pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np); +__strong_reference(_pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np); +__strong_reference(_pthread_mutexattr_gettype, pthread_mutexattr_gettype); +__strong_reference(_pthread_mutexattr_settype, pthread_mutexattr_settype); diff --git a/lib/libc_r/uthread/uthread_multi_np.c b/lib/libc_r/uthread/uthread_multi_np.c index 8c74867495..7d48bd8469 100644 --- a/lib/libc_r/uthread/uthread_multi_np.c +++ b/lib/libc_r/uthread/uthread_multi_np.c @@ -30,13 +30,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_multi_np.c,v 1.4.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_multi_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_multi_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include -__weak_reference(_pthread_multi_np, pthread_multi_np); - int _pthread_multi_np() { @@ -49,3 +47,5 @@ _pthread_multi_np() pthread_resume_all_np(); return (0); } + +__strong_reference(_pthread_multi_np, pthread_multi_np); diff --git a/lib/libc_r/uthread/uthread_mutex.c b/lib/libc_r/uthread/uthread_mutex.c index fa211ed6f8..b2d2f670d7 100644 --- a/lib/libc_r/uthread/uthread_mutex.c +++ b/lib/libc_r/uthread/uthread_mutex.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex.c,v 1.20.2.8 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_mutex.c,v 1.3 2005/05/03 07:29:04 joerg Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_mutex.c,v 1.4 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -75,12 +75,6 @@ static inline void mutex_queue_enq(pthread_mutex_t, pthread_t); static spinlock_t static_init_lock = _SPINLOCK_INITIALIZER; -__weak_reference(_pthread_mutex_init, pthread_mutex_init); -__weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy); -__weak_reference(_pthread_mutex_trylock, pthread_mutex_trylock); -__weak_reference(_pthread_mutex_lock, pthread_mutex_lock); -__weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock); - /* Reinitialize a mutex to defaults. */ int _mutex_reinit(pthread_mutex_t * mutex) @@ -1456,3 +1450,8 @@ mutex_queue_enq(pthread_mutex_t mutex, pthread_t pthread) pthread->flags |= PTHREAD_FLAGS_IN_MUTEXQ; } +__strong_reference(_pthread_mutex_init, pthread_mutex_init); +__strong_reference(_pthread_mutex_destroy, pthread_mutex_destroy); +__strong_reference(_pthread_mutex_trylock, pthread_mutex_trylock); +__strong_reference(_pthread_mutex_lock, pthread_mutex_lock); +__strong_reference(_pthread_mutex_unlock, pthread_mutex_unlock); diff --git a/lib/libc_r/uthread/uthread_mutex_prioceiling.c b/lib/libc_r/uthread/uthread_mutex_prioceiling.c index 1c0578f1ff..86d339c2a6 100644 --- a/lib/libc_r/uthread/uthread_mutex_prioceiling.c +++ b/lib/libc_r/uthread/uthread_mutex_prioceiling.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex_prioceiling.c,v 1.3.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_mutex_prioceiling.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_mutex_prioceiling.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,11 +38,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling); -__weak_reference(_pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling); -__weak_reference(_pthread_mutex_getprioceiling, pthread_mutex_getprioceiling); -__weak_reference(_pthread_mutex_setprioceiling, pthread_mutex_setprioceiling); - int _pthread_mutexattr_getprioceiling(pthread_mutexattr_t *mattr, int *prioceiling) { @@ -112,3 +107,8 @@ _pthread_mutex_setprioceiling(pthread_mutex_t *mutex, } return(ret); } + +__strong_reference(_pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling); +__strong_reference(_pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling); +__strong_reference(_pthread_mutex_getprioceiling, pthread_mutex_getprioceiling); +__strong_reference(_pthread_mutex_setprioceiling, pthread_mutex_setprioceiling); diff --git a/lib/libc_r/uthread/uthread_mutex_protocol.c b/lib/libc_r/uthread/uthread_mutex_protocol.c index f1a6c3e5c8..4bd1cb9f26 100644 --- a/lib/libc_r/uthread/uthread_mutex_protocol.c +++ b/lib/libc_r/uthread/uthread_mutex_protocol.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_mutex_protocol.c,v 1.3.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_mutex_protocol.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_mutex_protocol.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,9 +38,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol); -__weak_reference(_pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol); - int _pthread_mutexattr_getprotocol(pthread_mutexattr_t *mattr, int *protocol) { @@ -69,3 +66,5 @@ _pthread_mutexattr_setprotocol(pthread_mutexattr_t *mattr, int protocol) return(ret); } +__strong_reference(_pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol); +__strong_reference(_pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol); diff --git a/lib/libc_r/uthread/uthread_mutexattr_destroy.c b/lib/libc_r/uthread/uthread_mutexattr_destroy.c index dc9d89c2bf..1009249e9a 100644 --- a/lib/libc_r/uthread/uthread_mutexattr_destroy.c +++ b/lib/libc_r/uthread/uthread_mutexattr_destroy.c @@ -30,15 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_mutexattr_destroy.c,v 1.5.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_mutexattr_destroy.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_mutexattr_destroy.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include #include "pthread_private.h" -__weak_reference(_pthread_mutexattr_destroy, pthread_mutexattr_destroy); - int _pthread_mutexattr_destroy(pthread_mutexattr_t *attr) { @@ -52,3 +50,5 @@ _pthread_mutexattr_destroy(pthread_mutexattr_t *attr) } return(ret); } + +__strong_reference(_pthread_mutexattr_destroy, pthread_mutexattr_destroy); diff --git a/lib/libc_r/uthread/uthread_once.c b/lib/libc_r/uthread/uthread_once.c index 902990fa92..846d3e8142 100644 --- a/lib/libc_r/uthread/uthread_once.c +++ b/lib/libc_r/uthread/uthread_once.c @@ -30,13 +30,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_once.c,v 1.3.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_once.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_once.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include "pthread_private.h" -__weak_reference(_pthread_once, pthread_once); - int _pthread_once(pthread_once_t * once_control, void (*init_routine) (void)) { @@ -52,3 +50,5 @@ _pthread_once(pthread_once_t * once_control, void (*init_routine) (void)) } return (0); } + +__strong_reference(_pthread_once, pthread_once); diff --git a/lib/libc_r/uthread/uthread_resume_np.c b/lib/libc_r/uthread/uthread_resume_np.c index d038647ba5..27634ee5e8 100644 --- a/lib/libc_r/uthread/uthread_resume_np.c +++ b/lib/libc_r/uthread/uthread_resume_np.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_resume_np.c,v 1.7.2.4 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_resume_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_resume_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,9 +38,6 @@ static void resume_common(struct pthread *); -__weak_reference(_pthread_resume_np, pthread_resume_np); -__weak_reference(_pthread_resume_all_np, pthread_resume_all_np); - /* Resume a thread: */ int _pthread_resume_np(pthread_t thread) @@ -110,3 +107,6 @@ resume_common(struct pthread *thread) PTHREAD_PRIOQ_INSERT_TAIL(thread); } } + +__strong_reference(_pthread_resume_np, pthread_resume_np); +__strong_reference(_pthread_resume_all_np, pthread_resume_all_np); diff --git a/lib/libc_r/uthread/uthread_rwlock.c b/lib/libc_r/uthread/uthread_rwlock.c index 638b26c94d..072d265338 100644 --- a/lib/libc_r/uthread/uthread_rwlock.c +++ b/lib/libc_r/uthread/uthread_rwlock.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlock.c,v 1.4.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_rwlock.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_rwlock.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include @@ -37,14 +37,6 @@ /* maximum number of times a read lock may be obtained */ #define MAX_READ_LOCKS (INT_MAX - 1) -__weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); -__weak_reference(_pthread_rwlock_init, pthread_rwlock_init); -__weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock); -__weak_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock); -__weak_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock); -__weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock); -__weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock); - static int init_static (pthread_rwlock_t *rwlock); static spinlock_t static_init_lock = _SPINLOCK_INITIALIZER; @@ -340,3 +332,10 @@ _pthread_rwlock_wrlock (pthread_rwlock_t *rwlock) return(ret); } +__strong_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); +__strong_reference(_pthread_rwlock_init, pthread_rwlock_init); +__strong_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock); +__strong_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock); +__strong_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock); +__strong_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock); +__strong_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock); diff --git a/lib/libc_r/uthread/uthread_rwlockattr.c b/lib/libc_r/uthread/uthread_rwlockattr.c index cb262d2d7e..28ce2bf359 100644 --- a/lib/libc_r/uthread/uthread_rwlockattr.c +++ b/lib/libc_r/uthread/uthread_rwlockattr.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.5.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include @@ -33,11 +33,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_rwlockattr_destroy, pthread_rwlockattr_destroy); -__weak_reference(_pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared); -__weak_reference(_pthread_rwlockattr_init, pthread_rwlockattr_init); -__weak_reference(_pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared); - int _pthread_rwlockattr_destroy(pthread_rwlockattr_t *rwlockattr) { @@ -97,3 +92,7 @@ _pthread_rwlockattr_setpshared(pthread_rwlockattr_t *rwlockattr, int pshared) return(0); } +__strong_reference(_pthread_rwlockattr_destroy, pthread_rwlockattr_destroy); +__strong_reference(_pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared); +__strong_reference(_pthread_rwlockattr_init, pthread_rwlockattr_init); +__strong_reference(_pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared); diff --git a/lib/libc_r/uthread/uthread_self.c b/lib/libc_r/uthread/uthread_self.c index 009795c177..d0072bb10d 100644 --- a/lib/libc_r/uthread/uthread_self.c +++ b/lib/libc_r/uthread/uthread_self.c @@ -30,16 +30,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_self.c,v 1.3.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_self.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_self.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include "pthread_private.h" -__weak_reference(_pthread_self, pthread_self); - pthread_t _pthread_self(void) { /* Return the running thread pointer: */ return (_get_curthread()); } + +__strong_reference(_pthread_self, pthread_self); diff --git a/lib/libc_r/uthread/uthread_sem.c b/lib/libc_r/uthread/uthread_sem.c index 80383984a1..670eece7df 100644 --- a/lib/libc_r/uthread/uthread_sem.c +++ b/lib/libc_r/uthread/uthread_sem.c @@ -27,7 +27,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_sem.c,v 1.3.2.5 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_sem.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_sem.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include @@ -43,16 +43,6 @@ goto RETURN; \ } -__weak_reference(_sem_init, sem_init); -__weak_reference(_sem_destroy, sem_destroy); -__weak_reference(_sem_open, sem_open); -__weak_reference(_sem_close, sem_close); -__weak_reference(_sem_unlink, sem_unlink); -__weak_reference(_sem_wait, sem_wait); -__weak_reference(_sem_trywait, sem_trywait); -__weak_reference(_sem_post, sem_post); -__weak_reference(_sem_getvalue, sem_getvalue); - int _sem_init(sem_t *sem, int pshared, unsigned int value) { @@ -252,3 +242,13 @@ _sem_getvalue(sem_t *sem, int *sval) RETURN: return retval; } + +__strong_reference(_sem_init, sem_init); +__strong_reference(_sem_destroy, sem_destroy); +__strong_reference(_sem_open, sem_open); +__strong_reference(_sem_close, sem_close); +__strong_reference(_sem_unlink, sem_unlink); +__strong_reference(_sem_wait, sem_wait); +__strong_reference(_sem_trywait, sem_trywait); +__strong_reference(_sem_post, sem_post); +__strong_reference(_sem_getvalue, sem_getvalue); diff --git a/lib/libc_r/uthread/uthread_setprio.c b/lib/libc_r/uthread/uthread_setprio.c index e087beb314..ac10750f92 100644 --- a/lib/libc_r/uthread/uthread_setprio.c +++ b/lib/libc_r/uthread/uthread_setprio.c @@ -30,13 +30,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_setprio.c,v 1.7.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_setprio.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_setprio.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include "pthread_private.h" -__weak_reference(_pthread_setprio, pthread_setprio); - int _pthread_setprio(pthread_t pthread, int prio) { @@ -51,3 +49,5 @@ _pthread_setprio(pthread_t pthread, int prio) /* Return the error status: */ return (ret); } + +__strong_reference(_pthread_setprio, pthread_setprio); diff --git a/lib/libc_r/uthread/uthread_setschedparam.c b/lib/libc_r/uthread/uthread_setschedparam.c index d749aeec74..08eeabe66c 100644 --- a/lib/libc_r/uthread/uthread_setschedparam.c +++ b/lib/libc_r/uthread/uthread_setschedparam.c @@ -30,15 +30,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_setschedparam.c,v 1.5.2.3 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_setschedparam.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_setschedparam.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include #include #include "pthread_private.h" -__weak_reference(_pthread_setschedparam, pthread_setschedparam); - int _pthread_setschedparam(pthread_t pthread, int policy, const struct sched_param *param) @@ -118,3 +116,5 @@ _pthread_setschedparam(pthread_t pthread, int policy, } return(ret); } + +__strong_reference(_pthread_setschedparam, pthread_setschedparam); diff --git a/lib/libc_r/uthread/uthread_sigmask.c b/lib/libc_r/uthread/uthread_sigmask.c index 47b4c1efc2..ad19cb1410 100644 --- a/lib/libc_r/uthread/uthread_sigmask.c +++ b/lib/libc_r/uthread/uthread_sigmask.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_sigmask.c,v 1.5.2.3 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_sigmask.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_sigmask.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -40,8 +40,6 @@ #include #include "pthread_private.h" -__weak_reference(_pthread_sigmask, pthread_sigmask); - int _pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) { @@ -105,3 +103,5 @@ _pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) /* Return the completion status: */ return (ret); } + +__strong_reference(_pthread_sigmask, pthread_sigmask); diff --git a/lib/libc_r/uthread/uthread_single_np.c b/lib/libc_r/uthread/uthread_single_np.c index 73973423fe..3dc12b544f 100644 --- a/lib/libc_r/uthread/uthread_single_np.c +++ b/lib/libc_r/uthread/uthread_single_np.c @@ -30,13 +30,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_single_np.c,v 1.3.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_single_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_single_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include -__weak_reference(_pthread_single_np, pthread_single_np); - int _pthread_single_np() { @@ -48,3 +46,5 @@ int _pthread_single_np() */ return (0); } + +__strong_reference(_pthread_single_np, pthread_single_np); diff --git a/lib/libc_r/uthread/uthread_spec.c b/lib/libc_r/uthread/uthread_spec.c index d81b1567f1..2b6f8baace 100644 --- a/lib/libc_r/uthread/uthread_spec.c +++ b/lib/libc_r/uthread/uthread_spec.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_spec.c,v 1.14.2.2 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_spec.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_spec.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -42,12 +42,6 @@ /* Static variables: */ static struct pthread_key key_table[PTHREAD_KEYS_MAX]; -__weak_reference(_pthread_key_create, pthread_key_create); -__weak_reference(_pthread_key_delete, pthread_key_delete); -__weak_reference(_pthread_getspecific, pthread_getspecific); -__weak_reference(_pthread_setspecific, pthread_setspecific); - - int _pthread_key_create(pthread_key_t * key, void (*destructor) (void *)) { @@ -204,3 +198,8 @@ _pthread_getspecific(pthread_key_t key) data = NULL; return (data); } + +__strong_reference(_pthread_key_create, pthread_key_create); +__strong_reference(_pthread_key_delete, pthread_key_delete); +__strong_reference(_pthread_getspecific, pthread_getspecific); +__strong_reference(_pthread_setspecific, pthread_setspecific); diff --git a/lib/libc_r/uthread/uthread_suspend_np.c b/lib/libc_r/uthread/uthread_suspend_np.c index e68af5f71f..8b6df5ad08 100644 --- a/lib/libc_r/uthread/uthread_suspend_np.c +++ b/lib/libc_r/uthread/uthread_suspend_np.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_suspend_np.c,v 1.7.2.6 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_suspend_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_suspend_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,9 +38,6 @@ static void suspend_common(struct pthread *thread); -__weak_reference(_pthread_suspend_np, pthread_suspend_np); -__weak_reference(_pthread_suspend_all_np, pthread_suspend_all_np); - /* Suspend a thread: */ int _pthread_suspend_np(pthread_t thread) @@ -103,3 +100,6 @@ suspend_common(struct pthread *thread) PTHREAD_SET_STATE(thread, PS_SUSPENDED); } } + +__strong_reference(_pthread_suspend_np, pthread_suspend_np); +__strong_reference(_pthread_suspend_all_np, pthread_suspend_all_np); diff --git a/lib/libc_r/uthread/uthread_switch_np.c b/lib/libc_r/uthread/uthread_switch_np.c index f7268e08ee..9537e9f730 100644 --- a/lib/libc_r/uthread/uthread_switch_np.c +++ b/lib/libc_r/uthread/uthread_switch_np.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_switch_np.c,v 1.3.2.1 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_switch_np.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_switch_np.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include @@ -38,9 +38,6 @@ #include "pthread_private.h" -__weak_reference(_pthread_switch_add_np, pthread_switch_add_np); -__weak_reference(_pthread_switch_delete_np, pthread_switch_delete_np); - int _pthread_switch_add_np(pthread_switch_routine_t routine) { @@ -70,3 +67,6 @@ _pthread_switch_delete_np(pthread_switch_routine_t routine) return(ret); } + +__strong_reference(_pthread_switch_add_np, pthread_switch_add_np); +__strong_reference(_pthread_switch_delete_np, pthread_switch_delete_np); diff --git a/lib/libc_r/uthread/uthread_yield.c b/lib/libc_r/uthread/uthread_yield.c index e0940032e3..a43c83d982 100644 --- a/lib/libc_r/uthread/uthread_yield.c +++ b/lib/libc_r/uthread/uthread_yield.c @@ -30,14 +30,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_yield.c,v 1.4.2.3 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_yield.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_yield.c,v 1.3 2005/05/30 20:50:53 joerg Exp $ */ #include #include "pthread_private.h" -__weak_reference(_sched_yield, sched_yield); -__weak_reference(_pthread_yield, pthread_yield); - int _sched_yield(void) { @@ -65,3 +62,6 @@ _pthread_yield(void) /* Schedule the next thread: */ _thread_kern_sched(NULL); } + +__strong_reference(_sched_yield, sched_yield); +__strong_reference(_pthread_yield, pthread_yield); -- 2.41.0