diff options
| author | Eric Andersen <andersen@codepoet.org> | 2006-12-09 01:32:13 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2006-12-09 01:32:13 +0000 |
| commit | 1f61bbd8a58e9255f45774541d76ed0bbdc05f09 (patch) | |
| tree | 5bc819f3bbd1fbd525d493cbd01ef288a3887611 /libc/sysdeps/linux/common | |
| parent | 808694e8a330e32741b7781467610d8cec99ae6e (diff) | |
silence a lot of warnings and fix a few genuine bugs while I'm at it.
Diffstat (limited to 'libc/sysdeps/linux/common')
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_mutex.h | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_pthread.h | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/common/bits/uClibc_mutex.h b/libc/sysdeps/linux/common/bits/uClibc_mutex.h index 45b4b07df..257571efc 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_mutex.h +++ b/libc/sysdeps/linux/common/bits/uClibc_mutex.h @@ -36,7 +36,7 @@ struct _pthread_cleanup_buffer __infunc_pthread_cleanup_buffer; \ if (C) { \ _pthread_cleanup_push_defer(&__infunc_pthread_cleanup_buffer, \ - __pthread_mutex_unlock, \ + __uclibc_mutex_unlock, \ &(M)); \ __pthread_mutex_lock(&(M)); \ } \ diff --git a/libc/sysdeps/linux/common/bits/uClibc_pthread.h b/libc/sysdeps/linux/common/bits/uClibc_pthread.h index 3d25ac4e8..367f380af 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_pthread.h +++ b/libc/sysdeps/linux/common/bits/uClibc_pthread.h @@ -28,11 +28,21 @@ #endif #if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc) -extern int __pthread_mutex_init (pthread_mutex_t *__restrict __mutex, - __const pthread_mutexattr_t *__restrict __mutex_attr) attribute_hidden; -extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex) attribute_hidden; -extern int __pthread_mutex_lock (pthread_mutex_t *__mutex) attribute_hidden; -extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex) attribute_hidden; +/* Threading functions internal to uClibc. Make these thread functions + * weak so that we can elide them from single-threaded processes. */ +extern int weak_function __pthread_mutex_init (pthread_mutex_t *__mutex, + __const pthread_mutexattr_t *__mutex_attr); +extern int weak_function __pthread_mutex_destroy (pthread_mutex_t *__mutex); +extern int weak_function __pthread_mutex_lock (pthread_mutex_t *__mutex); +extern int weak_function __pthread_mutex_unlock (pthread_mutex_t *__mutex); +extern void __uclibc_mutex_unlock (void *) attribute_hidden; +extern int weak_function __pthread_mutex_trylock (pthread_mutex_t *__mutex); +extern void weak_function _pthread_cleanup_push_defer ( + struct _pthread_cleanup_buffer *__buffer, + void (*__routine) (void *), void *__arg); +extern void weak_function _pthread_cleanup_pop_restore ( + struct _pthread_cleanup_buffer *__buffer, + int __execute); #endif #endif |