diff options
Diffstat (limited to 'staging/glibc/glibc-2.15-revert-c5a0802a.patch')
| -rw-r--r-- | staging/glibc/glibc-2.15-revert-c5a0802a.patch | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/staging/glibc/glibc-2.15-revert-c5a0802a.patch b/staging/glibc/glibc-2.15-revert-c5a0802a.patch index f532b95e8..d8894723a 100644 --- a/staging/glibc/glibc-2.15-revert-c5a0802a.patch +++ b/staging/glibc/glibc-2.15-revert-c5a0802a.patch @@ -118,9 +118,9 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde #include <tcb-offsets.h> #include <pthread-pi-defines.h> -#include <pthread-errnos.h> + #include <stap-probe.h> #include <kernel-features.h> - @@ -137,14 +136,11 @@ __pthread_cond_wait: cmpl $PI_BIT, %eax jne 61f @@ -161,7 +161,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde -#if cond_lock != 0 - addq $cond_lock, %rdi -#endif -- cmpq $-1, dep_mutex-cond_lock(%rdi) +- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) - movl $LLL_PRIVATE, %eax - movl $LLL_SHARED, %esi - cmovne %eax, %esi @@ -187,7 +187,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde -#if cond_lock != 0 - addq $cond_lock, %rdi -#endif -- cmpq $-1, dep_mutex-cond_lock(%rdi) +- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) - movl $LLL_PRIVATE, %eax - movl $LLL_SHARED, %esi - cmovne %eax, %esi @@ -199,7 +199,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde -93: - /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ - xorq %r10, %r10 -- movq dep_mutex(%rdi), %r8 +- mov dep_mutex(%rdi), %R8_LP - leaq cond_futex(%rdi), %rdi - jmp 90b -.LcleanupEND2: @@ -224,6 +224,3 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde + .uleb128 0 .Lcstend: - -Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig -Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej |