From 1efd15e33783db0de097a84772d78c4f2afb5ec6 Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Wed, 28 Jun 2000 19:44:22 +0000 Subject: [PATCH] * weaks.c: Wrap BP_SYM () around weak extern declarations of pthread functions that have pointers in their return+arg signatures. 2000-06-28 Greg McGary * weaks.c: Wrap BP_SYM () around weak extern declarations of pthread functions that have pointers in their return+arg signatures. * sysdeps/pthread/bits/libc-lock.h: Wrap BP_SYM () around weak extern declarations of pthread functions that have pointers in their return+arg signatures. --- linuxthreads/ChangeLog | 11 +++-- linuxthreads/weaks.c | 109 +++++++++++++++++++++++++------------------------ 2 files changed, 63 insertions(+), 57 deletions(-) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 74eeaba..957085c 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,8 +1,13 @@ +2000-06-28 Greg McGary + + * weaks.c: Wrap BP_SYM () around weak extern declarations of + pthread functions that have pointers in their return+arg signatures. + 2000-06-27 Greg McGary - * sysdeps/pthread/bits/libc-lock.h: - Wrap BP_SYM () around weak extern declarations of pthread - functions that have pointers in their return+arg signatures. + * sysdeps/pthread/bits/libc-lock.h: Wrap BP_SYM () around weak + extern declarations of pthread functions that have pointers in + their return+arg signatures. 2000-06-26 Ulrich Drepper diff --git a/linuxthreads/weaks.c b/linuxthreads/weaks.c index 077158e..163f232 100644 --- a/linuxthreads/weaks.c +++ b/linuxthreads/weaks.c @@ -21,71 +21,72 @@ #include #include #include +#include extern int __pthread_return_0 (void); extern int __pthread_return_1 (void); extern void __pthread_return_void (void); /* Those are pthread functions which return 0 if successful. */ -weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_1) -versioned_symbol (libpthread, __libc_pthread_attr_init_2_1, pthread_attr_init, - GLIBC_2_1); +weak_alias (__pthread_return_0, BP_SYM (__libc_pthread_attr_init_2_1)) +versioned_symbol (libpthread, BP_SYM (__libc_pthread_attr_init_2_1), + BP_SYM (pthread_attr_init), GLIBC_2_1); #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) -weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_0) -compat_symbol (libpthread, __libc_pthread_attr_init_2_0, pthread_attr_init, - GLIBC_2_0); +weak_alias (__pthread_return_0, BP_SYM (__libc_pthread_attr_init_2_0)) +compat_symbol (libpthread, BP_SYM (__libc_pthread_attr_init_2_0), + BP_SYM (pthread_attr_init), GLIBC_2_0); #endif -weak_alias (__pthread_return_0, pthread_attr_destroy) -weak_alias (__pthread_return_0, pthread_attr_setdetachstate) -weak_alias (__pthread_return_0, pthread_attr_getdetachstate) -weak_alias (__pthread_return_0, pthread_attr_setschedparam) -weak_alias (__pthread_return_0, pthread_attr_getschedparam) -weak_alias (__pthread_return_0, pthread_attr_setschedpolicy) -weak_alias (__pthread_return_0, pthread_attr_getschedpolicy) -weak_alias (__pthread_return_0, pthread_attr_setinheritsched) -weak_alias (__pthread_return_0, pthread_attr_getinheritsched) -weak_alias (__pthread_return_0, pthread_attr_setscope) -weak_alias (__pthread_return_0, pthread_attr_getscope) -weak_alias (__pthread_return_0, pthread_attr_setstackaddr) -weak_alias (__pthread_return_0, pthread_attr_getstackaddr) -weak_alias (__pthread_return_0, pthread_attr_setstacksize) -weak_alias (__pthread_return_0, pthread_attr_getstacksize) -weak_alias (__pthread_return_0, pthread_mutex_init) -weak_alias (__pthread_return_0, pthread_mutex_destroy) -weak_alias (__pthread_return_0, pthread_mutex_lock) -weak_alias (__pthread_return_0, pthread_mutex_trylock) -weak_alias (__pthread_return_0, pthread_mutex_unlock) -weak_alias (__pthread_return_0, pthread_mutexattr_init) -weak_alias (__pthread_return_0, pthread_mutexattr_destroy) -weak_alias (__pthread_return_0, pthread_mutexattr_settype) -weak_alias (__pthread_return_0, pthread_mutexattr_gettype) -weak_alias (__pthread_return_0, pthread_condattr_init) -weak_alias (__pthread_return_0, pthread_condattr_destroy) -weak_alias (__pthread_return_0, pthread_setschedparam) -weak_alias (__pthread_return_0, pthread_getschedparam) -weak_alias (__pthread_return_0, pthread_getcancelstate) -weak_alias (__pthread_return_0, pthread_setcancelstate) -weak_alias (__pthread_return_0, pthread_setcanceltype) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setdetachstate)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getdetachstate)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setschedparam)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getschedparam)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setschedpolicy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getschedpolicy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setinheritsched)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getinheritsched)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setscope)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getscope)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setstackaddr)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getstackaddr)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setstacksize)) +weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getstacksize)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_init)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_lock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_trylock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_unlock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_init)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_settype)) +weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_gettype)) +weak_alias (__pthread_return_0, BP_SYM (pthread_condattr_init)) +weak_alias (__pthread_return_0, BP_SYM (pthread_condattr_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_setschedparam)) +weak_alias (__pthread_return_0, BP_SYM (pthread_getschedparam)) +weak_alias (__pthread_return_0, BP_SYM (pthread_getcancelstate)) +weak_alias (__pthread_return_0, BP_SYM (pthread_setcancelstate)) +weak_alias (__pthread_return_0, BP_SYM (pthread_setcanceltype)) weak_alias (__pthread_return_0, pthread_setconcurrency) weak_alias (__pthread_return_0, pthread_getconcurrency) weak_alias (__pthread_return_0, pthread_self) -weak_alias (__pthread_return_0, pthread_cond_init) -weak_alias (__pthread_return_0, pthread_cond_destroy) -weak_alias (__pthread_return_0, pthread_cond_wait) -weak_alias (__pthread_return_0, pthread_cond_timedwait) -weak_alias (__pthread_return_0, pthread_cond_signal) -weak_alias (__pthread_return_0, pthread_cond_broadcast) -weak_alias (__pthread_return_0, pthread_rwlock_init) -weak_alias (__pthread_return_0, pthread_rwlock_destroy) -weak_alias (__pthread_return_0, pthread_rwlock_rdlock) -weak_alias (__pthread_return_0, pthread_rwlock_wrlock) -weak_alias (__pthread_return_0, pthread_rwlock_tryrdlock) -weak_alias (__pthread_return_0, pthread_rwlock_trywrlock) -weak_alias (__pthread_return_0, pthread_rwlock_unlock) -weak_alias (__pthread_return_0, pthread_rwlockattr_init) -weak_alias (__pthread_return_0, pthread_rwlockattr_destroy) -weak_alias (__pthread_return_0, pthread_rwlockattr_setpshared) -weak_alias (__pthread_return_0, pthread_rwlockattr_getpshared) +weak_alias (__pthread_return_0, BP_SYM (pthread_cond_init)) +weak_alias (__pthread_return_0, BP_SYM (pthread_cond_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_cond_wait)) +weak_alias (__pthread_return_0, BP_SYM (pthread_cond_timedwait)) +weak_alias (__pthread_return_0, BP_SYM (pthread_cond_signal)) +weak_alias (__pthread_return_0, BP_SYM (pthread_cond_broadcast)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_init)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_rdlock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_wrlock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_tryrdlock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_trywrlock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_unlock)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_init)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_destroy)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_setpshared)) +weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_getpshared)) /* Those are pthread functions which return 1 if successful. */ -- 2.7.4