Define HAVE_CMOV and include i486 version.

diff --git a/nptl/sysdeps/i386/i486/pthread_spin_trylock.S b/nptl/sysdeps/i386/i486/pthread_spin_trylock.S
new file mode 100644 (file)
index 0000000..abda929
--- /dev/null
+++ b/nptl/sysdeps/i386/i486/pthread_spin_trylock.S
@@ -0,0 +1,48 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#define EBUSY  16
+
+
+#ifdef UP
+# define LOCK
+#else
+# define LOCK lock
+#endif
+
+       .globl  pthread_spin_trylock
+       .type   pthread_spin_trylock,@function
+       .align  16
+pthread_spin_trylock:
+       movl    4(%esp), %edx
+       movl    $1, %eax
+       xorl    %ecx, %ecx
+       LOCK
+       cmpxchgl %ecx, (%edx)
+       movl    $EBUSY, %edx
+       movl    %ecx, %eax
+#ifdef HAVE_CMOV
+       cmovnel %edx, %eax
+#else
+       je      0f
+       movl    %edx, %eax
+0:
+#endif
+       ret
+       .size   pthread_spin_trylock,.-pthread_spin_trylock

diff --git a/nptl/sysdeps/i386/i586/pthread_spin_trylock.S b/nptl/sysdeps/i386/i586/pthread_spin_trylock.S
new file mode 100644 (file)
index 0000000..ffe3d45
--- /dev/null
+++ b/nptl/sysdeps/i386/i586/pthread_spin_trylock.S
@@ -0,0 +1,20 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include "../i486/pthread_spin_trylock.S"

diff --git a/nptl/sysdeps/i386/i686/pthread_spin_trylock.S b/nptl/sysdeps/i386/i686/pthread_spin_trylock.S
index 2ab83e6969e62f1b79fed1e85f01ef2d4e747540..a5d861f92d99e686470f92296f0426479e6be4f0 100644 (file)
--- a/nptl/sysdeps/i386/i686/pthread_spin_trylock.S
+++ b/nptl/sysdeps/i386/i686/pthread_spin_trylock.S
@@ -17,26 +17,5 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#define EBUSY  16
-
-
-#ifdef UP
-# define LOCK
-#else
-# define LOCK lock
-#endif
-
-       .globl  pthread_spin_trylock
-       .type   pthread_spin_trylock,@function
-       .align  16
-pthread_spin_trylock:
-       movl    4(%esp), %edx
-       movl    $1, %eax
-       xorl    %ecx, %ecx
-       LOCK
-       cmpxchgl %ecx, (%edx)
-       movl    $EBUSY, %edx
-       movl    %ecx, %eax
-       cmovne  %edx, %eax
-       ret
-       .size   pthread_spin_trylock,.-pthread_spin_trylock
+#define HAVE_CMOV      1
+#include "../i486/pthread_spin_trylock.S"