33 files changed, 72 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b6848078d..606a889048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+2014-06-12  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/sh/Makefile [$(subdir) = csu]
+	(gen-as-const-headers): Add tcb-offsets.sym.
+	* nptl/sysdeps/sh/Makefile: File removed.
+	* nptl/sysdeps/sh/pthread_spin_init.c: Moved ...
+	* sysdeps/sh/nptl/pthread_spin_init.c: ... here.
+	* nptl/sysdeps/sh/pthread_spin_lock.c: Moved ...
+	* sysdeps/sh/nptl/pthread_spin_lock.c: ... here.
+	* nptl/sysdeps/sh/pthread_spin_trylock.S: Moved ...
+	* sysdeps/sh/nptl/pthread_spin_trylock.S: ... here.
+	* nptl/sysdeps/sh/pthread_spin_unlock.S: Moved ...
+	* sysdeps/sh/nptl/pthread_spin_unlock.S: ... here.
+	* nptl/sysdeps/sh/pthreaddef.h: Moved ...
+	* sysdeps/sh/nptl/pthreaddef.h: ... here.
+	* nptl/sysdeps/sh/tcb-offsets.sym: Moved ...
+	* sysdeps/sh/nptl/tcb-offsets.sym: ... here.
+	* nptl/sysdeps/sh/tls.h: Moved ...
+	* sysdeps/sh/nptl/tls.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h: Moved ...
+	* sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/lowlevellock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h: Moved ...
+	* sysdeps/unix/sysv/linux/sh/lowlevellock.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_once.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S:
+	Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/sem_post.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/sem_post.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/sem_timedwait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/sem_trywait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S: Moved ...
+	* sysdeps/unix/sysv/linux/sh/sem_wait.S: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h: Moved ...
+	* sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/smp.h: Moved ...
+	* sysdeps/unix/sysv/linux/sh/smp.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Moved ...
+	* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: ... here.
+
 2014-06-12  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* posix/spawn_faction_addopen.c: Include string.h.
diff --git a/nptl/sysdeps/sh/Makefile b/nptl/sysdeps/sh/Makefile
deleted file mode 100644
index 81bddf688c..0000000000
--- a/nptl/sysdeps/sh/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifeq ($(subdir),csu)
-gen-as-const-headers += tcb-offsets.sym
-endif
diff --git a/sysdeps/sh/Makefile b/sysdeps/sh/Makefile
index bb7c553620..0c6db9a9d4 100644
--- a/sysdeps/sh/Makefile
+++ b/sysdeps/sh/Makefile
@@ -1,3 +1,7 @@
+ifeq ($(subdir),csu)
+gen-as-const-headers += tcb-offsets.sym
+endif
+
 ifeq ($(subdir),gmon)
 sysdep_routines += _mcount
 endif
diff --git a/nptl/sysdeps/sh/pthread_spin_init.c b/sysdeps/sh/nptl/pthread_spin_init.c
index 279fc9a5a6..279fc9a5a6 100644
--- a/nptl/sysdeps/sh/pthread_spin_init.c
+++ b/sysdeps/sh/nptl/pthread_spin_init.c
diff --git a/nptl/sysdeps/sh/pthread_spin_lock.c b/sysdeps/sh/nptl/pthread_spin_lock.c
index e4bf190075..e4bf190075 100644
--- a/nptl/sysdeps/sh/pthread_spin_lock.c
+++ b/sysdeps/sh/nptl/pthread_spin_lock.c
diff --git a/nptl/sysdeps/sh/pthread_spin_trylock.S b/sysdeps/sh/nptl/pthread_spin_trylock.S
index 76ec533fa8..76ec533fa8 100644
--- a/nptl/sysdeps/sh/pthread_spin_trylock.S
+++ b/sysdeps/sh/nptl/pthread_spin_trylock.S
diff --git a/nptl/sysdeps/sh/pthread_spin_unlock.S b/sysdeps/sh/nptl/pthread_spin_unlock.S
index 34d7c9f1dc..34d7c9f1dc 100644
--- a/nptl/sysdeps/sh/pthread_spin_unlock.S
+++ b/sysdeps/sh/nptl/pthread_spin_unlock.S
diff --git a/nptl/sysdeps/sh/pthreaddef.h b/sysdeps/sh/nptl/pthreaddef.h
index 7ea338e4d7..7ea338e4d7 100644
--- a/nptl/sysdeps/sh/pthreaddef.h
+++ b/sysdeps/sh/nptl/pthreaddef.h
diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/sysdeps/sh/nptl/tcb-offsets.sym
index 753b72b2dd..753b72b2dd 100644
--- a/nptl/sysdeps/sh/tcb-offsets.sym
+++ b/sysdeps/sh/nptl/tcb-offsets.sym
diff --git a/nptl/sysdeps/sh/tls.h b/sysdeps/sh/nptl/tls.h
index d4d3e93d64..d4d3e93d64 100644
--- a/nptl/sysdeps/sh/tls.h
+++ b/sysdeps/sh/nptl/tls.h
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S
index ad6188d096..ad6188d096 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h b/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h
index d580ca3ce5..d580ca3ce5 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h
+++ b/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 84b8edb86c..84b8edb86c 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index 438632d962..438632d962 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
index 65b8d0cdcd..65b8d0cdcd 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
+++ b/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
index 946b1d746f..946b1d746f 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
index 89b32ccf0e..89b32ccf0e 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
index b2ca812dfe..865a9eeb52 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
@@ -199,4 +199,3 @@ __pthread_cond_signal:
 	.size	__pthread_cond_signal, .-__pthread_cond_signal
 versioned_symbol (libpthread, __pthread_cond_signal, pthread_cond_signal,
 		  GLIBC_2_3_2)
-
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
index 94b99e724b..94b99e724b 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
index ad01966fc6..ad01966fc6 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S b/sysdeps/unix/sysv/linux/sh/pthread_once.S
index b22cf4491e..b22cf4491e 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_once.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
index 34790fd3b8..34790fd3b8 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
index 07f7b21198..07f7b21198 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
index dd25e95b96..dd25e95b96 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
index db99ee4696..db99ee4696 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
index 8802fa9383..8802fa9383 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
+++ b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S b/sysdeps/unix/sysv/linux/sh/sem_post.S
index ccc62550af..ccc62550af 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S
+++ b/sysdeps/unix/sysv/linux/sh/sem_post.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S b/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
index 4803d033d6..4803d033d6 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
+++ b/sysdeps/unix/sysv/linux/sh/sem_timedwait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S b/sysdeps/unix/sysv/linux/sh/sem_trywait.S
index 8ff8792ff4..8ff8792ff4 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S
+++ b/sysdeps/unix/sysv/linux/sh/sem_trywait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S b/sysdeps/unix/sysv/linux/sh/sem_wait.S
index 04a6a405d4..04a6a405d4 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S
+++ b/sysdeps/unix/sysv/linux/sh/sem_wait.S
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h
index 90be7bd8d0..90be7bd8d0 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/smp.h b/sysdeps/unix/sysv/linux/sh/smp.h
index c4c0a75105..c4c0a75105 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/smp.h
+++ b/sysdeps/unix/sysv/linux/sh/smp.h
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index 4278f25d7b..4278f25d7b 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h