100-revert_broken_stuff.patch 2.4 KB

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