diff options
Diffstat (limited to 'sysdeps/x86_64/nptl')
| -rw-r--r-- | sysdeps/x86_64/nptl/pthread_spin_trylock.S | 8 | ||||
| -rw-r--r-- | sysdeps/x86_64/nptl/tls.h | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sysdeps/x86_64/nptl/pthread_spin_trylock.S b/sysdeps/x86_64/nptl/pthread_spin_trylock.S index c084577755..84c9b41448 100644 --- a/sysdeps/x86_64/nptl/pthread_spin_trylock.S +++ b/sysdeps/x86_64/nptl/pthread_spin_trylock.S @@ -20,16 +20,10 @@ #include <errno.h> -#ifdef UP -# define LOCK -#else -# define LOCK lock -#endif - ENTRY(pthread_spin_trylock) movl $1, %eax xorl %ecx, %ecx - LOCK + lock cmpxchgl %ecx, (%rdi) movl $EBUSY, %eax cmovel %ecx, %eax diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h index 7ba9c4e69b..fbd7f9cb89 100644 --- a/sysdeps/x86_64/nptl/tls.h +++ b/sysdeps/x86_64/nptl/tls.h @@ -99,13 +99,7 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80, /* Get system call information. */ # include <sysdep.h> -#ifndef LOCK_PREFIX -# ifdef UP -# define LOCK_PREFIX /* nothing */ -# else -# define LOCK_PREFIX "lock;" -# endif -#endif +#define LOCK_PREFIX "lock;" /* This is the size of the initial TCB. Can't be just sizeof (tcbhead_t), because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole |