From 8f14fbdfe239485f1f9267be8cad07a7ee7d6b29 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Wed, 11 May 2005 23:53:20 +0000 Subject: More glibc backward compatibility cruft. Oh the horror! --- libpthread/nptl/forward.c | 1 - libpthread/nptl/init.c | 1 - libpthread/nptl/pthread_attr_destroy.c | 6 ----- libpthread/nptl/pthread_attr_init.c | 37 ----------------------------- libpthread/nptl/pthread_attr_setstack.c | 37 ----------------------------- libpthread/nptl/pthread_attr_setstacksize.c | 30 ----------------------- libpthread/nptl/pthread_cond_destroy.c | 1 - libpthread/nptl/pthread_cond_init.c | 1 - libpthread/nptl/pthread_create.c | 2 -- libpthread/nptl/sem_destroy.c | 5 ---- libpthread/nptl/sem_getvalue.c | 5 ---- libpthread/nptl/sem_init.c | 5 ---- 12 files changed, 131 deletions(-) (limited to 'libpthread') diff --git a/libpthread/nptl/forward.c b/libpthread/nptl/forward.c index e5f93d475..96e6e5c45 100644 --- a/libpthread/nptl/forward.c +++ b/libpthread/nptl/forward.c @@ -22,7 +22,6 @@ #include #include -#include #include #include diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c index 86745af8d..c1e94e7ac 100644 --- a/libpthread/nptl/init.c +++ b/libpthread/nptl/init.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/libpthread/nptl/pthread_attr_destroy.c b/libpthread/nptl/pthread_attr_destroy.c index b8d9a20d3..a30df0c45 100644 --- a/libpthread/nptl/pthread_attr_destroy.c +++ b/libpthread/nptl/pthread_attr_destroy.c @@ -22,7 +22,6 @@ #include #include #include "pthreadP.h" -#include int __pthread_attr_destroy (attr) @@ -33,11 +32,6 @@ __pthread_attr_destroy (attr) assert (sizeof (*attr) >= sizeof (struct pthread_attr)); iattr = (struct pthread_attr *) attr; -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) - /* In old struct pthread_attr, neither next nor cpuset are - present. */ - if (__builtin_expect ((iattr->flags & ATTR_FLAG_OLDATTR), 0) == 0) -#endif /* The affinity CPU set might be allocated dynamically. */ free (iattr->cpuset); diff --git a/libpthread/nptl/pthread_attr_init.c b/libpthread/nptl/pthread_attr_init.c index c84b33f31..625ccd442 100644 --- a/libpthread/nptl/pthread_attr_init.c +++ b/libpthread/nptl/pthread_attr_init.c @@ -23,8 +23,6 @@ #include #include "pthreadP.h" -#include - struct pthread_attr *__attr_list; lll_lock_t __attr_list_lock = LLL_LOCK_INITIALIZER; @@ -51,38 +49,3 @@ __pthread_attr_init_2_1 (attr) } versioned_symbol (libpthread, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1); - - -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) -int -__pthread_attr_init_2_0 (attr) - pthread_attr_t *attr; -{ - /* This code is specific to the old LinuxThread code which has a too - small pthread_attr_t definition. The struct looked like - this: */ - struct old_attr - { - int detachstate; - int schedpolicy; - struct sched_param schedparam; - int inheritsched; - int scope; - }; - struct pthread_attr *iattr; - - /* Many elements are initialized to zero so let us do it all at - once. This also takes care of clearing the bytes which are not - internally used. */ - memset (attr, '\0', sizeof (struct old_attr)); - - iattr = (struct pthread_attr *) attr; - iattr->flags |= ATTR_FLAG_OLDATTR; - - /* We cannot enqueue the attribute because that member is not in the - old attribute structure. */ - return 0; -} -compat_symbol (libpthread, __pthread_attr_init_2_0, pthread_attr_init, - GLIBC_2_0); -#endif diff --git a/libpthread/nptl/pthread_attr_setstack.c b/libpthread/nptl/pthread_attr_setstack.c index 622e4a225..88a98d8d2 100644 --- a/libpthread/nptl/pthread_attr_setstack.c +++ b/libpthread/nptl/pthread_attr_setstack.c @@ -49,41 +49,4 @@ __pthread_attr_setstack (attr, stackaddr, stacksize) return 0; } -#if PTHREAD_STACK_MIN == 16384 strong_alias (__pthread_attr_setstack, pthread_attr_setstack) -#else -# include -versioned_symbol (libpthread, __pthread_attr_setstack, pthread_attr_setstack, - GLIBC_2_3_3); - -# if SHLIB_COMPAT(libpthread, GLIBC_2_2, GLIBC_2_3_3) - -int -__old_pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, - size_t stacksize) -{ - struct pthread_attr *iattr; - - assert (sizeof (*attr) >= sizeof (struct pthread_attr)); - iattr = (struct pthread_attr *) attr; - - /* Catch invalid sizes. */ - if (stacksize < 16384) - return EINVAL; - -# ifdef EXTRA_PARAM_CHECKS - EXTRA_PARAM_CHECKS; -# endif - - iattr->stacksize = stacksize; - iattr->stackaddr = (char *) stackaddr + stacksize; - iattr->flags |= ATTR_FLAG_STACKADDR; - - return 0; -} - -compat_symbol (libpthread, __old_pthread_attr_setstack, pthread_attr_setstack, - GLIBC_2_2); -# endif - -#endif diff --git a/libpthread/nptl/pthread_attr_setstacksize.c b/libpthread/nptl/pthread_attr_setstacksize.c index f84a9f68e..7d847ef08 100644 --- a/libpthread/nptl/pthread_attr_setstacksize.c +++ b/libpthread/nptl/pthread_attr_setstacksize.c @@ -42,34 +42,4 @@ __pthread_attr_setstacksize (attr, stacksize) return 0; } -#if PTHREAD_STACK_MIN == 16384 strong_alias (__pthread_attr_setstacksize, pthread_attr_setstacksize) -#else -# include -versioned_symbol (libpthread, __pthread_attr_setstacksize, - pthread_attr_setstacksize, GLIBC_2_3_3); - -# if SHLIB_COMPAT(libpthread, GLIBC_2_1, GLIBC_2_3_3) - -int -__old_pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize) -{ - struct pthread_attr *iattr; - - assert (sizeof (*attr) >= sizeof (struct pthread_attr)); - iattr = (struct pthread_attr *) attr; - - /* Catch invalid sizes. */ - if (stacksize < 16384) - return EINVAL; - - iattr->stacksize = stacksize; - - return 0; -} - -compat_symbol (libpthread, __old_pthread_attr_setstacksize, - pthread_attr_setstacksize, GLIBC_2_1); -# endif - -#endif diff --git a/libpthread/nptl/pthread_cond_destroy.c b/libpthread/nptl/pthread_cond_destroy.c index 0208d18ce..d2f8e6202 100644 --- a/libpthread/nptl/pthread_cond_destroy.c +++ b/libpthread/nptl/pthread_cond_destroy.c @@ -18,7 +18,6 @@ 02111-1307 USA. */ #include -#include #include "pthreadP.h" diff --git a/libpthread/nptl/pthread_cond_init.c b/libpthread/nptl/pthread_cond_init.c index 5e2e6704a..fd5c84c34 100644 --- a/libpthread/nptl/pthread_cond_init.c +++ b/libpthread/nptl/pthread_cond_init.c @@ -17,7 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include #include "pthreadP.h" diff --git a/libpthread/nptl/pthread_create.c b/libpthread/nptl/pthread_create.c index 18f1c034c..532b8fd56 100644 --- a/libpthread/nptl/pthread_create.c +++ b/libpthread/nptl/pthread_create.c @@ -28,8 +28,6 @@ #include #include -#include - /* Local function to start thread and handle cleanup. */ static int start_thread (void *arg); diff --git a/libpthread/nptl/sem_destroy.c b/libpthread/nptl/sem_destroy.c index 1c823dc51..1472a945c 100644 --- a/libpthread/nptl/sem_destroy.c +++ b/libpthread/nptl/sem_destroy.c @@ -18,7 +18,6 @@ 02111-1307 USA. */ #include -#include #include "semaphoreP.h" @@ -32,7 +31,3 @@ __new_sem_destroy (sem) return 0; } versioned_symbol (libpthread, __new_sem_destroy, sem_destroy, GLIBC_2_1); -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_destroy, __old_sem_destroy) -compat_symbol (libpthread, __old_sem_destroy, sem_destroy, GLIBC_2_0); -#endif diff --git a/libpthread/nptl/sem_getvalue.c b/libpthread/nptl/sem_getvalue.c index 6bc7ea82b..4be736da0 100644 --- a/libpthread/nptl/sem_getvalue.c +++ b/libpthread/nptl/sem_getvalue.c @@ -18,7 +18,6 @@ 02111-1307 USA. */ #include -#include #include "semaphoreP.h" @@ -36,7 +35,3 @@ __new_sem_getvalue (sem, sval) return 0; } versioned_symbol (libpthread, __new_sem_getvalue, sem_getvalue, GLIBC_2_1); -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_getvalue, __old_sem_getvalue) -compat_symbol (libpthread, __old_sem_getvalue, sem_getvalue, GLIBC_2_0); -#endif diff --git a/libpthread/nptl/sem_init.c b/libpthread/nptl/sem_init.c index 8709911ac..6f371589a 100644 --- a/libpthread/nptl/sem_init.c +++ b/libpthread/nptl/sem_init.c @@ -20,7 +20,6 @@ #include #include #include -#include #include "semaphoreP.h" @@ -49,7 +48,3 @@ __new_sem_init (sem, pshared, value) return 0; } versioned_symbol (libpthread, __new_sem_init, sem_init, GLIBC_2_1); -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_init, __old_sem_init) -compat_symbol (libpthread, __old_sem_init, sem_init, GLIBC_2_0); -#endif -- cgit v1.2.3