svn commit: trunk/uClibc/libc: misc/pthread sysdeps/linux/common/bits

[andersen at uclibc.org]

Author: andersen
Date: 2006-12-08 17:32:13 -0800 (Fri, 08 Dec 2006)
New Revision: 16825

Log:
silence a lot of warnings and fix a few genuine bugs while I'm at it.


Added:
   trunk/uClibc/libc/misc/pthread/unlock.c

Modified:
   trunk/uClibc/libc/misc/pthread/Makefile.in
   trunk/uClibc/libc/misc/pthread/weaks.c
   trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h
   trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h


Changeset:
Modified: trunk/uClibc/libc/misc/pthread/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/pthread/Makefile.in	2006-12-08 22:53:40 UTC (rev 16824)
+++ trunk/uClibc/libc/misc/pthread/Makefile.in	2006-12-09 01:32:13 UTC (rev 16825)
@@ -8,7 +8,8 @@
 MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread
 MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
 
-libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
+libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/unlock.o
+libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
 
 objclean-y += misc_pthread_objclean
 

Added: trunk/uClibc/libc/misc/pthread/unlock.c
===================================================================
--- trunk/uClibc/libc/misc/pthread/unlock.c	2006-12-08 22:53:40 UTC (rev 16824)
+++ trunk/uClibc/libc/misc/pthread/unlock.c	2006-12-09 01:32:13 UTC (rev 16825)
@@ -0,0 +1,26 @@
+/* The weak pthread functions for Linux.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <pthread.h>
+
+void attribute_hidden __uclibc_mutex_unlock (void *arg)
+{
+	pthread_mutex_t *__mutex = (pthread_mutex_t *)arg;
+	pthread_mutex_unlock(__mutex);
+}

Modified: trunk/uClibc/libc/misc/pthread/weaks.c
===================================================================
--- trunk/uClibc/libc/misc/pthread/weaks.c	2006-12-08 22:53:40 UTC (rev 16824)
+++ trunk/uClibc/libc/misc/pthread/weaks.c	2006-12-09 01:32:13 UTC (rev 16825)
@@ -28,7 +28,6 @@
  * if it gets linked in.
  */
 
-static int __pthread_return_0 (void);
 static int __pthread_return_0 (void) { return 0; }
 static void __pthread_return_void (void) { return; }
 

Modified: trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h	2006-12-08 22:53:40 UTC (rev 16824)
+++ trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_mutex.h	2006-12-09 01:32:13 UTC (rev 16825)
@@ -36,7 +36,7 @@
 		struct _pthread_cleanup_buffer __infunc_pthread_cleanup_buffer;				\
 		if (C) {										\
 			_pthread_cleanup_push_defer(&__infunc_pthread_cleanup_buffer,			\
-										__pthread_mutex_unlock,	\
+										__uclibc_mutex_unlock,	\
 										&(M));			\
 			__pthread_mutex_lock(&(M));							\
 		}											\

Modified: trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h	2006-12-08 22:53:40 UTC (rev 16824)
+++ trunk/uClibc/libc/sysdeps/linux/common/bits/uClibc_pthread.h	2006-12-09 01:32:13 UTC (rev 16825)
@@ -28,11 +28,21 @@
 #endif
 
 #if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
-extern int __pthread_mutex_init (pthread_mutex_t *__restrict __mutex,
-		__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;
+/* 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);
+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
 
 #endif