From 45262aeedf2f56dcd3b30e37630ea85bb4f55603 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 12 Jun 2014 09:05:54 -0700 Subject: [PATCH] Move SH code out of nptl/ subdirectory. --- ChangeLog | 68 +++++++++++++++++++ nptl/sysdeps/sh/Makefile | 3 - sysdeps/sh/Makefile | 4 ++ .../sh/nptl}/pthread_spin_init.c | 0 .../sh/nptl}/pthread_spin_lock.c | 0 .../sh/nptl}/pthread_spin_trylock.S | 0 .../sh/nptl}/pthread_spin_unlock.S | 0 .../sh => sysdeps/sh/nptl}/pthreaddef.h | 0 .../sh => sysdeps/sh/nptl}/tcb-offsets.sym | 0 {nptl/sysdeps/sh => sysdeps/sh/nptl}/tls.h | 0 .../unix/sysv/linux/sh/libc-lowlevellock.S | 0 .../unix/sysv/linux/sh/lowlevel-atomic.h | 0 .../unix/sysv/linux/sh/lowlevellock.S | 0 .../unix/sysv/linux/sh/lowlevellock.h | 0 .../unix/sysv/linux/sh/lowlevelrobustlock.S | 0 .../unix/sysv/linux/sh/pthread_barrier_wait.S | 0 .../sysv/linux/sh/pthread_cond_broadcast.S | 0 .../unix/sysv/linux/sh/pthread_cond_signal.S | 1 - .../sysv/linux/sh/pthread_cond_timedwait.S | 0 .../unix/sysv/linux/sh/pthread_cond_wait.S | 0 .../unix/sysv/linux/sh/pthread_once.S | 0 .../sysv/linux/sh/pthread_rwlock_rdlock.S | 0 .../linux/sh/pthread_rwlock_timedrdlock.S | 0 .../linux/sh/pthread_rwlock_timedwrlock.S | 0 .../sysv/linux/sh/pthread_rwlock_unlock.S | 0 .../sysv/linux/sh/pthread_rwlock_wrlock.S | 0 .../unix/sysv/linux/sh/sem_post.S | 0 .../unix/sysv/linux/sh/sem_timedwait.S | 0 .../unix/sysv/linux/sh/sem_trywait.S | 0 .../unix/sysv/linux/sh/sem_wait.S | 0 .../unix/sysv/linux/sh/sh4/lowlevellock.h | 0 .../unix/sysv/linux/sh/smp.h | 0 .../unix/sysv/linux/sh/sysdep-cancel.h | 0 33 files changed, 72 insertions(+), 4 deletions(-) delete mode 100644 nptl/sysdeps/sh/Makefile rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/pthread_spin_init.c (100%) rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/pthread_spin_lock.c (100%) rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/pthread_spin_trylock.S (100%) rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/pthread_spin_unlock.S (100%) rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/pthreaddef.h (100%) rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/tcb-offsets.sym (100%) rename {nptl/sysdeps/sh => sysdeps/sh/nptl}/tls.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/libc-lowlevellock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/lowlevel-atomic.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/lowlevellock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/lowlevellock.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/lowlevelrobustlock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_barrier_wait.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_cond_broadcast.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_cond_signal.S (99%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_cond_timedwait.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_cond_wait.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_once.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_rwlock_rdlock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_rwlock_unlock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/pthread_rwlock_wrlock.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/sem_post.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/sem_timedwait.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/sem_trywait.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/sem_wait.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/sh4/lowlevellock.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/smp.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sh/sysdep-cancel.h (100%) diff --git a/ChangeLog b/ChangeLog index 1b6848078d..606a889048 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,71 @@ +2014-06-12 Roland McGrath + + * 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 * 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 similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_init.c rename to 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 similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_lock.c rename to 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 similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_trylock.S rename to 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 similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_unlock.S rename to sysdeps/sh/nptl/pthread_spin_unlock.S diff --git a/nptl/sysdeps/sh/pthreaddef.h b/sysdeps/sh/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/sh/pthreaddef.h rename to sysdeps/sh/nptl/pthreaddef.h diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/sysdeps/sh/nptl/tcb-offsets.sym similarity index 100% rename from nptl/sysdeps/sh/tcb-offsets.sym rename to sysdeps/sh/nptl/tcb-offsets.sym diff --git a/nptl/sysdeps/sh/tls.h b/sysdeps/sh/nptl/tls.h similarity index 100% rename from nptl/sysdeps/sh/tls.h rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S rename to 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 similarity index 99% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_post.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/smp.h rename to 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 similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/sh/sysdep-cancel.h -- 2.43.5