diff options
| author | deischen <deischen@FreeBSD.org> | 2007-12-16 23:29:57 +0000 |
|---|---|---|
| committer | deischen <deischen@FreeBSD.org> | 2007-12-16 23:29:57 +0000 |
| commit | 8cf2d070a8052f74c73cb0b3d2b09bc755e9ce6e (patch) | |
| tree | 6d85f1ab760abd9317ea7b79e8901fff062f5187 /lib | |
| parent | bb20311c500fd8c49f6ba2960d43526101d39911 (diff) | |
| download | FreeBSD-src-8cf2d070a8052f74c73cb0b3d2b09bc755e9ce6e.zip FreeBSD-src-8cf2d070a8052f74c73cb0b3d2b09bc755e9ce6e.tar.gz | |
Remove hacks to allow libkse to export its symbols in the LIBTHREAD_1_0
version namespace which was needed before the library version was
bumped.
Diffstat (limited to 'lib')
102 files changed, 0 insertions, 481 deletions
diff --git a/lib/libkse/sys/thr_error.c b/lib/libkse/sys/thr_error.c index 63fce9c..eaaf27b 100644 --- a/lib/libkse/sys/thr_error.c +++ b/lib/libkse/sys/thr_error.c @@ -41,8 +41,6 @@ #undef errno extern int errno; -LT10_COMPAT_DEFAULT(__error); - int * __error(void) { diff --git a/lib/libkse/thread/thr_accept.c b/lib/libkse/thread/thr_accept.c index d58c994..76327ef 100644 --- a/lib/libkse/thread/thr_accept.c +++ b/lib/libkse/thread/thr_accept.c @@ -32,12 +32,8 @@ __FBSDID("$FreeBSD$"); #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(__accept); -LT10_COMPAT_DEFAULT(accept); - int __accept(int s, struct sockaddr *addr, socklen_t *addrlen); - __weak_reference(__accept, accept); int diff --git a/lib/libkse/thread/thr_aio_suspend.c b/lib/libkse/thread/thr_aio_suspend.c index 5a779c6..87797f2 100644 --- a/lib/libkse/thread/thr_aio_suspend.c +++ b/lib/libkse/thread/thr_aio_suspend.c @@ -33,9 +33,6 @@ #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(_aio_suspend); -LT10_COMPAT_DEFAULT(aio_suspend); - int _aio_suspend(const struct aiocb * const iocbs[], int niocb, const struct diff --git a/lib/libkse/thread/thr_atfork.c b/lib/libkse/thread/thr_atfork.c index ba62f11..638f27b 100644 --- a/lib/libkse/thread/thr_atfork.c +++ b/lib/libkse/thread/thr_atfork.c @@ -33,9 +33,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_atfork); -LT10_COMPAT_DEFAULT(pthread_atfork); - __weak_reference(_pthread_atfork, pthread_atfork); int diff --git a/lib/libkse/thread/thr_attr_destroy.c b/lib/libkse/thread/thr_attr_destroy.c index 0d85715..3f48e1f 100644 --- a/lib/libkse/thread/thr_attr_destroy.c +++ b/lib/libkse/thread/thr_attr_destroy.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_destroy); -LT10_COMPAT_DEFAULT(pthread_attr_destroy); - __weak_reference(_pthread_attr_destroy, pthread_attr_destroy); int diff --git a/lib/libkse/thread/thr_attr_get_np.c b/lib/libkse/thread/thr_attr_get_np.c index c2fcfbb..fea3565 100644 --- a/lib/libkse/thread/thr_attr_get_np.c +++ b/lib/libkse/thread/thr_attr_get_np.c @@ -34,9 +34,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_get_np); -LT10_COMPAT_DEFAULT(pthread_attr_get_np); - __weak_reference(_pthread_attr_get_np, pthread_attr_get_np); int diff --git a/lib/libkse/thread/thr_attr_getdetachstate.c b/lib/libkse/thread/thr_attr_getdetachstate.c index 2974327..d9e16b8 100644 --- a/lib/libkse/thread/thr_attr_getdetachstate.c +++ b/lib/libkse/thread/thr_attr_getdetachstate.c @@ -34,9 +34,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getdetachstate); -LT10_COMPAT_DEFAULT(pthread_attr_getdetachstate); - __weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate); int diff --git a/lib/libkse/thread/thr_attr_getguardsize.c b/lib/libkse/thread/thr_attr_getguardsize.c index 5f233d1..65a1641 100644 --- a/lib/libkse/thread/thr_attr_getguardsize.c +++ b/lib/libkse/thread/thr_attr_getguardsize.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getguardsize); -LT10_COMPAT_DEFAULT(pthread_attr_getguardsize); - __weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize); int diff --git a/lib/libkse/thread/thr_attr_getinheritsched.c b/lib/libkse/thread/thr_attr_getinheritsched.c index 9568853..fdbdbe9 100644 --- a/lib/libkse/thread/thr_attr_getinheritsched.c +++ b/lib/libkse/thread/thr_attr_getinheritsched.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getinheritsched); -LT10_COMPAT_DEFAULT(pthread_attr_getinheritsched); - __weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched); int diff --git a/lib/libkse/thread/thr_attr_getschedparam.c b/lib/libkse/thread/thr_attr_getschedparam.c index b0a8ec4..369fc38 100644 --- a/lib/libkse/thread/thr_attr_getschedparam.c +++ b/lib/libkse/thread/thr_attr_getschedparam.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getschedparam); -LT10_COMPAT_DEFAULT(pthread_attr_getschedparam); - __weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam); int diff --git a/lib/libkse/thread/thr_attr_getschedpolicy.c b/lib/libkse/thread/thr_attr_getschedpolicy.c index 32af87d..28d48bc 100644 --- a/lib/libkse/thread/thr_attr_getschedpolicy.c +++ b/lib/libkse/thread/thr_attr_getschedpolicy.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getschedpolicy); -LT10_COMPAT_DEFAULT(pthread_attr_getschedpolicy); - __weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy); int diff --git a/lib/libkse/thread/thr_attr_getscope.c b/lib/libkse/thread/thr_attr_getscope.c index 6a6db6f..96963cb 100644 --- a/lib/libkse/thread/thr_attr_getscope.c +++ b/lib/libkse/thread/thr_attr_getscope.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getscope); -LT10_COMPAT_DEFAULT(pthread_attr_getscope); - __weak_reference(_pthread_attr_getscope, pthread_attr_getscope); int diff --git a/lib/libkse/thread/thr_attr_getstack.c b/lib/libkse/thread/thr_attr_getstack.c index 2278bb2..3d279f9 100644 --- a/lib/libkse/thread/thr_attr_getstack.c +++ b/lib/libkse/thread/thr_attr_getstack.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getstack); -LT10_COMPAT_DEFAULT(pthread_attr_getstack); - __weak_reference(_pthread_attr_getstack, pthread_attr_getstack); int diff --git a/lib/libkse/thread/thr_attr_getstackaddr.c b/lib/libkse/thread/thr_attr_getstackaddr.c index 76de764..2c8e593 100644 --- a/lib/libkse/thread/thr_attr_getstackaddr.c +++ b/lib/libkse/thread/thr_attr_getstackaddr.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getstackaddr); -LT10_COMPAT_DEFAULT(pthread_attr_getstackaddr); - __weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr); int diff --git a/lib/libkse/thread/thr_attr_getstacksize.c b/lib/libkse/thread/thr_attr_getstacksize.c index 57fe614..25bb372 100644 --- a/lib/libkse/thread/thr_attr_getstacksize.c +++ b/lib/libkse/thread/thr_attr_getstacksize.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_getstacksize); -LT10_COMPAT_DEFAULT(pthread_attr_getstacksize); - __weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize); int diff --git a/lib/libkse/thread/thr_attr_init.c b/lib/libkse/thread/thr_attr_init.c index b5a966d..f320e4b 100644 --- a/lib/libkse/thread/thr_attr_init.c +++ b/lib/libkse/thread/thr_attr_init.c @@ -37,9 +37,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_init); -LT10_COMPAT_DEFAULT(pthread_attr_init); - __weak_reference(_pthread_attr_init, pthread_attr_init); int diff --git a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c index b72ce81..4dbd181 100644 --- a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c +++ b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setcreatesuspend_np); -LT10_COMPAT_DEFAULT(pthread_attr_setcreatesuspend_np); - int _pthread_attr_setcreatesuspend_np(pthread_attr_t *attr); __weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); diff --git a/lib/libkse/thread/thr_attr_setdetachstate.c b/lib/libkse/thread/thr_attr_setdetachstate.c index d1eb135..6f45a18 100644 --- a/lib/libkse/thread/thr_attr_setdetachstate.c +++ b/lib/libkse/thread/thr_attr_setdetachstate.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setdetachstate); -LT10_COMPAT_DEFAULT(pthread_attr_setdetachstate); - __weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate); int diff --git a/lib/libkse/thread/thr_attr_setguardsize.c b/lib/libkse/thread/thr_attr_setguardsize.c index f396f82..aa6e508 100644 --- a/lib/libkse/thread/thr_attr_setguardsize.c +++ b/lib/libkse/thread/thr_attr_setguardsize.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setguardsize); -LT10_COMPAT_DEFAULT(pthread_attr_setguardsize); - __weak_reference(_pthread_attr_setguardsize, pthread_attr_setguardsize); int diff --git a/lib/libkse/thread/thr_attr_setinheritsched.c b/lib/libkse/thread/thr_attr_setinheritsched.c index 593f148..5c1766b 100644 --- a/lib/libkse/thread/thr_attr_setinheritsched.c +++ b/lib/libkse/thread/thr_attr_setinheritsched.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setinheritsched); -LT10_COMPAT_DEFAULT(pthread_attr_setinheritsched); - __weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched); int diff --git a/lib/libkse/thread/thr_attr_setschedparam.c b/lib/libkse/thread/thr_attr_setschedparam.c index 979c502..d7a6721 100644 --- a/lib/libkse/thread/thr_attr_setschedparam.c +++ b/lib/libkse/thread/thr_attr_setschedparam.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setschedparam); -LT10_COMPAT_DEFAULT(pthread_attr_setschedparam); - __weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam); int diff --git a/lib/libkse/thread/thr_attr_setschedpolicy.c b/lib/libkse/thread/thr_attr_setschedpolicy.c index d8fb5ef..ac5df02 100644 --- a/lib/libkse/thread/thr_attr_setschedpolicy.c +++ b/lib/libkse/thread/thr_attr_setschedpolicy.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setschedpolicy); -LT10_COMPAT_DEFAULT(pthread_attr_setschedpolicy); - __weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy); int diff --git a/lib/libkse/thread/thr_attr_setscope.c b/lib/libkse/thread/thr_attr_setscope.c index a295f25..97930e7 100644 --- a/lib/libkse/thread/thr_attr_setscope.c +++ b/lib/libkse/thread/thr_attr_setscope.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setscope); -LT10_COMPAT_DEFAULT(pthread_attr_setscope); - __weak_reference(_pthread_attr_setscope, pthread_attr_setscope); int diff --git a/lib/libkse/thread/thr_attr_setstack.c b/lib/libkse/thread/thr_attr_setstack.c index 9be6ebd..127e60f 100644 --- a/lib/libkse/thread/thr_attr_setstack.c +++ b/lib/libkse/thread/thr_attr_setstack.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setstack); -LT10_COMPAT_DEFAULT(pthread_attr_setstack); - __weak_reference(_pthread_attr_setstack, pthread_attr_setstack); int diff --git a/lib/libkse/thread/thr_attr_setstackaddr.c b/lib/libkse/thread/thr_attr_setstackaddr.c index da81e1f..2d6cc1b 100644 --- a/lib/libkse/thread/thr_attr_setstackaddr.c +++ b/lib/libkse/thread/thr_attr_setstackaddr.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setstackaddr); -LT10_COMPAT_DEFAULT(pthread_attr_setstackaddr); - __weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr); int diff --git a/lib/libkse/thread/thr_attr_setstacksize.c b/lib/libkse/thread/thr_attr_setstacksize.c index c24c6ec..7d72d71 100644 --- a/lib/libkse/thread/thr_attr_setstacksize.c +++ b/lib/libkse/thread/thr_attr_setstacksize.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_attr_setstacksize); -LT10_COMPAT_DEFAULT(pthread_attr_setstacksize); - __weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize); int diff --git a/lib/libkse/thread/thr_barrier.c b/lib/libkse/thread/thr_barrier.c index ca26437..21113cb 100644 --- a/lib/libkse/thread/thr_barrier.c +++ b/lib/libkse/thread/thr_barrier.c @@ -33,13 +33,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_barrier_init); -LT10_COMPAT_DEFAULT(pthread_barrier_init); -LT10_COMPAT_PRIVATE(_pthread_barrier_wait); -LT10_COMPAT_DEFAULT(pthread_barrier_wait); -LT10_COMPAT_PRIVATE(_pthread_barrier_destroy); -LT10_COMPAT_DEFAULT(pthread_barrier_destroy); - __weak_reference(_pthread_barrier_init, pthread_barrier_init); __weak_reference(_pthread_barrier_wait, pthread_barrier_wait); __weak_reference(_pthread_barrier_destroy, pthread_barrier_destroy); diff --git a/lib/libkse/thread/thr_barrierattr.c b/lib/libkse/thread/thr_barrierattr.c index 9b05fc4..66411dc 100644 --- a/lib/libkse/thread/thr_barrierattr.c +++ b/lib/libkse/thread/thr_barrierattr.c @@ -35,15 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_barrierattr_destroy); -LT10_COMPAT_DEFAULT(pthread_barrierattr_destroy); -LT10_COMPAT_PRIVATE(_pthread_barrierattr_init); -LT10_COMPAT_DEFAULT(pthread_barrierattr_init); -LT10_COMPAT_PRIVATE(_pthread_barrierattr_setpshared); -LT10_COMPAT_DEFAULT(pthread_barrierattr_setpshared); -LT10_COMPAT_PRIVATE(_pthread_barrierattr_getpshared); -LT10_COMPAT_DEFAULT(pthread_barrierattr_getpshared); - __weak_reference(_pthread_barrierattr_destroy, pthread_barrierattr_destroy); __weak_reference(_pthread_barrierattr_init, pthread_barrierattr_init); __weak_reference(_pthread_barrierattr_setpshared, diff --git a/lib/libkse/thread/thr_cancel.c b/lib/libkse/thread/thr_cancel.c index 8dfcb4d..7cffec4 100644 --- a/lib/libkse/thread/thr_cancel.c +++ b/lib/libkse/thread/thr_cancel.c @@ -8,15 +8,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_cancel); -LT10_COMPAT_DEFAULT(pthread_cancel); -LT10_COMPAT_PRIVATE(_pthread_setcancelstate); -LT10_COMPAT_DEFAULT(pthread_setcancelstate); -LT10_COMPAT_PRIVATE(_pthread_setcanceltype); -LT10_COMPAT_DEFAULT(pthread_setcanceltype); -LT10_COMPAT_PRIVATE(_pthread_testcancel); -LT10_COMPAT_DEFAULT(pthread_testcancel); - __weak_reference(_pthread_cancel, pthread_cancel); __weak_reference(_pthread_setcancelstate, pthread_setcancelstate); __weak_reference(_pthread_setcanceltype, pthread_setcanceltype); diff --git a/lib/libkse/thread/thr_clean.c b/lib/libkse/thread/thr_clean.c index 13501ba..37323fd 100644 --- a/lib/libkse/thread/thr_clean.c +++ b/lib/libkse/thread/thr_clean.c @@ -37,11 +37,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_cleanup_push); -LT10_COMPAT_DEFAULT(pthread_cleanup_push); -LT10_COMPAT_PRIVATE(_pthread_cleanup_pop); -LT10_COMPAT_DEFAULT(pthread_cleanup_pop); - __weak_reference(_pthread_cleanup_push, pthread_cleanup_push); __weak_reference(_pthread_cleanup_pop, pthread_cleanup_pop); diff --git a/lib/libkse/thread/thr_close.c b/lib/libkse/thread/thr_close.c index 349ebaa..a76dab1 100644 --- a/lib/libkse/thread/thr_close.c +++ b/lib/libkse/thread/thr_close.c @@ -39,9 +39,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(__close); -LT10_COMPAT_DEFAULT(close); - int __close(int fd); __weak_reference(__close, close); diff --git a/lib/libkse/thread/thr_concurrency.c b/lib/libkse/thread/thr_concurrency.c index d8e2a18..8b1cf56 100644 --- a/lib/libkse/thread/thr_concurrency.c +++ b/lib/libkse/thread/thr_concurrency.c @@ -36,11 +36,6 @@ #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_getconcurrency); -LT10_COMPAT_DEFAULT(pthread_getconcurrency); -LT10_COMPAT_PRIVATE(_pthread_setconcurrency); -LT10_COMPAT_DEFAULT(pthread_setconcurrency); - /*#define DEBUG_CONCURRENCY */ #ifdef DEBUG_CONCURRENCY #define DBG_MSG stdout_debug diff --git a/lib/libkse/thread/thr_cond.c b/lib/libkse/thread/thr_cond.c index d5436c4..3f0b8a9 100644 --- a/lib/libkse/thread/thr_cond.c +++ b/lib/libkse/thread/thr_cond.c @@ -37,21 +37,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(__pthread_cond_wait); -LT10_COMPAT_PRIVATE(_pthread_cond_wait); -LT10_COMPAT_DEFAULT(pthread_cond_wait); -LT10_COMPAT_PRIVATE(__pthread_cond_timedwait); -LT10_COMPAT_PRIVATE(_pthread_cond_timedwait); -LT10_COMPAT_DEFAULT(pthread_cond_timedwait); -LT10_COMPAT_PRIVATE(_pthread_cond_init); -LT10_COMPAT_DEFAULT(pthread_cond_init); -LT10_COMPAT_PRIVATE(_pthread_cond_destroy); -LT10_COMPAT_DEFAULT(pthread_cond_destroy); -LT10_COMPAT_PRIVATE(_pthread_cond_signal); -LT10_COMPAT_DEFAULT(pthread_cond_signal); -LT10_COMPAT_PRIVATE(_pthread_cond_broadcast); -LT10_COMPAT_DEFAULT(pthread_cond_broadcast); - #define THR_IN_CONDQ(thr) (((thr)->sflags & THR_FLAGS_IN_SYNCQ) != 0) #define THR_CONDQ_SET(thr) (thr)->sflags |= THR_FLAGS_IN_SYNCQ #define THR_CONDQ_CLEAR(thr) (thr)->sflags &= ~THR_FLAGS_IN_SYNCQ diff --git a/lib/libkse/thread/thr_condattr_destroy.c b/lib/libkse/thread/thr_condattr_destroy.c index a2925d2..67af37f 100644 --- a/lib/libkse/thread/thr_condattr_destroy.c +++ b/lib/libkse/thread/thr_condattr_destroy.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_condattr_destroy); -LT10_COMPAT_DEFAULT(pthread_condattr_destroy); - __weak_reference(_pthread_condattr_destroy, pthread_condattr_destroy); int diff --git a/lib/libkse/thread/thr_condattr_init.c b/lib/libkse/thread/thr_condattr_init.c index 7b48732..e67364d 100644 --- a/lib/libkse/thread/thr_condattr_init.c +++ b/lib/libkse/thread/thr_condattr_init.c @@ -37,9 +37,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_condattr_init); -LT10_COMPAT_DEFAULT(pthread_condattr_init); - __weak_reference(_pthread_condattr_init, pthread_condattr_init); int diff --git a/lib/libkse/thread/thr_connect.c b/lib/libkse/thread/thr_connect.c index 90331a4..523a1d3 100644 --- a/lib/libkse/thread/thr_connect.c +++ b/lib/libkse/thread/thr_connect.c @@ -32,9 +32,6 @@ __FBSDID("$FreeBSD$"); #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(__connect); -LT10_COMPAT_DEFAULT(connect); - int __connect(int fd, const struct sockaddr *name, socklen_t namelen); __weak_reference(__connect, connect); diff --git a/lib/libkse/thread/thr_creat.c b/lib/libkse/thread/thr_creat.c index d0a2947..63c8067 100644 --- a/lib/libkse/thread/thr_creat.c +++ b/lib/libkse/thread/thr_creat.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(___creat); -LT10_COMPAT_DEFAULT(creat); - extern int __creat(const char *, mode_t); int ___creat(const char *path, mode_t mode); diff --git a/lib/libkse/thread/thr_create.c b/lib/libkse/thread/thr_create.c index e699b74..de1719c 100644 --- a/lib/libkse/thread/thr_create.c +++ b/lib/libkse/thread/thr_create.c @@ -44,9 +44,6 @@ #include "thr_private.h" #include "libc_private.h" -LT10_COMPAT_PRIVATE(_pthread_create); -LT10_COMPAT_DEFAULT(pthread_create); - static void free_thread(struct pthread *curthread, struct pthread *thread); static int create_stack(struct pthread_attr *pattr); static void free_stack(struct pthread_attr *pattr); diff --git a/lib/libkse/thread/thr_detach.c b/lib/libkse/thread/thr_detach.c index 2e2a290..adb6861 100644 --- a/lib/libkse/thread/thr_detach.c +++ b/lib/libkse/thread/thr_detach.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_detach); -LT10_COMPAT_DEFAULT(pthread_detach); - __weak_reference(_pthread_detach, pthread_detach); int diff --git a/lib/libkse/thread/thr_equal.c b/lib/libkse/thread/thr_equal.c index 78cd6b5..ab6f884 100644 --- a/lib/libkse/thread/thr_equal.c +++ b/lib/libkse/thread/thr_equal.c @@ -34,9 +34,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_equal); -LT10_COMPAT_DEFAULT(pthread_equal); - __weak_reference(_pthread_equal, pthread_equal); int diff --git a/lib/libkse/thread/thr_execve.c b/lib/libkse/thread/thr_execve.c index a12cf7f..2e700fc 100644 --- a/lib/libkse/thread/thr_execve.c +++ b/lib/libkse/thread/thr_execve.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_execve); -LT10_COMPAT_DEFAULT(execve); - __weak_reference(_execve, execve); int diff --git a/lib/libkse/thread/thr_exit.c b/lib/libkse/thread/thr_exit.c index fc93ccb..7c61821 100644 --- a/lib/libkse/thread/thr_exit.c +++ b/lib/libkse/thread/thr_exit.c @@ -40,9 +40,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_exit); -LT10_COMPAT_DEFAULT(pthread_exit); - void _pthread_exit(void *status); __weak_reference(_pthread_exit, pthread_exit); diff --git a/lib/libkse/thread/thr_fcntl.c b/lib/libkse/thread/thr_fcntl.c index f880fcb..113cd73 100644 --- a/lib/libkse/thread/thr_fcntl.c +++ b/lib/libkse/thread/thr_fcntl.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(__fcntl); -LT10_COMPAT_DEFAULT(fcntl); - int __fcntl(int fd, int cmd,...); __weak_reference(__fcntl, fcntl); diff --git a/lib/libkse/thread/thr_fork.c b/lib/libkse/thread/thr_fork.c index 0b1c639..659bcb3 100644 --- a/lib/libkse/thread/thr_fork.c +++ b/lib/libkse/thread/thr_fork.c @@ -43,9 +43,6 @@ #include "libc_private.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_fork); -LT10_COMPAT_DEFAULT(fork); - pid_t _fork(void); __weak_reference(_fork, fork); diff --git a/lib/libkse/thread/thr_fsync.c b/lib/libkse/thread/thr_fsync.c index e040770..7cf52aa 100644 --- a/lib/libkse/thread/thr_fsync.c +++ b/lib/libkse/thread/thr_fsync.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(__fsync); -LT10_COMPAT_DEFAULT(fsync); - int __fsync(int fd); __weak_reference(__fsync, fsync); diff --git a/lib/libkse/thread/thr_getprio.c b/lib/libkse/thread/thr_getprio.c index 426e77d..0672d90 100644 --- a/lib/libkse/thread/thr_getprio.c +++ b/lib/libkse/thread/thr_getprio.c @@ -36,9 +36,6 @@ #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_getprio); -LT10_COMPAT_DEFAULT(pthread_getprio); - __weak_reference(_pthread_getprio, pthread_getprio); int diff --git a/lib/libkse/thread/thr_getschedparam.c b/lib/libkse/thread/thr_getschedparam.c index a56672f..0cb1cc5 100644 --- a/lib/libkse/thread/thr_getschedparam.c +++ b/lib/libkse/thread/thr_getschedparam.c @@ -38,9 +38,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_getschedparam); -LT10_COMPAT_DEFAULT(pthread_getschedparam); - __weak_reference(_pthread_getschedparam, pthread_getschedparam); int diff --git a/lib/libkse/thread/thr_info.c b/lib/libkse/thread/thr_info.c index 1d7c3f8..ac0e750 100644 --- a/lib/libkse/thread/thr_info.c +++ b/lib/libkse/thread/thr_info.c @@ -44,9 +44,6 @@ #define NELEMENTS(arr) (sizeof(arr) / sizeof(arr[0])) #endif -LT10_COMPAT_PRIVATE(_pthread_set_name_np); -LT10_COMPAT_DEFAULT(pthread_set_name_np); - static void dump_thread(int fd, pthread_t pthread, int long_version); void _pthread_set_name_np(pthread_t thread, char *name); diff --git a/lib/libkse/thread/thr_init.c b/lib/libkse/thread/thr_init.c index 8f9ea6a..6c41961 100644 --- a/lib/libkse/thread/thr_init.c +++ b/lib/libkse/thread/thr_init.c @@ -66,11 +66,6 @@ #include "libc_private.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_libkse_debug); -LT10_COMPAT_PRIVATE(_thread_activated); -LT10_COMPAT_PRIVATE(_thread_active_threads); -LT10_COMPAT_PRIVATE(_thread_list); - int __pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); int __pthread_mutex_lock(pthread_mutex_t *); int __pthread_mutex_trylock(pthread_mutex_t *); diff --git a/lib/libkse/thread/thr_join.c b/lib/libkse/thread/thr_join.c index b606f5f..3a95ed2 100644 --- a/lib/libkse/thread/thr_join.c +++ b/lib/libkse/thread/thr_join.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_join); -LT10_COMPAT_DEFAULT(pthread_join); - __weak_reference(_pthread_join, pthread_join); int diff --git a/lib/libkse/thread/thr_kill.c b/lib/libkse/thread/thr_kill.c index fd8fdca..e543fea 100644 --- a/lib/libkse/thread/thr_kill.c +++ b/lib/libkse/thread/thr_kill.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_kill); -LT10_COMPAT_DEFAULT(pthread_kill); - __weak_reference(_pthread_kill, pthread_kill); int diff --git a/lib/libkse/thread/thr_main_np.c b/lib/libkse/thread/thr_main_np.c index 78b6754..d3e7a43 100644 --- a/lib/libkse/thread/thr_main_np.c +++ b/lib/libkse/thread/thr_main_np.c @@ -33,9 +33,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_main_np); -LT10_COMPAT_DEFAULT(pthread_main_np); - __weak_reference(_pthread_main_np, pthread_main_np); /* diff --git a/lib/libkse/thread/thr_mattr_init.c b/lib/libkse/thread/thr_mattr_init.c index aadac4b..50a968c 100644 --- a/lib/libkse/thread/thr_mattr_init.c +++ b/lib/libkse/thread/thr_mattr_init.c @@ -40,9 +40,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_mutexattr_init); -LT10_COMPAT_DEFAULT(pthread_mutexattr_init); - __weak_reference(_pthread_mutexattr_init, pthread_mutexattr_init); int diff --git a/lib/libkse/thread/thr_mattr_kind_np.c b/lib/libkse/thread/thr_mattr_kind_np.c index 8b82a25..67d338e 100644 --- a/lib/libkse/thread/thr_mattr_kind_np.c +++ b/lib/libkse/thread/thr_mattr_kind_np.c @@ -35,15 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_mutexattr_setkind_np); -LT10_COMPAT_DEFAULT(pthread_mutexattr_setkind_np); -LT10_COMPAT_PRIVATE(_pthread_mutexattr_getkind_np); -LT10_COMPAT_DEFAULT(pthread_mutexattr_getkind_np); -LT10_COMPAT_PRIVATE(_pthread_mutexattr_gettype); -LT10_COMPAT_DEFAULT(pthread_mutexattr_gettype); -LT10_COMPAT_PRIVATE(_pthread_mutexattr_settype); -LT10_COMPAT_DEFAULT(pthread_mutexattr_settype); - int _pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind); int _pthread_mutexattr_getkind_np(pthread_mutexattr_t attr); diff --git a/lib/libkse/thread/thr_msync.c b/lib/libkse/thread/thr_msync.c index f51a6a3..8bb0017 100644 --- a/lib/libkse/thread/thr_msync.c +++ b/lib/libkse/thread/thr_msync.c @@ -13,9 +13,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(__msync); -LT10_COMPAT_DEFAULT(msync); - int __msync(void *addr, size_t len, int flags); __weak_reference(__msync, msync); diff --git a/lib/libkse/thread/thr_multi_np.c b/lib/libkse/thread/thr_multi_np.c index 9e76c2a..0886540 100644 --- a/lib/libkse/thread/thr_multi_np.c +++ b/lib/libkse/thread/thr_multi_np.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_multi_np); -LT10_COMPAT_DEFAULT(pthread_multi_np); - __weak_reference(_pthread_multi_np, pthread_multi_np); int diff --git a/lib/libkse/thread/thr_mutex.c b/lib/libkse/thread/thr_mutex.c index fe101c7..f6b0e24 100644 --- a/lib/libkse/thread/thr_mutex.c +++ b/lib/libkse/thread/thr_mutex.c @@ -101,23 +101,6 @@ static struct pthread_mutex_attr static_mutex_attr = PTHREAD_MUTEXATTR_STATIC_INITIALIZER; static pthread_mutexattr_t static_mattr = &static_mutex_attr; -LT10_COMPAT_PRIVATE(__pthread_mutex_init); -LT10_COMPAT_PRIVATE(_pthread_mutex_init); -LT10_COMPAT_DEFAULT(pthread_mutex_init); -LT10_COMPAT_PRIVATE(__pthread_mutex_lock); -LT10_COMPAT_PRIVATE(_pthread_mutex_lock); -LT10_COMPAT_DEFAULT(pthread_mutex_lock); -LT10_COMPAT_PRIVATE(__pthread_mutex_timedlock); -LT10_COMPAT_PRIVATE(_pthread_mutex_timedlock); -LT10_COMPAT_DEFAULT(pthread_mutex_timedlock); -LT10_COMPAT_PRIVATE(__pthread_mutex_trylock); -LT10_COMPAT_PRIVATE(_pthread_mutex_trylock); -LT10_COMPAT_DEFAULT(pthread_mutex_trylock); -LT10_COMPAT_PRIVATE(_pthread_mutex_destroy); -LT10_COMPAT_DEFAULT(pthread_mutex_destroy); -LT10_COMPAT_PRIVATE(_pthread_mutex_unlock); -LT10_COMPAT_DEFAULT(pthread_mutex_unlock); - /* Single underscore versions provided for libc internal usage: */ __weak_reference(__pthread_mutex_init, pthread_mutex_init); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); diff --git a/lib/libkse/thread/thr_mutex_prioceiling.c b/lib/libkse/thread/thr_mutex_prioceiling.c index 876f7c7..7f1caf3 100644 --- a/lib/libkse/thread/thr_mutex_prioceiling.c +++ b/lib/libkse/thread/thr_mutex_prioceiling.c @@ -40,15 +40,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_mutexattr_getprioceiling); -LT10_COMPAT_DEFAULT(pthread_mutexattr_getprioceiling); -LT10_COMPAT_PRIVATE(_pthread_mutexattr_setprioceiling); -LT10_COMPAT_DEFAULT(pthread_mutexattr_setprioceiling); -LT10_COMPAT_PRIVATE(_pthread_mutex_getprioceiling); -LT10_COMPAT_DEFAULT(pthread_mutex_getprioceiling); -LT10_COMPAT_PRIVATE(_pthread_mutex_setprioceiling); -LT10_COMPAT_DEFAULT(pthread_mutex_setprioceiling); - __weak_reference(_pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling); __weak_reference(_pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling); __weak_reference(_pthread_mutex_getprioceiling, pthread_mutex_getprioceiling); diff --git a/lib/libkse/thread/thr_mutex_protocol.c b/lib/libkse/thread/thr_mutex_protocol.c index 64e31a0..6ec2239 100644 --- a/lib/libkse/thread/thr_mutex_protocol.c +++ b/lib/libkse/thread/thr_mutex_protocol.c @@ -40,11 +40,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_mutexattr_getprotocol); -LT10_COMPAT_DEFAULT(pthread_mutexattr_getprotocol); -LT10_COMPAT_PRIVATE(_pthread_mutexattr_setprotocol); -LT10_COMPAT_DEFAULT(pthread_mutexattr_setprotocol); - __weak_reference(_pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol); __weak_reference(_pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol); diff --git a/lib/libkse/thread/thr_mutexattr_destroy.c b/lib/libkse/thread/thr_mutexattr_destroy.c index c12efb1..8e0537e 100644 --- a/lib/libkse/thread/thr_mutexattr_destroy.c +++ b/lib/libkse/thread/thr_mutexattr_destroy.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_mutexattr_destroy); -LT10_COMPAT_DEFAULT(pthread_mutexattr_destroy); - __weak_reference(_pthread_mutexattr_destroy, pthread_mutexattr_destroy); int diff --git a/lib/libkse/thread/thr_nanosleep.c b/lib/libkse/thread/thr_nanosleep.c index 9f04ead..b8210af 100644 --- a/lib/libkse/thread/thr_nanosleep.c +++ b/lib/libkse/thread/thr_nanosleep.c @@ -39,10 +39,6 @@ int __nanosleep(const struct timespec *time_to_sleep, struct timespec *time_remaining); -LT10_COMPAT_PRIVATE(__nanosleep); -LT10_COMPAT_PRIVATE(_nanosleep); -LT10_COMPAT_DEFAULT(nanosleep); - __weak_reference(__nanosleep, nanosleep); int diff --git a/lib/libkse/thread/thr_once.c b/lib/libkse/thread/thr_once.c index ba13499..eae29ac 100644 --- a/lib/libkse/thread/thr_once.c +++ b/lib/libkse/thread/thr_once.c @@ -34,9 +34,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_once); -LT10_COMPAT_DEFAULT(pthread_once); - __weak_reference(_pthread_once, pthread_once); #define ONCE_NEVER_DONE PTHREAD_NEEDS_INIT diff --git a/lib/libkse/thread/thr_open.c b/lib/libkse/thread/thr_open.c index 732a770..d60763b 100644 --- a/lib/libkse/thread/thr_open.c +++ b/lib/libkse/thread/thr_open.c @@ -42,9 +42,6 @@ int __open(const char *path, int flags,...); -LT10_COMPAT_PRIVATE(__open); -LT10_COMPAT_DEFAULT(open); - __weak_reference(__open, open); int diff --git a/lib/libkse/thread/thr_pause.c b/lib/libkse/thread/thr_pause.c index a513bcb..fda1e2e 100644 --- a/lib/libkse/thread/thr_pause.c +++ b/lib/libkse/thread/thr_pause.c @@ -39,9 +39,6 @@ int _pause(void); extern int __pause(void); -LT10_COMPAT_PRIVATE(_pause); -LT10_COMPAT_DEFAULT(pause); - __weak_reference(_pause, pause); int diff --git a/lib/libkse/thread/thr_poll.c b/lib/libkse/thread/thr_poll.c index 494e82b..03f11ce 100644 --- a/lib/libkse/thread/thr_poll.c +++ b/lib/libkse/thread/thr_poll.c @@ -44,9 +44,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(__poll); -LT10_COMPAT_DEFAULT(poll); - int __poll(struct pollfd *fds, unsigned int nfds, int timeout); __weak_reference(__poll, poll); diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 82728d3..46f6e80 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -56,39 +56,6 @@ #include "pthread_md.h" #endif -/* - * Unfortunately, libpthread had symbol versioning before libc. - * But now libc has symbol versioning, we need to occupy the - * same version namespace in order to override some libc functions. - * So in order to avoid breaking binaries requiring symbols from - * LIBTHREAD_1_0, we need to provide a compatible interface for - * those symbols. - */ -#if 0 -#define SYM_LT10(sym) __CONCAT(sym, _lt10) -#define SYM_FB10(sym) __CONCAT(sym, _fb10) -#define SYM_FBP10(sym) __CONCAT(sym, _fbp10) -#define WEAK_REF(sym, alias) __weak_reference(sym, alias) -#define SYM_COMPAT(sym, impl, ver) __sym_compat(sym, impl, ver) -#define SYM_DEFAULT(sym, impl, ver) __sym_default(sym, impl, ver) - -#define LT10_COMPAT(sym) \ - WEAK_REF(sym, SYM_LT10(sym)); \ - SYM_COMPAT(sym, SYM_LT10(sym), LIBTHREAD_1_0) - -#define LT10_COMPAT_DEFAULT(sym) \ - LT10_COMPAT(sym); \ - WEAK_REF(sym, SYM_FB10(sym)); \ - SYM_DEFAULT(sym, SYM_FB10(sym), FBSD_1.0) - -#define LT10_COMPAT_PRIVATE(sym) \ - LT10_COMPAT(sym); \ - WEAK_REF(sym, SYM_FBP10(sym)); \ - SYM_DEFAULT(sym, SYM_FBP10(sym), FBSDprivate_1.0) -#else -#define LT10_COMPAT_DEFAULT(sym) -#define LT10_COMPAT_PRIVATE(sym) -#endif /* * Evaluate the storage class specifier. diff --git a/lib/libkse/thread/thr_pselect.c b/lib/libkse/thread/thr_pselect.c index c1499b8..a8cbf13 100644 --- a/lib/libkse/thread/thr_pselect.c +++ b/lib/libkse/thread/thr_pselect.c @@ -44,9 +44,6 @@ extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, int _pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); -LT10_COMPAT_PRIVATE(_pselect); -LT10_COMPAT_DEFAULT(pselect); - __weak_reference(_pselect, pselect); int diff --git a/lib/libkse/thread/thr_pspinlock.c b/lib/libkse/thread/thr_pspinlock.c index 2d6075a..76376be 100644 --- a/lib/libkse/thread/thr_pspinlock.c +++ b/lib/libkse/thread/thr_pspinlock.c @@ -39,17 +39,6 @@ #define SPIN_COUNT 10000 -LT10_COMPAT_PRIVATE(_pthread_spin_init); -LT10_COMPAT_DEFAULT(pthread_spin_init); -LT10_COMPAT_PRIVATE(_pthread_spin_destroy); -LT10_COMPAT_DEFAULT(pthread_spin_destroy); -LT10_COMPAT_PRIVATE(_pthread_spin_trylock); -LT10_COMPAT_DEFAULT(pthread_spin_trylock); -LT10_COMPAT_PRIVATE(_pthread_spin_lock); -LT10_COMPAT_DEFAULT(pthread_spin_lock); -LT10_COMPAT_PRIVATE(_pthread_spin_unlock); -LT10_COMPAT_DEFAULT(pthread_spin_unlock); - __weak_reference(_pthread_spin_init, pthread_spin_init); __weak_reference(_pthread_spin_destroy, pthread_spin_destroy); __weak_reference(_pthread_spin_trylock, pthread_spin_trylock); diff --git a/lib/libkse/thread/thr_raise.c b/lib/libkse/thread/thr_raise.c index 835ad234..707852a 100644 --- a/lib/libkse/thread/thr_raise.c +++ b/lib/libkse/thread/thr_raise.c @@ -37,9 +37,6 @@ int _raise(int sig); -LT10_COMPAT_PRIVATE(_raise); -LT10_COMPAT_DEFAULT(raise); - __weak_reference(_raise, raise); int diff --git a/lib/libkse/thread/thr_read.c b/lib/libkse/thread/thr_read.c index 16e8d79..829d069 100644 --- a/lib/libkse/thread/thr_read.c +++ b/lib/libkse/thread/thr_read.c @@ -42,9 +42,6 @@ ssize_t __read(int fd, void *buf, size_t nbytes); -LT10_COMPAT_PRIVATE(__read); -LT10_COMPAT_DEFAULT(read); - __weak_reference(__read, read); ssize_t diff --git a/lib/libkse/thread/thr_readv.c b/lib/libkse/thread/thr_readv.c index 04c9f9d..660a65a 100644 --- a/lib/libkse/thread/thr_readv.c +++ b/lib/libkse/thread/thr_readv.c @@ -42,9 +42,6 @@ ssize_t __readv(int fd, const struct iovec *iov, int iovcnt); -LT10_COMPAT_PRIVATE(__readv); -LT10_COMPAT_DEFAULT(readv); - __weak_reference(__readv, readv); ssize_t diff --git a/lib/libkse/thread/thr_resume_np.c b/lib/libkse/thread/thr_resume_np.c index d6991f5..685dbf3 100644 --- a/lib/libkse/thread/thr_resume_np.c +++ b/lib/libkse/thread/thr_resume_np.c @@ -40,11 +40,6 @@ void _pthread_resume_all_np(void); static struct kse_mailbox *resume_common(struct pthread *); -LT10_COMPAT_PRIVATE(_pthread_resume_np); -LT10_COMPAT_DEFAULT(pthread_resume_np); -LT10_COMPAT_PRIVATE(_pthread_resume_all_np); -LT10_COMPAT_DEFAULT(pthread_resume_all_np); - __weak_reference(_pthread_resume_np, pthread_resume_np); __weak_reference(_pthread_resume_all_np, pthread_resume_all_np); diff --git a/lib/libkse/thread/thr_rwlock.c b/lib/libkse/thread/thr_rwlock.c index 0f73448..1c96c3a 100644 --- a/lib/libkse/thread/thr_rwlock.c +++ b/lib/libkse/thread/thr_rwlock.c @@ -37,25 +37,6 @@ /* maximum number of times a read lock may be obtained */ #define MAX_READ_LOCKS (INT_MAX - 1) -LT10_COMPAT_PRIVATE(_pthread_rwlock_destroy); -LT10_COMPAT_DEFAULT(pthread_rwlock_destroy); -LT10_COMPAT_PRIVATE(_pthread_rwlock_init); -LT10_COMPAT_DEFAULT(pthread_rwlock_init); -LT10_COMPAT_PRIVATE(_pthread_rwlock_rdlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_rdlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_timedrdlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_timedrdlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_tryrdlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_tryrdlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_trywrlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_trywrlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_unlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_unlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_wrlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_wrlock); -LT10_COMPAT_PRIVATE(_pthread_rwlock_timedwrlock); -LT10_COMPAT_DEFAULT(pthread_rwlock_timedwrlock); - __weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy); __weak_reference(_pthread_rwlock_init, pthread_rwlock_init); __weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock); diff --git a/lib/libkse/thread/thr_rwlockattr.c b/lib/libkse/thread/thr_rwlockattr.c index d8fafe2..e5b9c96 100644 --- a/lib/libkse/thread/thr_rwlockattr.c +++ b/lib/libkse/thread/thr_rwlockattr.c @@ -33,15 +33,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_rwlockattr_destroy); -LT10_COMPAT_DEFAULT(pthread_rwlockattr_destroy); -LT10_COMPAT_PRIVATE(_pthread_rwlockattr_getpshared); -LT10_COMPAT_DEFAULT(pthread_rwlockattr_getpshared); -LT10_COMPAT_PRIVATE(_pthread_rwlockattr_init); -LT10_COMPAT_DEFAULT(pthread_rwlockattr_init); -LT10_COMPAT_PRIVATE(_pthread_rwlockattr_setpshared); -LT10_COMPAT_DEFAULT(pthread_rwlockattr_setpshared); - __weak_reference(_pthread_rwlockattr_destroy, pthread_rwlockattr_destroy); __weak_reference(_pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared); __weak_reference(_pthread_rwlockattr_init, pthread_rwlockattr_init); diff --git a/lib/libkse/thread/thr_select.c b/lib/libkse/thread/thr_select.c index 19d7dd8..6d0219c 100644 --- a/lib/libkse/thread/thr_select.c +++ b/lib/libkse/thread/thr_select.c @@ -46,9 +46,6 @@ int __select(int numfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); -LT10_COMPAT_PRIVATE(__select); -LT10_COMPAT_DEFAULT(select); - __weak_reference(__select, select); int diff --git a/lib/libkse/thread/thr_self.c b/lib/libkse/thread/thr_self.c index 426995c..bad0041 100644 --- a/lib/libkse/thread/thr_self.c +++ b/lib/libkse/thread/thr_self.c @@ -34,9 +34,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_self); -LT10_COMPAT_DEFAULT(pthread_self); - __weak_reference(_pthread_self, pthread_self); pthread_t diff --git a/lib/libkse/thread/thr_sem.c b/lib/libkse/thread/thr_sem.c index 21746bbe..87d2057b 100644 --- a/lib/libkse/thread/thr_sem.c +++ b/lib/libkse/thread/thr_sem.c @@ -43,15 +43,6 @@ #include "libc_private.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_sem_init); -LT10_COMPAT_DEFAULT(sem_init); -LT10_COMPAT_PRIVATE(_sem_wait); -LT10_COMPAT_DEFAULT(sem_wait); -LT10_COMPAT_PRIVATE(_sem_timedwait); -LT10_COMPAT_DEFAULT(sem_timedwait); -LT10_COMPAT_PRIVATE(_sem_post); -LT10_COMPAT_DEFAULT(sem_post); - __weak_reference(_sem_init, sem_init); __weak_reference(_sem_wait, sem_wait); __weak_reference(_sem_timedwait, sem_timedwait); diff --git a/lib/libkse/thread/thr_setprio.c b/lib/libkse/thread/thr_setprio.c index 2197722..4ea9962 100644 --- a/lib/libkse/thread/thr_setprio.c +++ b/lib/libkse/thread/thr_setprio.c @@ -36,9 +36,6 @@ int _pthread_setprio(pthread_t pthread, int prio); -LT10_COMPAT_PRIVATE(_pthread_setprio); -LT10_COMPAT_DEFAULT(pthread_setprio); - __weak_reference(_pthread_setprio, pthread_setprio); int diff --git a/lib/libkse/thread/thr_setschedparam.c b/lib/libkse/thread/thr_setschedparam.c index 14bef84..4a9354f 100644 --- a/lib/libkse/thread/thr_setschedparam.c +++ b/lib/libkse/thread/thr_setschedparam.c @@ -39,9 +39,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_setschedparam); -LT10_COMPAT_DEFAULT(pthread_setschedparam); - __weak_reference(_pthread_setschedparam, pthread_setschedparam); int diff --git a/lib/libkse/thread/thr_sigaction.c b/lib/libkse/thread/thr_sigaction.c index 3cd7ea8..dda1c35 100644 --- a/lib/libkse/thread/thr_sigaction.c +++ b/lib/libkse/thread/thr_sigaction.c @@ -36,9 +36,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_sigaction); -LT10_COMPAT_DEFAULT(sigaction); - __weak_reference(_sigaction, sigaction); int diff --git a/lib/libkse/thread/thr_sigaltstack.c b/lib/libkse/thread/thr_sigaltstack.c index 070b422..629f5b0 100644 --- a/lib/libkse/thread/thr_sigaltstack.c +++ b/lib/libkse/thread/thr_sigaltstack.c @@ -35,9 +35,6 @@ __FBSDID("$FreeBSD$"); int _sigaltstack(stack_t *_ss, stack_t *_oss); -LT10_COMPAT_PRIVATE(_sigaltstack); -LT10_COMPAT_DEFAULT(sigaltstack); - __weak_reference(_sigaltstack, sigaltstack); int diff --git a/lib/libkse/thread/thr_sigmask.c b/lib/libkse/thread/thr_sigmask.c index 15fb1d7..4a9fdea 100644 --- a/lib/libkse/thread/thr_sigmask.c +++ b/lib/libkse/thread/thr_sigmask.c @@ -40,9 +40,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_sigmask); -LT10_COMPAT_DEFAULT(pthread_sigmask); - __weak_reference(_pthread_sigmask, pthread_sigmask); int diff --git a/lib/libkse/thread/thr_sigpending.c b/lib/libkse/thread/thr_sigpending.c index b0bdaec..f0183e7 100644 --- a/lib/libkse/thread/thr_sigpending.c +++ b/lib/libkse/thread/thr_sigpending.c @@ -44,9 +44,6 @@ int _sigpending(sigset_t *set); -LT10_COMPAT_PRIVATE(_sigpending); -LT10_COMPAT_DEFAULT(sigpending); - __weak_reference(_sigpending, sigpending); int diff --git a/lib/libkse/thread/thr_sigprocmask.c b/lib/libkse/thread/thr_sigprocmask.c index 8c5c17f..45fa5e2 100644 --- a/lib/libkse/thread/thr_sigprocmask.c +++ b/lib/libkse/thread/thr_sigprocmask.c @@ -39,9 +39,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_sigprocmask); -LT10_COMPAT_DEFAULT(sigprocmask); - __weak_reference(_sigprocmask, sigprocmask); int diff --git a/lib/libkse/thread/thr_sigsuspend.c b/lib/libkse/thread/thr_sigsuspend.c index c233660..a6ef350 100644 --- a/lib/libkse/thread/thr_sigsuspend.c +++ b/lib/libkse/thread/thr_sigsuspend.c @@ -41,10 +41,6 @@ int __sigsuspend(const sigset_t * set); -LT10_COMPAT_PRIVATE(__sigsuspend); -LT10_COMPAT_PRIVATE(_sigsuspend); -LT10_COMPAT_DEFAULT(sigsuspend); - __weak_reference(__sigsuspend, sigsuspend); int diff --git a/lib/libkse/thread/thr_sigwait.c b/lib/libkse/thread/thr_sigwait.c index 19c1cd7..a9cdafa 100644 --- a/lib/libkse/thread/thr_sigwait.c +++ b/lib/libkse/thread/thr_sigwait.c @@ -48,16 +48,6 @@ int _sigtimedwait(const sigset_t *set, siginfo_t *info, int _sigwaitinfo(const sigset_t *set, siginfo_t *info); int _sigwait(const sigset_t *set, int *sig); -LT10_COMPAT_PRIVATE(__sigwait); -LT10_COMPAT_PRIVATE(_sigwait); -LT10_COMPAT_DEFAULT(sigwait); -LT10_COMPAT_PRIVATE(__sigtimedwait); -LT10_COMPAT_PRIVATE(_sigtimedwait); -LT10_COMPAT_DEFAULT(sigtimedwait); -LT10_COMPAT_PRIVATE(__sigwaitinfo); -LT10_COMPAT_PRIVATE(_sigwaitinfo); -LT10_COMPAT_DEFAULT(sigwaitinfo); - __weak_reference(__sigwait, sigwait); __weak_reference(__sigtimedwait, sigtimedwait); __weak_reference(__sigwaitinfo, sigwaitinfo); diff --git a/lib/libkse/thread/thr_single_np.c b/lib/libkse/thread/thr_single_np.c index 844adad..8f004e9 100644 --- a/lib/libkse/thread/thr_single_np.c +++ b/lib/libkse/thread/thr_single_np.c @@ -35,9 +35,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_single_np); -LT10_COMPAT_DEFAULT(pthread_single_np); - int _pthread_single_np(void); __weak_reference(_pthread_single_np, pthread_single_np); diff --git a/lib/libkse/thread/thr_sleep.c b/lib/libkse/thread/thr_sleep.c index c271055..ffa76b2 100644 --- a/lib/libkse/thread/thr_sleep.c +++ b/lib/libkse/thread/thr_sleep.c @@ -40,11 +40,6 @@ extern int __usleep(useconds_t); unsigned int _sleep(unsigned int seconds); -LT10_COMPAT_PRIVATE(_sleep); -LT10_COMPAT_DEFAULT(sleep); -LT10_COMPAT_PRIVATE(_usleep); -LT10_COMPAT_DEFAULT(usleep); - __weak_reference(_sleep, sleep); __weak_reference(_usleep, usleep); diff --git a/lib/libkse/thread/thr_spec.c b/lib/libkse/thread/thr_spec.c index a7c6c2c..1d4be45 100644 --- a/lib/libkse/thread/thr_spec.c +++ b/lib/libkse/thread/thr_spec.c @@ -41,21 +41,6 @@ struct pthread_key _thread_keytable[PTHREAD_KEYS_MAX]; -/* - * XXX - This breaks the linker if LT10_COMPAT_DEFAULT doesn't - * also include a weak reference to the default symbol. - */ -LT10_COMPAT_PRIVATE(_thread_keytable); - -LT10_COMPAT_PRIVATE(_pthread_key_create); -LT10_COMPAT_DEFAULT(pthread_key_create); -LT10_COMPAT_PRIVATE(_pthread_key_delete); -LT10_COMPAT_DEFAULT(pthread_key_delete); -LT10_COMPAT_PRIVATE(_pthread_getspecific); -LT10_COMPAT_DEFAULT(pthread_getspecific); -LT10_COMPAT_PRIVATE(_pthread_setspecific); -LT10_COMPAT_DEFAULT(pthread_setspecific); - __weak_reference(_pthread_key_create, pthread_key_create); __weak_reference(_pthread_key_delete, pthread_key_delete); __weak_reference(_pthread_getspecific, pthread_getspecific); diff --git a/lib/libkse/thread/thr_spinlock.c b/lib/libkse/thread/thr_spinlock.c index c38f091..685301f 100644 --- a/lib/libkse/thread/thr_spinlock.c +++ b/lib/libkse/thread/thr_spinlock.c @@ -65,10 +65,6 @@ static struct spinlock_extra extra[MAX_SPINLOCKS]; static int spinlock_count = 0; static int initialized = 0; -LT10_COMPAT_PRIVATE(_spinlock); -LT10_COMPAT_PRIVATE(_spinlock_debug); -LT10_COMPAT_PRIVATE(_spinunlock); - /* * These are for compatability only. Spinlocks of this type * are deprecated. diff --git a/lib/libkse/thread/thr_suspend_np.c b/lib/libkse/thread/thr_suspend_np.c index fa60d30..99af59c 100644 --- a/lib/libkse/thread/thr_suspend_np.c +++ b/lib/libkse/thread/thr_suspend_np.c @@ -40,11 +40,6 @@ void _pthread_suspend_all_np(void); static void suspend_common(struct pthread *thread); -LT10_COMPAT_PRIVATE(_pthread_suspend_np); -LT10_COMPAT_DEFAULT(pthread_suspend_np); -LT10_COMPAT_PRIVATE(_pthread_suspend_all_np); -LT10_COMPAT_DEFAULT(pthread_suspend_all_np); - __weak_reference(_pthread_suspend_np, pthread_suspend_np); __weak_reference(_pthread_suspend_all_np, pthread_suspend_all_np); diff --git a/lib/libkse/thread/thr_switch_np.c b/lib/libkse/thread/thr_switch_np.c index cc9ae30..058a3bb 100644 --- a/lib/libkse/thread/thr_switch_np.c +++ b/lib/libkse/thread/thr_switch_np.c @@ -39,11 +39,6 @@ #include "un-namespace.h" #include "thr_private.h" -LT10_COMPAT_PRIVATE(_pthread_switch_add_np); -LT10_COMPAT_DEFAULT(pthread_switch_add_np); -LT10_COMPAT_PRIVATE(_pthread_switch_delete_np); -LT10_COMPAT_DEFAULT(pthread_switch_delete_np); - __weak_reference(_pthread_switch_add_np, pthread_switch_add_np); __weak_reference(_pthread_switch_delete_np, pthread_switch_delete_np); diff --git a/lib/libkse/thread/thr_symbols.c b/lib/libkse/thread/thr_symbols.c index cbf2827..f48cc0f 100644 --- a/lib/libkse/thread/thr_symbols.c +++ b/lib/libkse/thread/thr_symbols.c @@ -38,24 +38,6 @@ #include "thr_private.h" -LT10_COMPAT_PRIVATE(_thread_off_tcb); -LT10_COMPAT_PRIVATE(_thread_off_tmbx); -LT10_COMPAT_PRIVATE(_thread_off_next); -LT10_COMPAT_PRIVATE(_thread_off_attr_flags); -LT10_COMPAT_PRIVATE(_thread_off_kse); -LT10_COMPAT_PRIVATE(_thread_off_kse_locklevel); -LT10_COMPAT_PRIVATE(_thread_off_thr_locklevel); -LT10_COMPAT_PRIVATE(_thread_off_linkmap); -LT10_COMPAT_PRIVATE(_thread_off_tlsindex); -LT10_COMPAT_PRIVATE(_thread_size_key); -LT10_COMPAT_PRIVATE(_thread_off_key_allocated); -LT10_COMPAT_PRIVATE(_thread_off_key_destructor); -LT10_COMPAT_PRIVATE(_thread_max_keys); -LT10_COMPAT_PRIVATE(_thread_off_dtv); -LT10_COMPAT_PRIVATE(_thread_off_state); -LT10_COMPAT_PRIVATE(_thread_state_running); -LT10_COMPAT_PRIVATE(_thread_state_zoombie); - /* A collection of symbols needed by debugger */ /* int _libkse_debug */ diff --git a/lib/libkse/thread/thr_system.c b/lib/libkse/thread/thr_system.c index 1c10a70..5dbe426 100644 --- a/lib/libkse/thread/thr_system.c +++ b/lib/libkse/thread/thr_system.c @@ -39,9 +39,6 @@ int _system(const char *string); extern int __system(const char *); -LT10_COMPAT_PRIVATE(_system); -LT10_COMPAT_DEFAULT(system); - __weak_reference(_system, system); int diff --git a/lib/libkse/thread/thr_tcdrain.c b/lib/libkse/thread/thr_tcdrain.c index 146b1ab..55a403d 100644 --- a/lib/libkse/thread/thr_tcdrain.c +++ b/lib/libkse/thread/thr_tcdrain.c @@ -38,9 +38,6 @@ int _tcdrain(int fd); extern int __tcdrain(int); -LT10_COMPAT_PRIVATE(_tcdrain); -LT10_COMPAT_DEFAULT(tcdrain); - __weak_reference(_tcdrain, tcdrain); int diff --git a/lib/libkse/thread/thr_vfork.c b/lib/libkse/thread/thr_vfork.c index 7b2373e..4b22b1e 100644 --- a/lib/libkse/thread/thr_vfork.c +++ b/lib/libkse/thread/thr_vfork.c @@ -5,9 +5,6 @@ #include <unistd.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(_vfork); -LT10_COMPAT_DEFAULT(vfork); - int _vfork(void); __weak_reference(_vfork, vfork); diff --git a/lib/libkse/thread/thr_wait.c b/lib/libkse/thread/thr_wait.c index 3c9567a..e3f40bc 100644 --- a/lib/libkse/thread/thr_wait.c +++ b/lib/libkse/thread/thr_wait.c @@ -32,9 +32,6 @@ #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(_wait); -LT10_COMPAT_DEFAULT(wait); - extern int __wait(int *); pid_t _wait(int *istat); diff --git a/lib/libkse/thread/thr_wait4.c b/lib/libkse/thread/thr_wait4.c index 99230b6..d92366a 100644 --- a/lib/libkse/thread/thr_wait4.c +++ b/lib/libkse/thread/thr_wait4.c @@ -38,9 +38,6 @@ #include "thr_private.h" -LT10_COMPAT_PRIVATE(__wait4); -LT10_COMPAT_DEFAULT(wait4); - pid_t __wait4(pid_t pid, int *istat, int options, struct rusage *rusage); __weak_reference(__wait4, wait4); diff --git a/lib/libkse/thread/thr_waitpid.c b/lib/libkse/thread/thr_waitpid.c index 5f6436f..1f2d4a7 100644 --- a/lib/libkse/thread/thr_waitpid.c +++ b/lib/libkse/thread/thr_waitpid.c @@ -34,9 +34,6 @@ #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(_waitpid); -LT10_COMPAT_DEFAULT(waitpid); - extern int __waitpid(pid_t, int *, int); pid_t _waitpid(pid_t wpid, int *status, int options); diff --git a/lib/libkse/thread/thr_write.c b/lib/libkse/thread/thr_write.c index 303433f..1bb3bc0 100644 --- a/lib/libkse/thread/thr_write.c +++ b/lib/libkse/thread/thr_write.c @@ -37,9 +37,6 @@ #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(__write); -LT10_COMPAT_DEFAULT(write); - __ssize_t __write(int fd, const void *buf, size_t nbytes); __weak_reference(__write, write); diff --git a/lib/libkse/thread/thr_writev.c b/lib/libkse/thread/thr_writev.c index bd6fb23..f3f2aaf 100644 --- a/lib/libkse/thread/thr_writev.c +++ b/lib/libkse/thread/thr_writev.c @@ -39,9 +39,6 @@ #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(__writev); -LT10_COMPAT_DEFAULT(writev); - ssize_t __writev(int fd, const struct iovec *iov, int iovcnt); __weak_reference(__writev, writev); diff --git a/lib/libkse/thread/thr_yield.c b/lib/libkse/thread/thr_yield.c index 8060b66..7094609 100644 --- a/lib/libkse/thread/thr_yield.c +++ b/lib/libkse/thread/thr_yield.c @@ -31,11 +31,6 @@ #include <pthread.h> #include "thr_private.h" -LT10_COMPAT_PRIVATE(_sched_yield); -LT10_COMPAT_DEFAULT(sched_yield); -LT10_COMPAT_PRIVATE(_pthread_yield); -LT10_COMPAT_DEFAULT(pthread_yield); - int _sched_yield(void); __weak_reference(_sched_yield, sched_yield); |
