aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-03 11:39:49 -0700
committerDavid S. Miller <davem@davemloft.net>2012-05-03 11:48:13 -0700
commit76e835cf9e553cd9ce8f9cfb33dea37e1f95fd8f (patch)
tree5b99a1eae8a91d32b9e205b7036b42bc10c90a52
parent54b71e02837f199b5b1eafcbb3c19b7b81df5561 (diff)
downloadglibc-76e835cf9e553cd9ce8f9cfb33dea37e1f95fd8f.zip
glibc-76e835cf9e553cd9ce8f9cfb33dea37e1f95fd8f.tar.gz
glibc-76e835cf9e553cd9ce8f9cfb33dea37e1f95fd8f.tar.bz2
Fix minor fallout from yesterdays sparc nptl changes.
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.
-rw-r--r--nptl/ChangeLog10
-rw-r--r--nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S2
-rw-r--r--nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S2
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S2
-rw-r--r--nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S3
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)