SPARC: Consolidate unnecessary nptl/ subdirectories.

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 ...

sysdeps/sparc/sparc32/sparcv9/cpu_relax.S

@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/cpu_relax.S>

sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S

@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/cpu_relax.S>

sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c

@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_init.c>

sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S

@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S>

sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S

@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S>

sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S

@@ -1 +0,0 @@
-#include <sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S>

sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c

@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_init.c>

sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S

@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_lock.S>

sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S

@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_trylock.S>

sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S

@@ -0,0 +1 @@
+#include <sysdeps/sparc/sparc64/pthread_spin_unlock.S>

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

sysdeps/sparc/sparc64/nptl/Makefile

@@ -1,3 +0,0 @@
-ifeq ($(subdir),nptl)
-libpthread-routines += cpu_relax
-endif