summaryrefslogtreecommitdiff
path: root/libc/stdlib/malloc-930716
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2003-12-27 23:30:50 +0000
committerManuel Novoa III <mjn3@codepoet.org>2003-12-27 23:30:50 +0000
commitd05dafe2fc23137f8decd641d82d23f45e16281c (patch)
tree83fb903ed075f81269ef2b1ee4b0edf0741ff70f /libc/stdlib/malloc-930716
parentcb19f2f71fa01b6d40dae3190cb6dd1d2116f852 (diff)
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.
Diffstat (limited to 'libc/stdlib/malloc-930716')
-rw-r--r--libc/stdlib/malloc-930716/malloc.c4
-rw-r--r--libc/stdlib/malloc-930716/memalign.c4
-rw-r--r--libc/stdlib/malloc-930716/realloc.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/libc/stdlib/malloc-930716/malloc.c b/libc/stdlib/malloc-930716/malloc.c
index af2658415..14047cb02 100644
--- a/libc/stdlib/malloc-930716/malloc.c
+++ b/libc/stdlib/malloc-930716/malloc.c
@@ -21,8 +21,8 @@
#ifdef __UCLIBC_HAS_THREADS__
#include <pthread.h>
pthread_mutex_t __malloclock = PTHREAD_MUTEX_INITIALIZER;
-# define LOCK pthread_mutex_lock(&__malloclock)
-# define UNLOCK pthread_mutex_unlock(&__malloclock);
+# define LOCK __pthread_mutex_lock(&__malloclock)
+# define UNLOCK __pthread_mutex_unlock(&__malloclock);
#else
# define LOCK
# define UNLOCK
diff --git a/libc/stdlib/malloc-930716/memalign.c b/libc/stdlib/malloc-930716/memalign.c
index eea460aad..b89165452 100644
--- a/libc/stdlib/malloc-930716/memalign.c
+++ b/libc/stdlib/malloc-930716/memalign.c
@@ -20,8 +20,8 @@
#ifdef __UCLIBC_HAS_THREADS__
#include <pthread.h>
extern pthread_mutex_t __malloclock;
-# define LOCK pthread_mutex_lock(&__malloclock)
-# define UNLOCK pthread_mutex_unlock(&__malloclock);
+# define LOCK __pthread_mutex_lock(&__malloclock)
+# define UNLOCK __pthread_mutex_unlock(&__malloclock);
#else
# define LOCK
# define UNLOCK
diff --git a/libc/stdlib/malloc-930716/realloc.c b/libc/stdlib/malloc-930716/realloc.c
index 8215afa8d..397534a5a 100644
--- a/libc/stdlib/malloc-930716/realloc.c
+++ b/libc/stdlib/malloc-930716/realloc.c
@@ -21,8 +21,8 @@
#ifdef __UCLIBC_HAS_THREADS__
#include <pthread.h>
extern pthread_mutex_t __malloclock;
-# define LOCK pthread_mutex_lock(&__malloclock)
-# define UNLOCK pthread_mutex_unlock(&__malloclock);
+# define LOCK __pthread_mutex_lock(&__malloclock)
+# define UNLOCK __pthread_mutex_unlock(&__malloclock);
#else
# define LOCK
# define UNLOCK