[5/8] Move i486/pthread_spin_trylock.S to pthread_spin_trylock.S
Commit Message
Since glibc doesn't support i386 any more, we can move
i486/pthread_spin_trylock.S to pthread_spin_trylock.S
OK for master?
H.J.
---
* sysdeps/i386/i486/pthread_spin_trylock.S: Moved to ...
* sysdeps/i386/pthread_spin_trylock.S: Here.
* sysdeps/i386/i586/pthread_spin_trylock.S: Removed.
* sysdeps/i386/i686/pthread_spin_trylock.S: Likewise.
---
sysdeps/i386/i586/pthread_spin_trylock.S | 1 -
sysdeps/i386/i686/pthread_spin_trylock.S | 20 --------------------
sysdeps/i386/{i486 => }/pthread_spin_trylock.S | 0
3 files changed, 21 deletions(-)
delete mode 100644 sysdeps/i386/i586/pthread_spin_trylock.S
delete mode 100644 sysdeps/i386/i686/pthread_spin_trylock.S
rename sysdeps/i386/{i486 => }/pthread_spin_trylock.S (100%)
Comments
On Wed, 26 Aug 2015, H.J. Lu wrote:
> Since glibc doesn't support i386 any more, we can move
> i486/pthread_spin_trylock.S to pthread_spin_trylock.S
The i686 version wasn't just a #include - you're losing the HAVE_CMOV
define in this patch.
This illustrates the use of testing these patches by making sure that
stripped installed shared libraries (for each of i486, i586 and i686) are
identical before and after the patch series.
deleted file mode 100644
@@ -1 +0,0 @@
-#include <sysdeps/i386/i486/pthread_spin_trylock.S>
deleted file mode 100644
@@ -1,20 +0,0 @@
-/* Copyright (C) 2002-2015 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, see
- <http://www.gnu.org/licenses/>. */
-
-#define HAVE_CMOV 1
-#include <sysdeps/i386/i486/pthread_spin_trylock.S>
similarity index 100%
rename from sysdeps/i386/i486/pthread_spin_trylock.S
rename to sysdeps/i386/pthread_spin_trylock.S