diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2003-12-27 23:30:50 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-12-27 23:30:50 +0000 |
| commit | d05dafe2fc23137f8decd641d82d23f45e16281c (patch) | |
| tree | 83fb903ed075f81269ef2b1ee4b0edf0741ff70f /libc/pwd_grp | |
| parent | cb19f2f71fa01b6d40dae3190cb6dd1d2116f852 (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/pwd_grp')
| -rw-r--r-- | libc/pwd_grp/lckpwdf.c | 4 | ||||
| -rw-r--r-- | libc/pwd_grp/pwd_grp.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c index e09b611e2..6b9c2519b 100644 --- a/libc/pwd_grp/lckpwdf.c +++ b/libc/pwd_grp/lckpwdf.c @@ -30,8 +30,8 @@ #ifdef __UCLIBC_HAS_THREADS__ #include <pthread.h> static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK pthread_mutex_lock(&mylock) -# define UNLOCK pthread_mutex_unlock(&mylock); +# define LOCK __pthread_mutex_lock(&mylock) +# define UNLOCK __pthread_mutex_unlock(&mylock); #else # define LOCK # define UNLOCK diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c index 026034515..d3047e760 100644 --- a/libc/pwd_grp/pwd_grp.c +++ b/libc/pwd_grp/pwd_grp.c @@ -445,8 +445,8 @@ int getpw(uid_t uid, char *buf) #ifdef __UCLIBC_HAS_THREADS__ static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK pthread_mutex_lock(&mylock) -# define UNLOCK pthread_mutex_unlock(&mylock); +# define LOCK __pthread_mutex_lock(&mylock) +# define UNLOCK __pthread_mutex_unlock(&mylock); #else # define LOCK ((void) 0) # define UNLOCK ((void) 0) @@ -509,8 +509,8 @@ int getpwent_r(struct passwd *__restrict resultbuf, #ifdef __UCLIBC_HAS_THREADS__ static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK pthread_mutex_lock(&mylock) -# define UNLOCK pthread_mutex_unlock(&mylock); +# define LOCK __pthread_mutex_lock(&mylock) +# define UNLOCK __pthread_mutex_unlock(&mylock); #else # define LOCK ((void) 0) # define UNLOCK ((void) 0) @@ -572,8 +572,8 @@ int getgrent_r(struct group *__restrict resultbuf, #ifdef __UCLIBC_HAS_THREADS__ static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK pthread_mutex_lock(&mylock) -# define UNLOCK pthread_mutex_unlock(&mylock); +# define LOCK __pthread_mutex_lock(&mylock) +# define UNLOCK __pthread_mutex_unlock(&mylock); #else # define LOCK ((void) 0) # define UNLOCK ((void) 0) |