Fix a long-standing bug with pthreads. A couple of linuxthreads files

were including libc-lock.h which had a bunch of weak pragmas.  Also,
uClibc supplied a number of no-op weak thread functions even though
many weren't needed.  This combined result was that sometimes the
functional versions of thread functions in pthread would not override
the weaks in libc.

While fixing this, I also prepended double-underscore to all necessary
weak thread funcs in uClibc, and removed all unused weaks.

I did a test build, but haven't tested this since these changes are
a backport from my working tree.  I did test the changes there and
no longer need to explicitly add -lpthread in the perl build for
perl to pass its thread self tests.

2 files changed, 42 insertions, 3 deletions

diff --git a/libc/sysdeps/linux/common/bits/uClibc_pthread.h b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
new file mode 100644
index 000000000..348fd9d7d
--- /dev/null
+++ b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
@@ -0,0 +1,39 @@
+/*  Copyright (C) 2003     Manuel Novoa III
+ *
+ *  This 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.
+ *
+ *  This 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 this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* Supply prototypes for the (weak) thread functions used by the
+ * uClibc library code.
+ */
+
+#ifndef _UCLIBC_PTHREAD_H
+#define _UCLIBC_PTHREAD_H
+
+#ifndef _PTHREAD_H
+#error Always include <pthread.h> rather than <bits/uClibc_pthread.h>
+#endif
+
+extern int __pthread_mutex_init (pthread_mutex_t *__restrict __mutex,
+								 __const pthread_mutexattr_t *__restrict
+								 __mutex_attr) __THROW;
+
+extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex) __THROW;
+
+extern int __pthread_mutex_lock (pthread_mutex_t *__mutex) __THROW;
+
+extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW;
+
+#endif
diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
index cd278c13c..904681631 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
@@ -204,17 +204,17 @@
 
 #define __STDIO_THREADLOCK(STREAM) \
 	if ((STREAM)->user_locking == 0) { \
-		pthread_mutex_lock(&(STREAM)->lock); \
+		__pthread_mutex_lock(&(STREAM)->lock); \
 	}
 
 #define __STDIO_THREADUNLOCK(STREAM) \
 	if ((STREAM)->user_locking == 0) { \
-		pthread_mutex_unlock(&(STREAM)->lock); \
+		__pthread_mutex_unlock(&(STREAM)->lock); \
 	}
 
 #define __STDIO_THREADTRYLOCK(STREAM) \
 	if ((STREAM)->user_locking == 0) { \
-		pthread_mutex_trylock(&(STREAM)->lock); \
+		__pthread_mutex_trylock(&(STREAM)->lock); \
 	}
 
 #define __STDIO_SET_USER_LOCKING(STREAM)   	((STREAM)->user_locking = 1)