diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-03-21 22:08:26 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-03-21 22:08:26 +0000 |
commit | 0bf98029cd3f230233c48eee7f3e6d49cce37d74 (patch) | |
tree | 230214f73f486bb5cbafece7ab46c2787f36eb5f /linuxthreads | |
parent | cb162e13ed384f33f2712b4fc976e70a1fa7d9c4 (diff) | |
download | glibc-0bf98029cd3f230233c48eee7f3e6d49cce37d74.tar.gz glibc-0bf98029cd3f230233c48eee7f3e6d49cce37d74.tar.xz glibc-0bf98029cd3f230233c48eee7f3e6d49cce37d74.zip |
Update.
* libio/fileops.c: Use new macros from shlib-compat.h to define versions. * libio/iofclose.c: Likewise. * libio/oldiofclose.c: Likewise.
Diffstat (limited to 'linuxthreads')
-rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
-rw-r--r-- | linuxthreads/pthread.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index ce335a70fe..25088bb146 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2000-03-21 Ulrich Drepper <drepper@redhat.com> + + * pthread.c (pthread_initialize): Test for address of __dso_handle + being NULL, not value. Use __on_exit, not on_exit. + 2000-03-19 Ulrich Drepper <drepper@redhat.com> * pthread.c (pthread_initialize): Instead of on_exit use diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index ce26f0580b..e5010b9261 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -26,6 +26,7 @@ #endif #include <sys/wait.h> #include <sys/resource.h> +#include <shlib-compat.h> #include "pthread.h" #include "internals.h" #include "spinlock.h" @@ -514,8 +515,9 @@ int __pthread_create_2_1(pthread_t *thread, const pthread_attr_t *attr, return THREAD_GETMEM(self, p_retcode); } -#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING -default_symbol_version (__pthread_create_2_1, pthread_create, GLIBC_2.1); +versioned_symbol (libpthread, __pthread_create_2_1, pthread_create, GLIBC_2_1); + +#if SHLIB_COMPAT (libpthread, GLIBC_2_0) int __pthread_create_2_0(pthread_t *thread, const pthread_attr_t *attr, void * (*start_routine)(void *), void *arg) @@ -540,8 +542,6 @@ int __pthread_create_2_0(pthread_t *thread, const pthread_attr_t *attr, return __pthread_create_2_1 (thread, attr, start_routine, arg); } symbol_version (__pthread_create_2_0, pthread_create, GLIBC_2.0); -#else -strong_alias (__pthread_create_2_1, pthread_create) #endif /* Simple operations on thread identifiers */ |