aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-31 09:25:54 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-31 09:25:54 +0000
commit1b26e9a566ce4729c0ce692f9aee1933e85c6d58 (patch)
tree5f43aa65cfd10c893db7739dc2dffde4aa1a3784
parentadc12574e555ec7d6ba3969eed4f829705c235ab (diff)
downloadglibc-1b26e9a566ce4729c0ce692f9aee1933e85c6d58.zip
glibc-1b26e9a566ce4729c0ce692f9aee1933e85c6d58.tar.gz
glibc-1b26e9a566ce4729c0ce692f9aee1933e85c6d58.tar.bz2
Update.
2003-07-31 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S (__pthread_cond_timedwait): Don't use cmov unless HAVE_CMOV is defined. * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S: Define HAVE_CMOV. Patch by Nicholas Miell <nmiell@attbi.com>.
-rw-r--r--nptl/ChangeLog8
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S1
3 files changed, 15 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d79e798..d5b5c07 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-31 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+ (__pthread_cond_timedwait): Don't use cmov unless HAVE_CMOV is defined.
+ * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S:
+ Define HAVE_CMOV.
+ Patch by Nicholas Miell <nmiell@attbi.com>.
+
2003-07-30 Jakub Jelinek <jakub@redhat.com>
* init.c (__pthread_initialize_minimal_internal): Initialize
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index f09be44..f88d2d3 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -226,7 +226,13 @@ __pthread_cond_timedwait:
/* We return the result of the mutex_lock operation if it failed. */
testl %eax, %eax
+#ifdef HAVE_CMOV
cmovel %esi, %eax
+#else
+ jne 22f
+ movl %esi, %eax
+22:
+#endif
18: popl %ebx
.Lpop_ebx:
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
index c013155..07d481f 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S
@@ -17,4 +17,5 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#define HAVE_CMOV 1
#include "../i486/pthread_cond_timedwait.S"