This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Fix minor fallout from yesterdays sparc nptl changes.
- From: David Miller <davem at davemloft dot net>
- To: libc-alpha at sourceware dot org
- Date: Thu, 03 May 2012 14:51:28 -0400 (EDT)
- Subject: [PATCH] Fix minor fallout from yesterdays sparc nptl changes.
This fixes a minor issue I noticed while re-auditing yesterday's
changes, as well as adding the missing trailing newline that reviewers
noticed.
Committed to master.
nptl/
* sysdeps/sparc/sparc64/pthread_spin_unlock.S: Fix thinko, we
always have to return 0, especially for the pthread_spin_init
alias.
* sysdeps/sparc/sparc32/pthread_spin_lock.S: Add missing trailing
newline.
* sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: Likewise.
* sysdeps/sparc/sparc64/pthread_spin_lock.S: Likewise.
---
nptl/ChangeLog | 10 ++++++++++
nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S | 2 +-
nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S | 2 +-
nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S | 2 +-
nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S | 3 ++-
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index ad47d67..324b234 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-03 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/sparc/sparc64/pthread_spin_unlock.S: Fix thinko, we
+ always have to return 0, especially for the pthread_spin_init
+ alias.
+ * sysdeps/sparc/sparc32/pthread_spin_lock.S: Add missing trailing
+ newline.
+ * sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: Likewise.
+ * sysdeps/sparc/sparc64/pthread_spin_lock.S: Likewise.
+
2012-05-02 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc64/pthread_spin_lock.S: New.
diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
index db4a7b1..5807969 100644
--- a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
+++ b/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S
@@ -29,4 +29,4 @@ ENTRY(pthread_spin_lock)
bne,a 2b
ldub [%o0], %g1
ba,a,pt %xcc, 1b
-END(pthread_spin_lock)
\ No newline at end of file
+END(pthread_spin_lock)
diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
index 7d7875c..d33b375 100644
--- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
+++ b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
@@ -1 +1 @@
-#include <sparc64/pthread_spin_lock.S>
\ No newline at end of file
+#include <sparc64/pthread_spin_lock.S>
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
index 5e7b0fa..cd3b01f 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
+++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S
@@ -28,4 +28,4 @@ ENTRY(pthread_spin_lock)
brnz,pt %g1, 2b
membar #LoadLoad
ba,a,pt %xcc, 1b
-END(pthread_spin_lock)
\ No newline at end of file
+END(pthread_spin_lock)
diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
index e668c39..4936814 100644
--- a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
+++ b/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S
@@ -20,8 +20,9 @@
.text
ENTRY(pthread_spin_unlock)
membar #StoreStore | #LoadStore
+ stb %g0, [%o0]
retl
- stb %g0, [%o0]
+ clr %o0
END(pthread_spin_unlock)
strong_alias (pthread_spin_unlock, pthread_spin_init)
--
1.7.10