Move SH code out of nptl/ subdirectory.

33 files changed, 72 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b68480..606a889 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 81bddf6..0000000
--- 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 bb7c553..0c6db9a 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 279fc9a..279fc9a 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 e4bf190..e4bf190 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 76ec533..76ec533 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 34d7c9f..34d7c9f 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 7ea338e..7ea338e 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 753b72b..753b72b 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 d4d3e93..d4d3e93 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 ad6188d..ad6188d 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 d580ca3..d580ca3 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 84b8edb..84b8edb 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 438632d..438632d 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 65b8d0c..65b8d0c 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 946b1d7..946b1d7 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 89b32cc..89b32cc 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 b2ca812..865a9ee 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 94b99e7..94b99e7 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 ad01966..ad01966 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 b22cf44..b22cf44 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 34790fd..34790fd 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 07f7b21..07f7b21 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 dd25e95..dd25e95 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 db99ee4..db99ee4 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 8802fa9..8802fa9 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 ccc6255..ccc6255 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 4803d03..4803d03 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 8ff8792..8ff8792 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 04a6a40..04a6a40 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 90be7bd..90be7bd 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 c4c0a75..c4c0a75 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 4278f25..4278f25 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h