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/inet | |
| 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/inet')
| -rw-r--r-- | libc/inet/getnetent.c | 4 | ||||
| -rw-r--r-- | libc/inet/getproto.c | 4 | ||||
| -rw-r--r-- | libc/inet/getservice.c | 4 | ||||
| -rw-r--r-- | libc/inet/resolv.c | 12 | ||||
| -rw-r--r-- | libc/inet/rpc/create_xid.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c index 0b4c36dcb..9ade1f6b2 100644 --- a/libc/inet/getnetent.c +++ b/libc/inet/getnetent.c @@ -25,8 +25,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/inet/getproto.c b/libc/inet/getproto.c index 2a5fc8f8f..1d3a5eff5 100644 --- a/libc/inet/getproto.c +++ b/libc/inet/getproto.c @@ -65,8 +65,8 @@ #ifdef __UCLIBC_HAS_THREADS__ #include <pthread.h> static pthread_mutex_t mylock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -# 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/inet/getservice.c b/libc/inet/getservice.c index 5e90f8198..efa5d214d 100644 --- a/libc/inet/getservice.c +++ b/libc/inet/getservice.c @@ -70,8 +70,8 @@ #ifdef __UCLIBC_HAS_THREADS__ #include <pthread.h> static pthread_mutex_t mylock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -# 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/inet/resolv.c b/libc/inet/resolv.c index 43ed9ae1e..9231c0d9e 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -180,8 +180,8 @@ extern char * __searchdomain[MAX_SEARCH]; #ifdef __UCLIBC_HAS_THREADS__ #include <pthread.h> extern pthread_mutex_t __resolv_lock; -# define BIGLOCK pthread_mutex_lock(&__resolv_lock) -# define BIGUNLOCK pthread_mutex_unlock(&__resolv_lock); +# define BIGLOCK __pthread_mutex_lock(&__resolv_lock) +# define BIGUNLOCK __pthread_mutex_unlock(&__resolv_lock); #else # define BIGLOCK # define BIGUNLOCK @@ -645,8 +645,8 @@ int __form_query(int id, const char *name, int type, unsigned char *packet, #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 # define UNLOCK @@ -1331,8 +1331,8 @@ int __read_etc_hosts_r(FILE * fp, const char * name, int type, #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 # define UNLOCK diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c index 50dc882e5..cbb961e4d 100644 --- a/libc/inet/rpc/create_xid.c +++ b/libc/inet/rpc/create_xid.c @@ -30,8 +30,8 @@ #ifdef __UCLIBC_HAS_THREADS__ #include <pthread.h> static pthread_mutex_t createxid_lock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK pthread_mutex_lock(&createxid_lock) -# define UNLOCK pthread_mutex_unlock(&createxid_lock); +# define LOCK __pthread_mutex_lock(&createxid_lock) +# define UNLOCK __pthread_mutex_unlock(&createxid_lock); #else # define LOCK # define UNLOCK |