[arch-commits] Commit in glibc/trunk (glibc-2.15-revert-c5a0802a.patch)

[Allan McRae]

    Date: Saturday, June 30, 2012 @ 23:50:24
  Author: allan
Revision: 162817

update patch

Modified:
  glibc/trunk/glibc-2.15-revert-c5a0802a.patch

----------------------------------+
 glibc-2.15-revert-c5a0802a.patch |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: glibc-2.15-revert-c5a0802a.patch
===================================================================
--- glibc-2.15-revert-c5a0802a.patch	2012-07-01 03:49:33 UTC (rev 162816)
+++ glibc-2.15-revert-c5a0802a.patch	2012-07-01 03:50:24 UTC (rev 162817)
@@ -118,9 +118,9 @@
  #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 @@
 -#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 @@
 -#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 @@
 -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 @@
 +	.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