toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch

   1 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
   2 --- uClibc-0.9.28.2/libc/sysdeps/linux/common/bits/uClibc_pthread.h     2007-02-22 00:28:41.000000000 +0100
   3 +++ uClibc-0.9.28.1/libc/sysdeps/linux/common/bits/uClibc_pthread.h     2007-01-26 00:54:19.000000000 +0100
   4 @@ -24,27 +23,27 @@
   5  #define _UCLIBC_PTHREAD_H
   6
   7  #ifndef _PTHREAD_H
   8 -# error "Always include <pthread.h> rather than <bits/uClibc_pthread.h>"
   9 +#error Always include <pthread.h> rather than <bits/uClibc_pthread.h>
  10  #endif
  11
  12 -#if defined _LIBC
  13 -/* Threading functions internal to uClibc.  Make these thread functions
  14 - * weak so that we can elide them from single-threaded processes.  */
  15 -extern int weak_function __pthread_mutex_init (pthread_mutex_t *__mutex,
  16 -               __const pthread_mutexattr_t *__mutex_attr);
  17 -extern int weak_function __pthread_mutex_destroy (pthread_mutex_t *__mutex);
  18 -extern int weak_function __pthread_mutex_lock (pthread_mutex_t *__mutex);
  19 -extern int weak_function __pthread_mutex_unlock (pthread_mutex_t *__mutex);
  20 -extern void __uclibc_mutex_unlock (void *) attribute_hidden;
  21 -extern int weak_function __pthread_mutex_trylock (pthread_mutex_t *__mutex);
  22 -
  23 -struct _pthread_cleanup_buffer;
  24 -extern void weak_function _pthread_cleanup_push_defer (
  25 -               struct _pthread_cleanup_buffer *__buffer,
  26 -               void (*__routine) (void *), void *__arg);
  27 -extern void weak_function _pthread_cleanup_pop_restore (
  28 -               struct _pthread_cleanup_buffer *__buffer,
  29 -               int __execute);
  30 -#endif
  31 +#if defined _LIBC
  32 +/* Threading functions internal to uClibc.  Make these thread functions
  33 + * weak so that we can elide them from single-threaded processes.  */
  34 +extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
  35 +               __const pthread_mutexattr_t *__mutex_attr);
  36 +extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
  37 +extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
  38 +extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
  39 +extern void __uclibc_mutex_unlock (void *) attribute_hidden;
  40 +extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex);
  41 +
  42 +struct _pthread_cleanup_buffer;
  43 +extern void _pthread_cleanup_push_defer (
  44 +               struct _pthread_cleanup_buffer *__buffer,
  45 +               void (*__routine) (void *), void *__arg);
  46 +extern void _pthread_cleanup_pop_restore (
  47 +               struct _pthread_cleanup_buffer *__buffer,
  48 +               int __execute);
  49 +#endif
  50
  51  #endif