svn commit: trunk/uClibc: include libc/misc/pthread libc/sysdeps/l etc...
andersen at uclibc.org
andersen at uclibc.org
Fri Dec 8 03:19:37 UTC 2006
Author: andersen
Date: 2006-12-07 19:19:36 -0800 (Thu, 07 Dec 2006)
New Revision: 16805
Log:
finish the pthread locking cleanups. This should get things compiling again
though I still need to silence the warnings about _pthread_cleanup_push_defer
Modified:
trunk/uClibc/include/libc-internal.h
trunk/uClibc/libc/misc/pthread/Makefile.in
trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h
trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h
trunk/uClibc/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h
trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/pthread.h
Changeset:
Modified: trunk/uClibc/include/libc-internal.h
===================================================================
--- trunk/uClibc/include/libc-internal.h 2006-12-08 00:31:47 UTC (rev 16804)
+++ trunk/uClibc/include/libc-internal.h 2006-12-08 03:19:36 UTC (rev 16805)
@@ -56,6 +56,8 @@
# define __pthread_mutex_lock(mutex) ((void)0)
# define __pthread_mutex_trylock(mutex) ((void)0)
# define __pthread_mutex_unlock(mutex) ((void)0)
+# define _pthread_cleanup_push_defer(mutex) ((void)0)
+# define _pthread_cleanup_pop_restore(mutex) ((void)0)
# endif
/* internal access to program name */
Modified: trunk/uClibc/libc/misc/pthread/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/pthread/Makefile.in 2006-12-08 00:31:47 UTC (rev 16804)
+++ trunk/uClibc/libc/misc/pthread/Makefile.in 2006-12-08 03:19:36 UTC (rev 16805)
@@ -8,7 +8,7 @@
MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread
MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
-libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
+libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
objclean-y += misc_pthread_objclean
Modified: trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h 2006-12-08 00:31:47 UTC (rev 16804)
+++ trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h 2006-12-08 03:19:36 UTC (rev 16805)
@@ -13,6 +13,7 @@
#ifdef __UCLIBC_HAS_THREADS__
#include <pthread.h>
+#include <bits/uClibc_pthread.h>
#define __UCLIBC_MUTEX_TYPE pthread_mutex_t
Modified: trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h 2006-12-08 00:31:47 UTC (rev 16804)
+++ trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h 2006-12-08 03:19:36 UTC (rev 16805)
@@ -28,8 +28,7 @@
#endif
extern int __pthread_mutex_init (pthread_mutex_t *__restrict __mutex,
- __const pthread_mutexattr_t *__restrict
- __mutex_attr) attribute_hidden;
+ __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;
Modified: trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/pthread.h
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/pthread.h 2006-12-08 00:31:47 UTC (rev 16804)
+++ trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/pthread.h 2006-12-08 03:19:36 UTC (rev 16805)
@@ -24,9 +24,6 @@
#include <signal.h>
#include <bits/pthreadtypes.h>
#include <bits/initspin.h>
-#if defined _LIBC && ( defined IS_IN_libc || defined NOT_IN_libc )
-#include <bits/uClibc_pthread.h>
-#endif
__BEGIN_DECLS
Modified: trunk/uClibc/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h 2006-12-08 00:31:47 UTC (rev 16804)
+++ trunk/uClibc/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h 2006-12-08 03:19:36 UTC (rev 16805)
@@ -24,9 +24,6 @@
#include <signal.h>
#include <bits/pthreadtypes.h>
#include <bits/initspin.h>
-#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
-#include <bits/uClibc_pthread.h>
-#endif
__BEGIN_DECLS
More information about the uClibc-cvs
mailing list