From 413db45d1bfb11ab1b2e8307d4b519d5169c0b7b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 27 Aug 2015 07:55:13 -0700 Subject: [PATCH] Move i486/pthread_spin_trylock.S to pthread_spin_trylock.S Since glibc doesn't support i386 any more, we can move i486/pthread_spin_trylock.S to pthread_spin_trylock.S * 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: Updated. --- ChangeLog | 7 +++++++ sysdeps/i386/i586/pthread_spin_trylock.S | 1 - sysdeps/i386/i686/pthread_spin_trylock.S | 2 +- sysdeps/i386/{i486 => }/pthread_spin_trylock.S | 0 4 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 sysdeps/i386/i586/pthread_spin_trylock.S rename sysdeps/i386/{i486 => }/pthread_spin_trylock.S (100%) diff --git a/ChangeLog b/ChangeLog index f44a4d9e03..b9e5dbc3bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2015-08-27 H.J. Lu + * 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: Updated. + +2015-08-27 H.J. Lu + * sysdeps/i386/i486/string-inlines.c: Moved to ... * sysdeps/i386/string-inlines.c: Here. diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S deleted file mode 100644 index 0cf8b3ab70..0000000000 --- a/sysdeps/i386/i586/pthread_spin_trylock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/i386/i686/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S index 924c4d728e..9da05ee3ff 100644 --- a/sysdeps/i386/i686/pthread_spin_trylock.S +++ b/sysdeps/i386/i686/pthread_spin_trylock.S @@ -17,4 +17,4 @@ . */ #define HAVE_CMOV 1 -#include +#include diff --git a/sysdeps/i386/i486/pthread_spin_trylock.S b/sysdeps/i386/pthread_spin_trylock.S similarity index 100% rename from sysdeps/i386/i486/pthread_spin_trylock.S rename to sysdeps/i386/pthread_spin_trylock.S -- 2.11.4.GIT