From 0d749bbebad48b4c673a29af03d5c5dd151881de Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 24 Jun 2014 19:17:43 -0700 Subject: x86: Consolidate unnecessary nptl/ subdirectories. --- sysdeps/i386/i486/nptl/pthread_spin_trylock.S | 46 --------------------------- sysdeps/i386/i486/pthread_spin_trylock.S | 46 +++++++++++++++++++++++++++ sysdeps/i386/i586/nptl/pthread_spin_trylock.S | 1 - sysdeps/i386/i586/pthread_spin_trylock.S | 1 + sysdeps/i386/i686/nptl/pthread_spin_trylock.S | 20 ------------ sysdeps/i386/i686/pthread_spin_trylock.S | 20 ++++++++++++ sysdeps/i386/nptl/Implies | 1 - 7 files changed, 67 insertions(+), 68 deletions(-) delete mode 100644 sysdeps/i386/i486/nptl/pthread_spin_trylock.S create mode 100644 sysdeps/i386/i486/pthread_spin_trylock.S delete mode 100644 sysdeps/i386/i586/nptl/pthread_spin_trylock.S create mode 100644 sysdeps/i386/i586/pthread_spin_trylock.S delete mode 100644 sysdeps/i386/i686/nptl/pthread_spin_trylock.S create mode 100644 sysdeps/i386/i686/pthread_spin_trylock.S delete mode 100644 sysdeps/i386/nptl/Implies (limited to 'sysdeps/i386') diff --git a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S b/sysdeps/i386/i486/nptl/pthread_spin_trylock.S deleted file mode 100644 index 0bcc0c6ede..0000000000 --- a/sysdeps/i386/i486/nptl/pthread_spin_trylock.S +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (C) 2002-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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, see - . */ - -#include - - -#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, %eax -#ifdef HAVE_CMOV - cmovel %ecx, %eax -#else - jne 0f - movl %ecx, %eax -0: -#endif - ret - .size pthread_spin_trylock,.-pthread_spin_trylock diff --git a/sysdeps/i386/i486/pthread_spin_trylock.S b/sysdeps/i386/i486/pthread_spin_trylock.S new file mode 100644 index 0000000000..0bcc0c6ede --- /dev/null +++ b/sysdeps/i386/i486/pthread_spin_trylock.S @@ -0,0 +1,46 @@ +/* Copyright (C) 2002-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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, see + . */ + +#include + + +#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, %eax +#ifdef HAVE_CMOV + cmovel %ecx, %eax +#else + jne 0f + movl %ecx, %eax +0: +#endif + ret + .size pthread_spin_trylock,.-pthread_spin_trylock diff --git a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S b/sysdeps/i386/i586/nptl/pthread_spin_trylock.S deleted file mode 100644 index a0c90b5913..0000000000 --- a/sysdeps/i386/i586/nptl/pthread_spin_trylock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S new file mode 100644 index 0000000000..0cf8b3ab70 --- /dev/null +++ b/sysdeps/i386/i586/pthread_spin_trylock.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S b/sysdeps/i386/i686/nptl/pthread_spin_trylock.S deleted file mode 100644 index d02f490986..0000000000 --- a/sysdeps/i386/i686/nptl/pthread_spin_trylock.S +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright (C) 2002-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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, see - . */ - -#define HAVE_CMOV 1 -#include diff --git a/sysdeps/i386/i686/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S new file mode 100644 index 0000000000..79eed31752 --- /dev/null +++ b/sysdeps/i386/i686/pthread_spin_trylock.S @@ -0,0 +1,20 @@ +/* Copyright (C) 2002-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 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, see + . */ + +#define HAVE_CMOV 1 +#include diff --git a/sysdeps/i386/nptl/Implies b/sysdeps/i386/nptl/Implies deleted file mode 100644 index e454b288aa..0000000000 --- a/sysdeps/i386/nptl/Implies +++ /dev/null @@ -1 +0,0 @@ -x86/nptl -- cgit 1.4.1