From 49e9f864906640e913ad69f98ce6ee24776d5b8d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 30 Dec 2002 23:45:39 +0000 Subject: Update. 2002-12-30 Jakub Jelinek * forward.c (FORWARD2): Renamed from FORWARD3. Remove unused export argument. (pthread_attr_init_2_0, pthread_attr_init_2_1): Use FORWARD macro. (pthread_exit): Use strong_alias to avoid warnings. * pthreadP.h (struct pthread_functions): Rename ptr_pthread_exit and ptr_pthread_attr_init_2_* to ptr___pthread_exit and ptr___pthread_attr_init_2_*. * init.c (pthread_functions): Adjust. --- linuxthreads/forward.c | 89 +++++++++++++++++++++--------------------------- linuxthreads/internals.h | 6 ++-- linuxthreads/pthread.c | 6 ++-- nptl/ChangeLog | 11 ++++++ nptl/forward.c | 20 +++++------ nptl/init.c | 6 ++-- nptl/pthreadP.h | 6 ++-- 7 files changed, 70 insertions(+), 74 deletions(-) diff --git a/linuxthreads/forward.c b/linuxthreads/forward.c index 5e31a4339b..b8f54f4f51 100644 --- a/linuxthreads/forward.c +++ b/linuxthreads/forward.c @@ -28,119 +28,108 @@ struct pthread_functions __libc_pthread_functions attribute_hidden; -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) -# define FORWARD4(name, export, rettype, decl, params, defaction, version) \ +# define FORWARD2(name, rettype, decl, params, defaction) \ rettype \ -__noexport_##name decl \ +name decl \ { \ if (__libc_pthread_functions.ptr_##name == NULL) \ defaction; \ \ return __libc_pthread_functions.ptr_##name params; \ -} \ -compat_symbol (libc, __noexport_##name, export, version) - -# define FORWARD3(name, rettype, decl, params, defaction, version) \ - FORWARD4 (name, name, rettype, decl, params, defaction, version) - -# define FORWARD2(name, decl, params, defretval, version) \ - FORWARD3 (name, int, decl, params, return defretval, version) +} # define FORWARD(name, decl, params, defretval) \ - FORWARD2 (name, decl, params, defretval, GLIBC_2_0) - + FORWARD2 (name, int, decl, params, return defretval) -FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0); +FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0) #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1) -FORWARD4 (pthread_attr_init_2_0, pthread_attr_init, int, - (pthread_attr_t *attr), (attr), return 0, GLIBC_2_0); +FORWARD (__pthread_attr_init_2_0, (pthread_attr_t *attr), (attr), 0) +compat_symbol (libc, __pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0); #endif -FORWARD4 (pthread_attr_init_2_1, pthread_attr_init, int, - (pthread_attr_t *attr), (attr), return 0, GLIBC_2_1); +FORWARD (__pthread_attr_init_2_1, (pthread_attr_t *attr), (attr), 0) +versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1); FORWARD (pthread_attr_getdetachstate, (const pthread_attr_t *attr, int *detachstate), (attr, detachstate), - 0); + 0) FORWARD (pthread_attr_setdetachstate, (pthread_attr_t *attr, int detachstate), - (attr, detachstate), 0); + (attr, detachstate), 0) FORWARD (pthread_attr_getinheritsched, - (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0); + (const pthread_attr_t *attr, int *inherit), (attr, inherit), 0) FORWARD (pthread_attr_setinheritsched, (pthread_attr_t *attr, int inherit), - (attr, inherit), 0); + (attr, inherit), 0) FORWARD (pthread_attr_getschedparam, (const pthread_attr_t *attr, struct sched_param *param), - (attr, param), 0); + (attr, param), 0) FORWARD (pthread_attr_setschedparam, (pthread_attr_t *attr, const struct sched_param *param), - (attr, param), 0); + (attr, param), 0) FORWARD (pthread_attr_getschedpolicy, - (const pthread_attr_t *attr, int *policy), (attr, policy), 0); + (const pthread_attr_t *attr, int *policy), (attr, policy), 0) FORWARD (pthread_attr_setschedpolicy, (pthread_attr_t *attr, int policy), - (attr, policy), 0); + (attr, policy), 0) FORWARD (pthread_attr_getscope, - (const pthread_attr_t *attr, int *scope), (attr, scope), 0); + (const pthread_attr_t *attr, int *scope), (attr, scope), 0) FORWARD (pthread_attr_setscope, (pthread_attr_t *attr, int scope), - (attr, scope), 0); + (attr, scope), 0) -FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0); -FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0); +FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0) +FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0) -FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0); +FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0) -FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0); +FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0) FORWARD (pthread_cond_init, (pthread_cond_t *cond, const pthread_condattr_t *cond_attr), - (cond, cond_attr), 0); + (cond, cond_attr), 0) -FORWARD (pthread_cond_signal, (pthread_cond_t *cond), (cond), 0); +FORWARD (pthread_cond_signal, (pthread_cond_t *cond), (cond), 0) FORWARD (pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex), - (cond, mutex), 0); + (cond, mutex), 0) FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2), - (thread1, thread2), 1); + (thread1, thread2), 1) -FORWARD3 (pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS), - GLIBC_2_0); +/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */ +FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) +strong_alias (__pthread_exit, pthread_exit); FORWARD (pthread_getschedparam, (pthread_t target_thread, int *policy, struct sched_param *param), - (target_thread, policy, param), 0); + (target_thread, policy, param), 0) FORWARD (pthread_setschedparam, (pthread_t target_thread, int policy, - const struct sched_param *param), (target_thread, policy, param), 0); + const struct sched_param *param), (target_thread, policy, param), 0) -FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0); +FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0) FORWARD (pthread_mutex_init, (pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexattr), - (mutex, mutexattr), 0); + (mutex, mutexattr), 0) -FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0); +FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) -FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0); +FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) -FORWARD3 (pthread_self, pthread_t, (void), (), return 0, GLIBC_2_0); +FORWARD2 (pthread_self, pthread_t, (void), (), return 0) FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), - 0); + 0) -FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0); - - -#endif +FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h index 68ad6c72d5..8c4de222b4 100644 --- a/linuxthreads/internals.h +++ b/linuxthreads/internals.h @@ -483,8 +483,8 @@ extern void __libc_disable_asynccancel (int oldtype) struct pthread_functions { int (*ptr_pthread_attr_destroy) (pthread_attr_t *); - int (*ptr_pthread_attr_init_2_0) (pthread_attr_t *); - int (*ptr_pthread_attr_init_2_1) (pthread_attr_t *); + int (*ptr___pthread_attr_init_2_0) (pthread_attr_t *); + int (*ptr___pthread_attr_init_2_1) (pthread_attr_t *); int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int); int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *); @@ -505,7 +505,7 @@ struct pthread_functions int (*ptr_pthread_cond_signal) (pthread_cond_t *); int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *); int (*ptr_pthread_equal) (pthread_t, pthread_t); - void (*ptr_pthread_exit) (void *); + void (*ptr___pthread_exit) (void *); int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *); int (*ptr_pthread_setschedparam) (pthread_t, int, const struct sched_param *); diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 5cc51460a3..15de7e610f 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -240,9 +240,9 @@ static struct pthread_functions pthread_functions = #endif .ptr_pthread_attr_destroy = __pthread_attr_destroy, #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) - .ptr_pthread_attr_init_2_0 = __pthread_attr_init_2_0, + .ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0, #endif - .ptr_pthread_attr_init_2_1 = __pthread_attr_init_2_1, + .ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1, .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched, @@ -261,7 +261,7 @@ static struct pthread_functions pthread_functions = .ptr_pthread_cond_signal = __pthread_cond_signal, .ptr_pthread_cond_wait = __pthread_cond_wait, .ptr_pthread_equal = __pthread_equal, - .ptr_pthread_exit = __pthread_exit, + .ptr___pthread_exit = __pthread_exit, .ptr_pthread_getschedparam = __pthread_getschedparam, .ptr_pthread_setschedparam = __pthread_setschedparam, .ptr_pthread_mutex_destroy = __pthread_mutex_destroy, diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0d75339175..5b320962df 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,14 @@ +2002-12-30 Jakub Jelinek + + * forward.c (FORWARD2): Renamed from FORWARD3. Remove unused export + argument. + (pthread_attr_init_2_0, pthread_attr_init_2_1): Use FORWARD macro. + (pthread_exit): Use strong_alias to avoid warnings. + * pthreadP.h (struct pthread_functions): Rename ptr_pthread_exit + and ptr_pthread_attr_init_2_* to ptr___pthread_exit and + ptr___pthread_attr_init_2_*. + * init.c (pthread_functions): Adjust. + 2002-12-29 Ulrich Drepper * forward.c: Make all functions available by default again. It diff --git a/nptl/forward.c b/nptl/forward.c index 1a73d2ce4b..a167bc1027 100644 --- a/nptl/forward.c +++ b/nptl/forward.c @@ -29,7 +29,7 @@ struct pthread_functions __libc_pthread_functions attribute_hidden; -#define FORWARD3(name, export, rettype, decl, params, defaction) \ +#define FORWARD2(name, rettype, decl, params, defaction) \ rettype \ name decl \ { \ @@ -39,23 +39,18 @@ name decl \ return __libc_pthread_functions.ptr_##name params; \ } -#define FORWARD2(name, decl, params, defretval) \ - FORWARD3 (name, name, int, decl, params, return defretval) - #define FORWARD(name, decl, params, defretval) \ - FORWARD2 (name, decl, params, defretval) + FORWARD2 (name, int, decl, params, return defretval) FORWARD (pthread_attr_destroy, (pthread_attr_t *attr), (attr), 0) #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1) -FORWARD3 (pthread_attr_init_2_0, __pthread_attr_init_2_0, int, - (pthread_attr_t *attr), (attr), return 0) +FORWARD (__pthread_attr_init_2_0, (pthread_attr_t *attr), (attr), 0) compat_symbol (libc, pthread_attr_init_2_0, pthread_attr_init, GLIBC_2_0); #endif -FORWARD3 (pthread_attr_init_2_1, __pthread_attr_init_2_1, int, - (pthread_attr_t *attr), (attr), return 0) +FORWARD (__pthread_attr_init_2_1, (pthread_attr_t *attr), (attr), 0) versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1); FORWARD (pthread_attr_getdetachstate, @@ -109,8 +104,9 @@ FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2), (thread1, thread2), 1) -FORWARD3 (pthread_exit, pthread_exit, void, (void *retval), (retval), - exit (EXIT_SUCCESS)) +/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */ +FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) +strong_alias (__pthread_exit, pthread_exit); FORWARD (pthread_getschedparam, @@ -132,7 +128,7 @@ FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) -FORWARD3 (pthread_self, pthread_self, pthread_t, (void), (), return 0) +FORWARD2 (pthread_self, pthread_t, (void), (), return 0) FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), diff --git a/nptl/init.c b/nptl/init.c index 39cf41ee9b..8da87c5dce 100644 --- a/nptl/init.c +++ b/nptl/init.c @@ -56,8 +56,8 @@ extern void __libc_setup_tls (size_t tcbsize, size_t tcbalign); static struct pthread_functions pthread_functions = { .ptr_pthread_attr_destroy = __pthread_attr_destroy, - .ptr_pthread_attr_init_2_0 = __pthread_attr_init_2_0, - .ptr_pthread_attr_init_2_1 = __pthread_attr_init_2_1, + .ptr___pthread_attr_init_2_0 = __pthread_attr_init_2_0, + .ptr___pthread_attr_init_2_1 = __pthread_attr_init_2_1, .ptr_pthread_attr_getdetachstate = __pthread_attr_getdetachstate, .ptr_pthread_attr_setdetachstate = __pthread_attr_setdetachstate, .ptr_pthread_attr_getinheritsched = __pthread_attr_getinheritsched, @@ -76,7 +76,7 @@ static struct pthread_functions pthread_functions = .ptr_pthread_cond_signal = __pthread_cond_signal, .ptr_pthread_cond_wait = __pthread_cond_wait, .ptr_pthread_equal = __pthread_equal, - .ptr_pthread_exit = __pthread_exit, + .ptr___pthread_exit = __pthread_exit, .ptr_pthread_getschedparam = __pthread_getschedparam, .ptr_pthread_setschedparam = __pthread_setschedparam, .ptr_pthread_mutex_destroy = INTUSE(__pthread_mutex_destroy), diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 482c535434..eb5c6d4106 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -72,8 +72,8 @@ extern int __pthread_debug attribute_hidden; struct pthread_functions { int (*ptr_pthread_attr_destroy) (pthread_attr_t *); - int (*ptr_pthread_attr_init_2_0) (pthread_attr_t *); - int (*ptr_pthread_attr_init_2_1) (pthread_attr_t *); + int (*ptr___pthread_attr_init_2_0) (pthread_attr_t *); + int (*ptr___pthread_attr_init_2_1) (pthread_attr_t *); int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *); int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int); int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *); @@ -94,7 +94,7 @@ struct pthread_functions int (*ptr_pthread_cond_signal) (pthread_cond_t *); int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *); int (*ptr_pthread_equal) (pthread_t, pthread_t); - void (*ptr_pthread_exit) (void *); + void (*ptr___pthread_exit) (void *); int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *); int (*ptr_pthread_setschedparam) (pthread_t, int, const struct sched_param *); -- cgit v1.2.3