* [PATCH] forward.c changes in linuxthreads and nptl
@ 2002-12-30 7:35 Jakub Jelinek
2002-12-30 15:52 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2002-12-30 7:35 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
The following patch changes linuxthreads forward.c to export the
wrappers plus simplifies nptl forward.c (and removes some warnings).
2002-12-30 Jakub Jelinek <jakub@redhat.com>
linuxthreads/
* forward.c: Make all functions available by default again. It
caused too much trouble.
* internals.h (struct pthread_functions): Rename ptr_pthread_exit
and ptr_pthread_attr_init_2_* to ptr___pthread_exit and
ptr___pthread_attr_init_2_*.
* pthread.c (pthread_functions): Adjust.
nptl/
* 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.
--- libc/linuxthreads/forward.c.jj 2002-12-19 10:15:13.000000000 +0100
+++ libc/linuxthreads/forward.c 2002-12-30 13:45:32.000000000 +0100
@@ -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)
--- libc/linuxthreads/internals.h.jj 2002-12-27 21:49:58.000000000 +0100
+++ libc/linuxthreads/internals.h 2002-12-27 21:49:58.000000000 +0100
@@ -483,8 +483,8 @@ extern void __libc_disable_asynccancel (
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 *);
--- libc/linuxthreads/pthread.c.jj 2002-12-28 16:10:08.000000000 +0100
+++ libc/linuxthreads/pthread.c 2002-12-30 13:38:46.000000000 +0100
@@ -240,9 +240,9 @@ static struct pthread_functions pthread_
#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_
.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,
--- libc/nptl/forward.c.jj 2002-12-30 13:42:28.000000000 +0100
+++ libc/nptl/forward.c 2002-12-30 14:41:16.000000000 +0100
@@ -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 threa
(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_mu
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),
--- libc/nptl/pthreadP.h.jj 2002-12-17 03:01:54.000000000 +0100
+++ libc/nptl/pthreadP.h 2002-12-17 03:01:54.000000000 +0100
@@ -72,8 +72,8 @@ extern int __pthread_debug attribute_hid
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 *);
--- libc/nptl/init.c.jj 2002-12-17 03:02:26.000000000 +0100
+++ libc/nptl/init.c 2002-12-30 13:51:21.000000000 +0100
@@ -56,8 +56,8 @@ extern void __libc_setup_tls (size_t tcb
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_
.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),
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] forward.c changes in linuxthreads and nptl
2002-12-30 7:35 [PATCH] forward.c changes in linuxthreads and nptl Jakub Jelinek
@ 2002-12-30 15:52 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2002-12-30 15:52 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Roland McGrath, Glibc hackers
Jakub Jelinek wrote:
> The following patch changes linuxthreads forward.c to export the
> wrappers plus simplifies nptl forward.c (and removes some warnings).
I've checked the patch in. Thanks,
--
--------------. ,-. 444 Castro Street
Ulrich Drepper \ ,-----------------' \ Mountain View, CA 94041 USA
Red Hat `--' drepper at redhat.com `---------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-12-30 23:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-12-30 7:35 [PATCH] forward.c changes in linuxthreads and nptl Jakub Jelinek
2002-12-30 15:52 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).