diff options
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/nptl/pthread_create.c | 1 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/mips/pthread_spin_lock.S | 5 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/mips/pthread_spin_trylock.S | 8 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/libpthread/nptl/pthread_create.c b/libpthread/nptl/pthread_create.c index 18f1c034c..c83160c80 100644 --- a/libpthread/nptl/pthread_create.c +++ b/libpthread/nptl/pthread_create.c @@ -26,7 +26,6 @@ #include <ldsodefs.h> #include <atomic.h> #include <libc-internal.h> -#include <resolv.h> #include <shlib-compat.h> diff --git a/libpthread/nptl/sysdeps/mips/pthread_spin_lock.S b/libpthread/nptl/sysdeps/mips/pthread_spin_lock.S index d5f2a7234..e35c381ed 100644 --- a/libpthread/nptl/sysdeps/mips/pthread_spin_lock.S +++ b/libpthread/nptl/sysdeps/mips/pthread_spin_lock.S @@ -33,5 +33,6 @@ ENTRY (pthread_spin_lock) MIPS_SYNC .set pop li v0, 0 - ret -PSEUDO_END (pthread_spin_lock) + j ra + nop +END (pthread_spin_lock) diff --git a/libpthread/nptl/sysdeps/mips/pthread_spin_trylock.S b/libpthread/nptl/sysdeps/mips/pthread_spin_trylock.S index 9c6e740f0..b54732869 100644 --- a/libpthread/nptl/sysdeps/mips/pthread_spin_trylock.S +++ b/libpthread/nptl/sysdeps/mips/pthread_spin_trylock.S @@ -35,7 +35,9 @@ ENTRY (pthread_spin_trylock) MIPS_SYNC .set pop li v0, 0 - ret + j ra + nop 1: li v0, EBUSY - ret -PSEUDO_END (pthread_spin_trylock) + j ra + nop +END (pthread_spin_trylock) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c index 6c39eb772..5315b0564 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c @@ -22,10 +22,6 @@ pid_t __fork (void) { -#ifdef __UCLIBC__ return __libc_fork_nptl (); -#else - return __libc_fork (); -#endif } strong_alias (__fork, fork) |