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.

1 files changed, 6 insertions, 6 deletions

diff --git a/libc/stdio/stdio.c b/libc/stdio/stdio.c
index e92a0bb00..281dc5bf5 100644
--- a/libc/stdio/stdio.c
+++ b/libc/stdio/stdio.c
@@ -193,13 +193,13 @@ void NAME PARAMS \
 void NAME##_unlocked PARAMS
 
 #define __STDIO_THREADLOCK_OPENLIST \
-	pthread_mutex_lock(&_stdio_openlist_lock)
+	__pthread_mutex_lock(&_stdio_openlist_lock)
 
 #define __STDIO_THREADUNLOCK_OPENLIST \
-	pthread_mutex_unlock(&_stdio_openlist_lock)
+	__pthread_mutex_unlock(&_stdio_openlist_lock)
 
 #define __STDIO_THREADTRYLOCK_OPENLIST \
-	pthread_mutex_trylock(&_stdio_openlist_lock)
+	__pthread_mutex_trylock(&_stdio_openlist_lock)
 
 #endif /* __STDIO_THREADSAFE */
 
@@ -1124,7 +1124,7 @@ int __fsetlocking(FILE *stream, int locking_mode)
 void flockfile(FILE *stream)
 {
 #ifdef __STDIO_THREADSAFE
-	pthread_mutex_lock(&stream->lock);
+	__pthread_mutex_lock(&stream->lock);
 #endif
 }
 
@@ -1135,7 +1135,7 @@ void flockfile(FILE *stream)
 int ftrylockfile(FILE *stream)
 {
 #ifdef __STDIO_THREADSAFE
-	return pthread_mutex_trylock(&stream->lock);
+	return __pthread_mutex_trylock(&stream->lock);
 #else
 	return 1;
 #endif
@@ -1148,7 +1148,7 @@ int ftrylockfile(FILE *stream)
 void funlockfile(FILE *stream)
 {
 #ifdef __STDIO_THREADSAFE
-	pthread_mutex_unlock(&stream->lock);
+	__pthread_mutex_unlock(&stream->lock);
 #endif
 }