diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/cancel.c | 9 | ||||
| -rw-r--r-- | linuxthreads/lockfile.c | 6 | ||||
| -rw-r--r-- | linuxthreads/pthread.c | 7 |
4 files changed, 23 insertions, 5 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 0969bd3abf..a3c0f77854 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2001-08-14 Jakub Jelinek <jakub@redhat.com> + + * lockfile.c (__pthread_provide_lockfile): New variable. + * pthread.c (__pthread_require_lockfile): New variable. + * cancel.c (__pthread_require_lockfile): New variable. + 2001-07-31 Ulrich Drepper <drepper@redhat.com> * tst-context.c (threadfct): Initialize context before calling diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c index 0d5298b742..5649bc41c6 100644 --- a/linuxthreads/cancel.c +++ b/linuxthreads/cancel.c @@ -207,9 +207,12 @@ void __pthread_perform_cleanup(char *currentframe) } #ifndef SHARED -/* We need a hook to force the cancelation wrappers to be linked in when - static libpthread is used. */ +/* We need a hook to force the cancelation wrappers and file locking + to be linked in when static libpthread is used. */ extern const int __pthread_provide_wrappers; -static const int * const __pthread_require_wrappers = +static const int *const __pthread_require_wrappers = &__pthread_provide_wrappers; +extern const int __pthread_provide_lockfile; +static const int *const __pthread_require_lockfile = + &__pthread_provide_lockfile; #endif diff --git a/linuxthreads/lockfile.c b/linuxthreads/lockfile.c index 38fa3fba86..2654cd577e 100644 --- a/linuxthreads/lockfile.c +++ b/linuxthreads/lockfile.c @@ -26,6 +26,12 @@ #include "../libio/libioP.h" #endif +#ifndef SHARED +/* We need a hook to force this file to be linked in when static + libpthread is used. */ +const int __pthread_provide_lockfile = 0; +#endif + void __flockfile (FILE *stream) { diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index 1321bd488b..721da9b4e7 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -1158,9 +1158,12 @@ void __pthread_message(char * fmt, ...) #ifndef SHARED -/* We need a hook to force the cancelation wrappers to be linked in when - static libpthread is used. */ +/* We need a hook to force the cancelation wrappers and file locking + to be linked in when static libpthread is used. */ extern const int __pthread_provide_wrappers; static const int *const __pthread_require_wrappers = &__pthread_provide_wrappers; +extern const int __pthread_provide_lockfile; +static const int *const __pthread_require_lockfile = + &__pthread_provide_lockfile; #endif |