33 files changed, 68 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f7da98f81..94a1f40b4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,64 @@
 2014-06-25  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/sparc/sparc64/nptl/cpu_relax.S: Moved ...
+	* sysdeps/sparc/sparc64/cpu_relax.S: ... here.
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_init.c: Moved ...
+	* sysdeps/sparc/sparc64/pthread_spin_init.c: ... here.
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S: Moved ...
+	* sysdeps/sparc/sparc64/pthread_spin_lock.S: ... here.
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sparc/sparc64/pthread_spin_trylock.S: ... here.
+	* sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S: Moved ...
+	* sysdeps/sparc/sparc64/pthread_spin_unlock.S: ... here.
+	* sysdeps/sparc/sparc64/nptl/pthreaddef.h: Moved ...
+	* sysdeps/sparc/sparc64/pthreaddef.h: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/cpu_relax.S: Update #include.
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S: Likewise.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S: Likewise.
+	* sysdeps/sparc/sparc64/nptl/Makefile: File removed, its contents ...
+	* sysdeps/sparc/sparc64/Makefile: ... appended here.
+
+	* sysdeps/sparc/sparc32/nptl/lowlevellock.c: Moved ...
+	* sysdeps/sparc/sparc32/lowlevellock.c: ... here.
+	* sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c: Moved ...
+	* sysdeps/sparc/sparc32/pthread_barrier_wait.c: ... here.
+	* sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S: Moved ...
+	* sysdeps/sparc/sparc32/pthread_spin_lock.S: ... here.
+	* sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sparc/sparc32/pthread_spin_trylock.S: ... here.
+	* sysdeps/sparc/sparc32/nptl/pthreaddef.h: Moved ...
+	* sysdeps/sparc/sparc32/pthreaddef.h: ... here.
+	* sysdeps/sparc/sparc32/nptl/sem_post.c: Moved ...
+	* sysdeps/sparc/sparc32/sem_post.c: ... here.
+	* sysdeps/sparc/sparc32/nptl/sem_timedwait.c: Moved ...
+	* sysdeps/sparc/sparc32/sem_timedwait.c: ... here.
+	* sysdeps/sparc/sparc32/nptl/sem_trywait.c: Moved ...
+	* sysdeps/sparc/sparc32/sem_trywait.c: ... here.
+	* sysdeps/sparc/sparc32/nptl/sem_wait.c: Moved ...
+	* sysdeps/sparc/sparc32/sem_wait.c: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/cpu_relax.S: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/pthread_barrier_wait.c: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/sem_post.c: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/sem_timedwait.c: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/sem_trywait.c: ... here.
+	* sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c: Moved ...
+	* sysdeps/sparc/sparc32/sparcv9/sem_wait.c: ... here.
+
 	* sysdeps/unix/sysv/linux/sparc/sparc32/nptl/c++-types.data: Moved ...
 	* sysdeps/unix/sysv/linux/sparc/sparc32/c++-types.data: ... here.
 	* sysdeps/unix/sysv/linux/sparc/sparc32/nptl/ld.abilist: Moved ...
