diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-23 17:56:28 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-23 17:56:28 +0000 |
| commit | aa725129e840e596bbbf43b80fed6194a0dfbc72 (patch) | |
| tree | 0578b4c71aab8f3d979d3181a922382acf050816 /toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch | |
| parent | aea8cdc96da2e917d66a3ec59fe3b94f424bc570 (diff) | |
clean up uclibc patch/config version handling a bit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14994 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch')
| -rw-r--r-- | toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch b/toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch new file mode 100644 index 0000000000..9c3a420595 --- /dev/null +++ b/toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch @@ -0,0 +1,51 @@ +diff -ur uClibc-0.9.28.2/libc/sysdeps/linux/common/bits/uClibc_pthread.h uClibc-0.9.28.1/libc/sysdeps/linux/common/bits/uClibc_pthread.h +--- uClibc-0.9.28.2/libc/sysdeps/linux/common/bits/uClibc_pthread.h 2007-02-22 00:28:41.000000000 +0100 ++++ uClibc-0.9.28.1/libc/sysdeps/linux/common/bits/uClibc_pthread.h 2007-01-26 00:54:19.000000000 +0100 +@@ -24,27 +23,27 @@ + #define _UCLIBC_PTHREAD_H + + #ifndef _PTHREAD_H +-# error "Always include <pthread.h> rather than <bits/uClibc_pthread.h>" ++#error Always include <pthread.h> rather than <bits/uClibc_pthread.h> + #endif + +-#if defined _LIBC +-/* 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); +- +-struct _pthread_cleanup_buffer; +-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 ++#if defined _LIBC ++/* Threading functions internal to uClibc. Make these thread functions ++ * weak so that we can elide them from single-threaded processes. */ ++extern int __pthread_mutex_init (pthread_mutex_t *__mutex, ++ __const pthread_mutexattr_t *__mutex_attr); ++extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); ++extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); ++extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); ++extern void __uclibc_mutex_unlock (void *) attribute_hidden; ++extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex); ++ ++struct _pthread_cleanup_buffer; ++extern void _pthread_cleanup_push_defer ( ++ struct _pthread_cleanup_buffer *__buffer, ++ void (*__routine) (void *), void *__arg); ++extern void _pthread_cleanup_pop_restore ( ++ struct _pthread_cleanup_buffer *__buffer, ++ int __execute); ++#endif + + #endif |