diff options
Diffstat (limited to 'libpthread/nptl/sysdeps')
24 files changed, 26 insertions, 287 deletions
diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c index 1eac8ecf8..f767dcf39 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_broadcast.c @@ -23,8 +23,6 @@ #include <lowlevellock.h> #include <pthread.h> #include <pthreadP.h> - -#include <shlib-compat.h> #include <kernel-features.h> @@ -75,6 +73,4 @@ __pthread_cond_broadcast (cond) return 0; } - -versioned_symbol (libpthread, __pthread_cond_broadcast, pthread_cond_broadcast, - GLIBC_2_3_2); +weak_alias(__pthread_cond_broadcast, pthread_cond_broadcast) diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c index f5623480f..b49131c86 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_signal.c @@ -23,8 +23,6 @@ #include <lowlevellock.h> #include <pthread.h> #include <pthreadP.h> - -#include <shlib-compat.h> #include <kernel-features.h> @@ -51,6 +49,4 @@ __pthread_cond_signal (cond) return 0; } - -versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal, - GLIBC_2_3_2); +weak_alias(__pthread_cond_signal, pthread_cond_signal) diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c index fdbf43eae..db9dc4dcd 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_timedwait.c @@ -24,8 +24,6 @@ #include <pthread.h> #include <pthreadP.h> -#include <shlib-compat.h> - /* Cleanup handler, defined in pthread_cond_wait.c. */ extern void __condvar_cleanup (void *arg) @@ -209,6 +207,4 @@ __pthread_cond_timedwait (cond, mutex, abstime) return err ?: result; } - -versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait, - GLIBC_2_3_2); +weak_alias(__pthread_cond_timedwait, pthread_cond_timedwait) diff --git a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c index 86669458a..b0fe694ba 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c +++ b/libpthread/nptl/sysdeps/pthread/pthread_cond_wait.c @@ -24,8 +24,6 @@ #include <pthread.h> #include <pthreadP.h> -#include <shlib-compat.h> - struct _condvar_cleanup_buffer { @@ -180,6 +178,4 @@ __pthread_cond_wait (cond, mutex) /* Get the mutex before returning. */ return __pthread_mutex_cond_lock (mutex); } - -versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2); +weak_alias(__pthread_cond_wait, pthread_cond_wait) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c index fd137c752..7586de8a4 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c @@ -28,6 +28,7 @@ #include <ldsodefs.h> #include <bits/stdio-lock.h> #include <atomic.h> +#include <errno.h> unsigned long int *__fork_generation_pointer; @@ -41,12 +42,11 @@ struct fork_handler *__fork_handlers; static void fresetlockfiles (void) { -#ifdef __UCLIBC__ FILE *fp; #ifdef __USE_STDIO_FUTEXES__ for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen) _IO_lock_init(fp->_lock); -# else +#else pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -56,12 +56,6 @@ fresetlockfiles (void) pthread_mutex_init(&fp->__lock, &attr); pthread_mutexattr_destroy(&attr); -# endif -#else - _IO_ITER i; - - for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i)) - _IO_lock_init (*((_IO_lock_t *) _IO_iter_file(i)->_lock)); #endif } @@ -128,15 +122,11 @@ __libc_fork (void) break; } -#ifdef __UCLIBC__ #ifdef __USE_STDIO_FUTEXES__ _IO_lock_lock (_stdio_openlist_lock); #else __pthread_mutex_lock(&_stdio_openlist_lock); #endif -#else - _IO_list_lock (); -#endif #ifndef NDEBUG pid_t ppid = THREAD_GETMEM (THREAD_SELF, tid); @@ -180,19 +170,10 @@ __libc_fork (void) fresetlockfiles (); /* Reset locks in the I/O code. */ -#ifdef __UCLIBC__ -# ifdef __USE_STDIO_FUTEXES__ +#ifdef __USE_STDIO_FUTEXES__ _IO_lock_init (_stdio_openlist_lock); -# else - __stdio_init_mutex(&_stdio_openlist_lock); -# endif #else - _IO_list_resetlock (); -#endif - -#ifndef __UCLIBC__ - /* Reset the lock the dynamic loader uses to protect its data. */ - __rtld_lock_initialize (GL(dl_load_lock)); + __stdio_init_mutex(&_stdio_openlist_lock); #endif /* Run the handlers registered for the child. */ @@ -225,14 +206,10 @@ __libc_fork (void) THREAD_SETMEM (THREAD_SELF, pid, parentpid); /* We execute this even if the 'fork' call failed. */ -#ifdef __UCLIBC__ -# ifdef __USE_STDIO_FUTEXES__ +#ifdef __USE_STDIO_FUTEXES__ _IO_lock_unlock(_stdio_openlist_lock); -# else - __pthread_mutex_unlock(&_stdio_openlist_lock); -# endif #else - _IO_list_unlock (); + __pthread_mutex_unlock(&_stdio_openlist_lock); #endif /* Run the handlers registered for the parent. */ diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.h b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.h index d093ccc90..bcdf6217c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.h @@ -54,4 +54,3 @@ extern int __register_atfork (void (*__prepare) (void), void (*__parent) (void), void (*__child) (void), void *dso_handle); -libc_hidden_proto (__register_atfork) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S index 71e96d222..22f23e9af 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S @@ -83,11 +83,6 @@ __new_sem_post: ret .size __new_sem_post,.-__new_sem_post versioned_symbol(libpthread, __new_sem_post, sem_post, GLIBC_2_1) -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) - .global __old_sem_post -__old_sem_post = __new_sem_post - compat_symbol(libpthread, __old_sem_post, sem_post, GLIBC_2_0) -#endif #ifdef PIC diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S index d36a1088f..bd5ffad07 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S @@ -71,11 +71,6 @@ __new_sem_trywait: ret .size __new_sem_trywait,.-__new_sem_trywait versioned_symbol(libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1) -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) - .global __old_sem_trywait -__old_sem_trywait = __new_sem_trywait - compat_symbol(libpthread, __old_sem_trywait, sem_trywait, GLIBC_2_0) -#endif #ifdef PIC diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S index 1605b69b6..ec274ba4e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S @@ -132,8 +132,3 @@ __new_sem_wait: cfi_endproc .size __new_sem_wait,.-__new_sem_wait versioned_symbol(libpthread, __new_sem_wait, sem_wait, GLIBC_2_1) -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) - .global __old_sem_wait -__old_sem_wait = __new_sem_wait - compat_symbol(libpthread, __old_sem_wait, sem_wait, GLIBC_2_0) -#endif diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c index 3c795e37e..b6d6b3d55 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c @@ -21,35 +21,6 @@ #include <stdlib.h> #include <bits/wordsize.h> #include "pthreadP.h" -#include <shlib-compat.h> -#if defined SHARED && SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3_4) - -/* These functions are not declared anywhere since they shouldn't be - used at another place but here. */ -extern void __novmx__libc_siglongjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); -extern void __novmx__libc_longjmp (sigjmp_buf env, int val) - __attribute__ ((noreturn)); - - -void __novmx_siglongjmp (sigjmp_buf env, int val) -{ - __novmx__libc_siglongjmp (env, val); -} - -void __novmx_longjmp (jmp_buf env, int val) -{ - __novmx__libc_longjmp (env, val); -} - -# if __WORDSIZE == 64 -symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3); -symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3); -# else -symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0); -symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0); -# endif -#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */ void __vmx_longjmp (jmp_buf env, int val) @@ -62,7 +33,5 @@ __vmx_siglongjmp (jmp_buf env, int val) { __libc_siglongjmp (env, val); } - -versioned_symbol (libc, __vmx_longjmp, longjmp, GLIBC_2_3_4); -versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4); - +weak_alias(__vmx_longjmp, longjmp) +weak_alias(__vmx_siglongjmp, siglongjmp) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c index 91b995518..06b3bd0ab 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c @@ -24,8 +24,6 @@ #include <internaltypes.h> #include <semaphore.h> -#include <shlib-compat.h> - int __new_sem_post (sem_t *sem) { @@ -41,8 +39,4 @@ __new_sem_post (sem_t *sem) } return 0; } -versioned_symbol (libpthread, __new_sem_post, sem_post, GLIBC_2_1); -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_post, __old_sem_post) -compat_symbol (libpthread, __old_sem_post, sem_post, GLIBC_2_0); -#endif +weak_alias(__new_sem_post, sem_post) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c index 48d5a62a7..5a3d418a9 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c @@ -23,7 +23,6 @@ #include <string.h> #include <sysdep.h> #include <sys/types.h> -#include <shlib-compat.h> int @@ -54,17 +53,4 @@ __pthread_attr_getaffinity_new (const pthread_attr_t *attr, size_t cpusetsize, return 0; } -versioned_symbol (libpthread, __pthread_attr_getaffinity_new, - pthread_attr_getaffinity_np, GLIBC_2_3_4); - - -#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) -int -__pthread_attr_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset) -{ - /* The old interface by default assumed a 1024 processor bitmap. */ - return __pthread_attr_getaffinity_new (attr, 128, cpuset); -} -compat_symbol (libpthread, __pthread_attr_getaffinity_old, - pthread_attr_getaffinity_np, GLIBC_2_3_3); -#endif +weak_alias(__pthread_attr_getaffinity_new, pthread_attr_getaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c index 1842b275a..e3414999c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c @@ -23,7 +23,6 @@ #include <stdlib.h> #include <string.h> #include <pthreadP.h> -#include <shlib-compat.h> /* Defined in pthread_setaffinity.c. */ @@ -80,17 +79,4 @@ __pthread_attr_setaffinity_new (pthread_attr_t *attr, size_t cpusetsize, return 0; } -versioned_symbol (libpthread, __pthread_attr_setaffinity_new, - pthread_attr_setaffinity_np, GLIBC_2_3_4); - - -#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) -int -__pthread_attr_setaffinity_old (pthread_attr_t *attr, cpu_set_t *cpuset) -{ - /* The old interface by default assumed a 1024 processor bitmap. */ - return __pthread_attr_setaffinity_new (attr, 128, cpuset); -} -compat_symbol (libpthread, __pthread_attr_setaffinity_old, - pthread_attr_setaffinity_np, GLIBC_2_3_3); -#endif +weak_alias(__pthread_attr_setaffinity_new, pthread_attr_setaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c index c382ed53a..ead5d42bb 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c @@ -24,7 +24,6 @@ #include <sysdep.h> #include <sys/param.h> #include <sys/types.h> -#include <shlib-compat.h> int @@ -43,18 +42,5 @@ __pthread_getaffinity_new (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) return 0; } -strong_alias (__pthread_getaffinity_new, __pthread_getaffinity_np) -versioned_symbol (libpthread, __pthread_getaffinity_new, - pthread_getaffinity_np, GLIBC_2_3_4); - - -#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) -int -__pthread_getaffinity_old (pthread_t th, cpu_set_t *cpuset) -{ - /* The old interface by default assumed a 1024 processor bitmap. */ - return __pthread_getaffinity_new (th, 128, cpuset); -} -compat_symbol (libpthread, __pthread_getaffinity_old, pthread_getaffinity_np, - GLIBC_2_3_3); -#endif +hidden_strong_alias (__pthread_getaffinity_new, __pthread_getaffinity_np) +strong_alias (__pthread_getaffinity_new, pthread_getaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c index 01e21d3ce..fa7b48904 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c @@ -22,7 +22,6 @@ #include <pthreadP.h> #include <sysdep.h> #include <sys/types.h> -#include <shlib-compat.h> size_t __kernel_cpumask_size; @@ -84,17 +83,4 @@ __pthread_setaffinity_new (pthread_t th, size_t cpusetsize, ? INTERNAL_SYSCALL_ERRNO (res, err) : 0); } -versioned_symbol (libpthread, __pthread_setaffinity_new, - pthread_setaffinity_np, GLIBC_2_3_4); - - -#if SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_3_4) -int -__pthread_setaffinity_old (pthread_t th, cpu_set_t *cpuset) -{ - /* The old interface by default assumed a 1024 processor bitmap. */ - return __pthread_setaffinity_new (th, 128, cpuset); -} -compat_symbol (libpthread, __pthread_setaffinity_old, pthread_setaffinity_np, - GLIBC_2_3_3); -#endif +weak_alias(__pthread_setaffinity_new, pthread_setaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c index 671b43f7f..7f0b67918 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_post.c @@ -24,8 +24,6 @@ #include <internaltypes.h> #include <semaphore.h> -#include <shlib-compat.h> - int __new_sem_post (sem_t *sem) { @@ -40,8 +38,4 @@ __new_sem_post (sem_t *sem) } return 0; } -versioned_symbol (libpthread, __new_sem_post, sem_post, GLIBC_2_1); -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_post, __old_sem_post) -compat_symbol (libpthread, __old_sem_post, sem_post, GLIBC_2_0); -#endif +weak_alias(__new_sem_post, sem_post) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c index 5c8b0db7e..79b11948c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_timedwait.c @@ -23,9 +23,7 @@ #include <lowlevellock.h> #include <internaltypes.h> #include <semaphore.h> - #include <pthreadP.h> -#include <shlib-compat.h> int diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c index f50036114..3cf1d9a8a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_trywait.c @@ -24,8 +24,6 @@ #include <internaltypes.h> #include <semaphore.h> -#include <shlib-compat.h> - int __new_sem_trywait (sem_t *sem) @@ -43,8 +41,4 @@ __new_sem_trywait (sem_t *sem) __set_errno (EAGAIN); return -1; } -versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1); -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_trywait, __old_sem_trywait) -compat_symbol (libpthread, __old_sem_trywait, sem_trywait, GLIBC_2_0); -#endif +weak_alias(__new_sem_trywait, sem_trywait) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c index e6733e88a..416d8634b 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sem_wait.c @@ -23,9 +23,7 @@ #include <lowlevellock.h> #include <internaltypes.h> #include <semaphore.h> - #include <pthreadP.h> -#include <shlib-compat.h> int @@ -55,9 +53,4 @@ __new_sem_wait (sem_t *sem) __set_errno (-err); return -1; } - -versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1); -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) -strong_alias (__new_sem_wait, __old_sem_wait) -compat_symbol (libpthread, __old_sem_wait, sem_wait, GLIBC_2_0); -#endif +weak_alias(__new_sem_wait, sem_wait) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c index 1849f72a4..a07b1afe5 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c @@ -17,7 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <shlib-compat.h> #include "compat-timer.h" #include <atomic.h> @@ -26,41 +25,4 @@ #include "../timer_create.c" #undef timer_create -versioned_symbol (librt, __timer_create_new, timer_create, GLIBC_2_3_3); - - -#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) -timer_t __compat_timer_list[OLD_TIMER_MAX] attribute_hidden; - - -int -__timer_create_old (clockid_t clock_id, struct sigevent *evp, int *timerid) -{ - timer_t newp; - - int res = __timer_create_new (clock_id, evp, &newp); - if (res == 0) - { - int i; - for (i = 0; i < OLD_TIMER_MAX; ++i) - if (__compat_timer_list[i] == NULL - && ! atomic_compare_and_exchange_bool_acq (&__compat_timer_list[i], - newp, NULL)) - { - *timerid = i; - break; - } - - if (__builtin_expect (i == OLD_TIMER_MAX, 0)) - { - /* No free slot. */ - (void) __timer_delete_new (newp); - __set_errno (EINVAL); - res = -1; - } - } - - return res; -} -compat_symbol (librt, __timer_create_old, timer_create, GLIBC_2_2); -#endif +weak_alias(__timer_create_new, timer_create) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c index 6e0d9d033..8456dc31a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c @@ -17,7 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <shlib-compat.h> #include "compat-timer.h" @@ -25,21 +24,4 @@ #include "../timer_delete.c" #undef timer_delete -versioned_symbol (librt, __timer_delete_new, timer_delete, GLIBC_2_3_3); - - -#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) -int -__timer_delete_old (int timerid) -{ - int res = __timer_delete_new (__compat_timer_list[timerid]); - - if (res == 0) - /* Successful timer deletion, now free the index. We only need to - store a word and that better be atomic. */ - __compat_timer_list[timerid] = NULL; - - return res; -} -compat_symbol (librt, __timer_delete_old, timer_delete, GLIBC_2_2); -#endif +weak_alias(__timer_delete_new, timer_delete) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c index d75636c99..86a2df696 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c @@ -17,7 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <shlib-compat.h> #include "compat-timer.h" @@ -25,15 +24,4 @@ #include "../timer_getoverr.c" #undef timer_getoverrun -versioned_symbol (librt, __timer_getoverrun_new, timer_getoverrun, - GLIBC_2_3_3); - - -#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) -int -__timer_getoverrun_old (int timerid) -{ - return __timer_getoverrun_new (__compat_timer_list[timerid]); -} -compat_symbol (librt, __timer_getoverrun_old, timer_getoverrun, GLIBC_2_2); -#endif +weak_alias(__timer_getoverrun_new, timer_getoverrun) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c index 1f1253af2..6b260e453 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c @@ -17,7 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <shlib-compat.h> #include "compat-timer.h" @@ -25,14 +24,4 @@ #include "../timer_gettime.c" #undef timer_gettime -versioned_symbol (librt, __timer_gettime_new, timer_gettime, GLIBC_2_3_3); - - -#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) -int -__timer_gettime_old (int timerid, struct itimerspec *value) -{ - return __timer_gettime_new (__compat_timer_list[timerid], value); -} -compat_symbol (librt, __timer_gettime_old, timer_gettime, GLIBC_2_2); -#endif +weak_alias(__timer_gettime_new, timer_gettime) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c index 4c945ec51..0ec178246 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c @@ -17,7 +17,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <shlib-compat.h> #include "compat-timer.h" @@ -25,16 +24,4 @@ #include "../timer_settime.c" #undef timer_settime -versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3); - - -#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) -int -__timer_settime_old (int timerid, int flags, const struct itimerspec *value, - struct itimerspec *ovalue) -{ - return __timer_settime_new (__compat_timer_list[timerid], flags, - value, ovalue); -} -compat_symbol (librt, __timer_settime_old, timer_settime, GLIBC_2_2); -#endif +weak_alias(__timer_settime_new, timer_settime) |