This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH 5/8] Move i486/pthread_spin_trylock.S to pthread_spin_trylock.S


On Wed, Aug 26, 2015 at 11:02 AM, Joseph Myers <joseph@codesourcery.com> wrote:
> 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.
>

Here is the updated patch.  There are no changes in generated
shared libraries for i486, i586 amd i686 targets.

OK for master?

-- 
H.J.
From 58710b3f4274f6632eb8a1bd3c719a9f924fcb63 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 26 Aug 2015 09:58:51 -0700
Subject: [PATCH 5/8] 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.
---
 sysdeps/i386/i586/pthread_spin_trylock.S       | 1 -
 sysdeps/i386/i686/pthread_spin_trylock.S       | 2 +-
 sysdeps/i386/{i486 => }/pthread_spin_trylock.S | 0
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 sysdeps/i386/i586/pthread_spin_trylock.S
 rename sysdeps/i386/{i486 => }/pthread_spin_trylock.S (100%)

diff --git a/sysdeps/i386/i586/pthread_spin_trylock.S b/sysdeps/i386/i586/pthread_spin_trylock.S
deleted file mode 100644
index 0cf8b3a..0000000
--- a/sysdeps/i386/i586/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/i386/i486/pthread_spin_trylock.S>
diff --git a/sysdeps/i386/i686/pthread_spin_trylock.S b/sysdeps/i386/i686/pthread_spin_trylock.S
index 924c4d7..9da05ee 100644
--- a/sysdeps/i386/i686/pthread_spin_trylock.S
+++ b/sysdeps/i386/i686/pthread_spin_trylock.S
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_CMOV	1
-#include <sysdeps/i386/i486/pthread_spin_trylock.S>
+#include <sysdeps/i386/pthread_spin_trylock.S>
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.4.3


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]