Update.
* sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S (__pthread_cond_wait): Don't save cancellation mode and seq value in same location.
This commit is contained in:
parent
0e07706e5b
commit
842d281752
|
@ -1,5 +1,9 @@
|
||||||
2003-01-03 Ulrich Drepper <drepper@redhat.com>
|
2003-01-03 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/i386/i486/lowlevelcond.S
|
||||||
|
(__pthread_cond_wait): Don't save cancellation mode and seq value
|
||||||
|
in same location.
|
||||||
|
|
||||||
* herrno.c (__h_errno_location): Don't define as weak.
|
* herrno.c (__h_errno_location): Don't define as weak.
|
||||||
|
|
||||||
2003-01-02 Jakub Jelinek <jakub@redhat.com>
|
2003-01-02 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* Copyright (C) 2002 Free Software Foundation, Inc.
|
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
||||||
|
|
||||||
|
@ -141,8 +141,8 @@ __pthread_cond_wait:
|
||||||
/* Get and store current wakeup_seq value. */
|
/* Get and store current wakeup_seq value. */
|
||||||
movl wakeup_seq(%ebx), %edi
|
movl wakeup_seq(%ebx), %edi
|
||||||
movl wakeup_seq+4(%ebx), %edx
|
movl wakeup_seq+4(%ebx), %edx
|
||||||
movl %edi, (%esp)
|
movl %edi, 4(%esp)
|
||||||
movl %edx, 4(%esp)
|
movl %edx, 8(%esp)
|
||||||
|
|
||||||
/* Unlock. */
|
/* Unlock. */
|
||||||
8: LOCK
|
8: LOCK
|
||||||
|
@ -182,10 +182,10 @@ __pthread_cond_wait:
|
||||||
movl wakeup_seq(%ebx), %edi
|
movl wakeup_seq(%ebx), %edi
|
||||||
movl wakeup_seq+4(%ebx), %edx
|
movl wakeup_seq+4(%ebx), %edx
|
||||||
|
|
||||||
cmpl 4(%esp), %ecx
|
cmpl 8(%esp), %ecx
|
||||||
ja 7f
|
ja 7f
|
||||||
jb 8b
|
jb 8b
|
||||||
cmpl (%esp), %eax
|
cmpl 4(%esp), %eax
|
||||||
jb 8b
|
jb 8b
|
||||||
|
|
||||||
7: cmpl %ecx, %edx
|
7: cmpl %ecx, %edx
|
||||||
|
@ -503,7 +503,11 @@ __pthread_cond_signal:
|
||||||
/* Get internal lock. */
|
/* Get internal lock. */
|
||||||
movl $1, %eax
|
movl $1, %eax
|
||||||
LOCK
|
LOCK
|
||||||
|
#if cond_lock == 0
|
||||||
|
xaddl %eax, (%ebx)
|
||||||
|
#else
|
||||||
xaddl %eax, cond_lock(%ebx)
|
xaddl %eax, cond_lock(%ebx)
|
||||||
|
#endif
|
||||||
testl %eax, %eax
|
testl %eax, %eax
|
||||||
jne 1f
|
jne 1f
|
||||||
|
|
||||||
|
@ -531,7 +535,11 @@ __pthread_cond_signal:
|
||||||
|
|
||||||
/* Unlock. */
|
/* Unlock. */
|
||||||
4: LOCK
|
4: LOCK
|
||||||
|
#if cond_lock == 0
|
||||||
|
decl (%ebx)
|
||||||
|
#else
|
||||||
decl cond_lock(%ebx)
|
decl cond_lock(%ebx)
|
||||||
|
#endif
|
||||||
jne 5f
|
jne 5f
|
||||||
|
|
||||||
6: xorl %eax, %eax
|
6: xorl %eax, %eax
|
||||||
|
@ -580,7 +588,11 @@ __pthread_cond_broadcast:
|
||||||
/* Get internal lock. */
|
/* Get internal lock. */
|
||||||
movl $1, %eax
|
movl $1, %eax
|
||||||
LOCK
|
LOCK
|
||||||
|
#if cond_lock == 0
|
||||||
|
xaddl %eax, (%ebx)
|
||||||
|
#else
|
||||||
xaddl %eax, cond_lock(%ebx)
|
xaddl %eax, cond_lock(%ebx)
|
||||||
|
#endif
|
||||||
testl %eax, %eax
|
testl %eax, %eax
|
||||||
jne 1f
|
jne 1f
|
||||||
|
|
||||||
|
@ -608,7 +620,11 @@ __pthread_cond_broadcast:
|
||||||
|
|
||||||
/* Unlock. */
|
/* Unlock. */
|
||||||
4: LOCK
|
4: LOCK
|
||||||
|
#if cond_lock == 0
|
||||||
|
decl (%ebx)
|
||||||
|
#else
|
||||||
decl cond_lock(%ebx)
|
decl cond_lock(%ebx)
|
||||||
|
#endif
|
||||||
jne 5f
|
jne 5f
|
||||||
|
|
||||||
6: xorl %eax, %eax
|
6: xorl %eax, %eax
|
||||||
|
|
Loading…
Reference in New Issue