diff --git a/sysdeps/sparc/sparc32/nptl/lowlevellock.c b/sysdeps/sparc/sparc32/lowlevellock.c
index 8384281c3a..8384281c3a 100644
--- a/sysdeps/sparc/sparc32/nptl/lowlevellock.c
+++ b/sysdeps/sparc/sparc32/lowlevellock.c
diff --git a/sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
index 0fed908865..0fed908865 100644
--- a/sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c
+++ b/sysdeps/sparc/sparc32/pthread_barrier_wait.c
diff --git a/sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S b/sysdeps/sparc/sparc32/pthread_spin_lock.S
index 3accc69615..3accc69615 100644
--- a/sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S
+++ b/sysdeps/sparc/sparc32/pthread_spin_lock.S
diff --git a/sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/pthread_spin_trylock.S
index 68215ab2c9..68215ab2c9 100644
--- a/sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S
+++ b/sysdeps/sparc/sparc32/pthread_spin_trylock.S
diff --git a/sysdeps/sparc/sparc32/nptl/pthreaddef.h b/sysdeps/sparc/sparc32/pthreaddef.h
index eb8d33bcff..eb8d33bcff 100644
--- a/sysdeps/sparc/sparc32/nptl/pthreaddef.h
+++ b/sysdeps/sparc/sparc32/pthreaddef.h
diff --git a/sysdeps/sparc/sparc32/nptl/sem_post.c b/sysdeps/sparc/sparc32/sem_post.c
index d3846c045c..d3846c045c 100644
--- a/sysdeps/sparc/sparc32/nptl/sem_post.c
+++ b/sysdeps/sparc/sparc32/sem_post.c
diff --git a/sysdeps/sparc/sparc32/nptl/sem_timedwait.c b/sysdeps/sparc/sparc32/sem_timedwait.c
index 5c48cb385a..5c48cb385a 100644
--- a/sysdeps/sparc/sparc32/nptl/sem_timedwait.c
+++ b/sysdeps/sparc/sparc32/sem_timedwait.c
diff --git a/sysdeps/sparc/sparc32/nptl/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c
index 7d0fc556f9..7d0fc556f9 100644
--- a/sysdeps/sparc/sparc32/nptl/sem_trywait.c
+++ b/sysdeps/sparc/sparc32/sem_trywait.c
diff --git a/sysdeps/sparc/sparc32/nptl/sem_wait.c b/sysdeps/sparc/sparc32/sem_wait.c
index 8c072fe5f4..8c072fe5f4 100644
--- a/sysdeps/sparc/sparc32/nptl/sem_wait.c
+++ b/sysdeps/sparc/sparc32/sem_wait.c
diff --git a/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S
new file mode 100644
index 0000000000..41a5e72b25
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/cpu_relax.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S b/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S
deleted file mode 100644
index fa886470cd..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/cpu_relax.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c
deleted file mode 100644
index c8edcb0c6d..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_init.c>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S
deleted file mode 100644
index f2b898d3ad..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S
deleted file mode 100644
index b324906220..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S
deleted file mode 100644
index 8c56ebe49f..0000000000
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/sparcv9/pthread_barrier_wait.c
index 8336f5e00c..8336f5e00c 100644
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c
+++ b/sysdeps/sparc/sparc32/sparcv9/pthread_barrier_wait.c
diff --git a/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c
new file mode 100644
index 0000000000..1eede86abd
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_init.c>
diff --git a/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
new file mode 100644
index 0000000000..ce53dfa396
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_lock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S
new file mode 100644
index 0000000000..ffd632da0a
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_trylock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S
new file mode 100644
index 0000000000..983c80377a
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S
@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_unlock.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c b/sysdeps/sparc/sparc32/sparcv9/sem_post.c
index 3c4b940fe6..3c4b940fe6 100644
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c
+++ b/sysdeps/sparc/sparc32/sparcv9/sem_post.c
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c b/sysdeps/sparc/sparc32/sparcv9/sem_timedwait.c
index f19b2c5487..f19b2c5487 100644
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c
+++ b/sysdeps/sparc/sparc32/sparcv9/sem_timedwait.c
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c b/sysdeps/sparc/sparc32/sparcv9/sem_trywait.c
index 80157c5d2a..80157c5d2a 100644
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c
+++ b/sysdeps/sparc/sparc32/sparcv9/sem_trywait.c
diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c b/sysdeps/sparc/sparc32/sparcv9/sem_wait.c
index b6d8287d92..b6d8287d92 100644
--- a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c
+++ b/sysdeps/sparc/sparc32/sparcv9/sem_wait.c
diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile
index fb161ea13f..dd3023dcec 100644
--- a/sysdeps/sparc/sparc64/Makefile
+++ b/sysdeps/sparc/sparc64/Makefile
@@ -14,3 +14,7 @@ ASFLAGS-.op += -Wa,-Av9d
 ASFLAGS-.og += -Wa,-Av9d
 ASFLAGS-.oS += -Wa,-Av9d
 endif
+
+ifeq ($(subdir),nptl)
+libpthread-routines += cpu_relax
+endif
diff --git a/sysdeps/sparc/sparc64/nptl/cpu_relax.S b/sysdeps/sparc/sparc64/cpu_relax.S
index 9d45eb7e42..9d45eb7e42 100644
--- a/sysdeps/sparc/sparc64/nptl/cpu_relax.S
+++ b/sysdeps/sparc/sparc64/cpu_relax.S
diff --git a/sysdeps/sparc/sparc64/nptl/Makefile b/sysdeps/sparc/sparc64/nptl/Makefile
deleted file mode 100644
index ddc9038611..0000000000
--- a/sysdeps/sparc/sparc64/nptl/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(subdir),nptl)
-libpthread-routines += cpu_relax
-endif
diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c b/sysdeps/sparc/sparc64/pthread_spin_init.c
index 58319ab62d..58319ab62d 100644
--- a/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c
+++ b/sysdeps/sparc/sparc64/pthread_spin_init.c
diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S b/sysdeps/sparc/sparc64/pthread_spin_lock.S
index aec66542de..aec66542de 100644
--- a/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S
+++ b/sysdeps/sparc/sparc64/pthread_spin_lock.S
diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S b/sysdeps/sparc/sparc64/pthread_spin_trylock.S
index d10b08b5da..d10b08b5da 100644
--- a/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S
+++ b/sysdeps/sparc/sparc64/pthread_spin_trylock.S
diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S b/sysdeps/sparc/sparc64/pthread_spin_unlock.S
index 0c18530735..0c18530735 100644
--- a/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S
+++ b/sysdeps/sparc/sparc64/pthread_spin_unlock.S
diff --git a/sysdeps/sparc/sparc64/nptl/pthreaddef.h b/sysdeps/sparc/sparc64/pthreaddef.h
index ee44bcf1af..ee44bcf1af 100644
--- a/sysdeps/sparc/sparc64/nptl/pthreaddef.h
+++ b/sysdeps/sparc/sparc64/pthreaddef.h