summaryrefslogtreecommitdiffstats
path: root/toolchain/uClibc/patches/100-revert_broken_stuff.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-24 20:22:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-02-24 20:22:01 +0000
commit3d6c5f633461f2713e0aff0d22462af41fe84b86 (patch)
treebd0e61c7139241ab3ee92e6b641ab08f789234c9 /toolchain/uClibc/patches/100-revert_broken_stuff.patch
parentbec946377a21da969360927ccc3f7ea4225476df (diff)
upgrade to uClibc 0.9.28.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6353 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/uClibc/patches/100-revert_broken_stuff.patch')
-rw-r--r--toolchain/uClibc/patches/100-revert_broken_stuff.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/toolchain/uClibc/patches/100-revert_broken_stuff.patch b/toolchain/uClibc/patches/100-revert_broken_stuff.patch
new file mode 100644
index 000000000..9c3a42059
--- /dev/null
+++ b/toolchain/uClibc/patches/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