From 74836003ed4f2613f5c47a654bdd38a366076c15 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 25 Jun 2014 10:04:14 -0700 Subject: [PATCH] SPARC: Consolidate unnecessary nptl/ subdirectories. --- ChangeLog | 59 ++++++++++++++++++++++ sysdeps/sparc/sparc32/{nptl => }/lowlevellock.c | 0 .../sparc32/{nptl => }/pthread_barrier_wait.c | 0 .../sparc/sparc32/{nptl => }/pthread_spin_lock.S | 0 .../sparc32/{nptl => }/pthread_spin_trylock.S | 0 sysdeps/sparc/sparc32/{nptl => }/pthreaddef.h | 0 sysdeps/sparc/sparc32/{nptl => }/sem_post.c | 0 sysdeps/sparc/sparc32/{nptl => }/sem_timedwait.c | 0 sysdeps/sparc/sparc32/{nptl => }/sem_trywait.c | 0 sysdeps/sparc/sparc32/{nptl => }/sem_wait.c | 0 sysdeps/sparc/sparc32/sparcv9/cpu_relax.S | 1 + sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S | 1 - .../sparc/sparc32/sparcv9/nptl/pthread_spin_init.c | 1 - .../sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S | 1 - .../sparc32/sparcv9/nptl/pthread_spin_trylock.S | 1 - .../sparc32/sparcv9/nptl/pthread_spin_unlock.S | 1 - .../sparcv9/{nptl => }/pthread_barrier_wait.c | 0 sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c | 1 + sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S | 1 + .../sparc/sparc32/sparcv9/pthread_spin_trylock.S | 1 + .../sparc/sparc32/sparcv9/pthread_spin_unlock.S | 1 + .../sparc/sparc32/sparcv9/{nptl => }/sem_post.c | 0 .../sparc32/sparcv9/{nptl => }/sem_timedwait.c | 0 .../sparc/sparc32/sparcv9/{nptl => }/sem_trywait.c | 0 .../sparc/sparc32/sparcv9/{nptl => }/sem_wait.c | 0 sysdeps/sparc/sparc64/Makefile | 4 ++ sysdeps/sparc/sparc64/{nptl => }/cpu_relax.S | 0 sysdeps/sparc/sparc64/nptl/Makefile | 3 -- .../sparc/sparc64/{nptl => }/pthread_spin_init.c | 0 .../sparc/sparc64/{nptl => }/pthread_spin_lock.S | 0 .../sparc64/{nptl => }/pthread_spin_trylock.S | 0 .../sparc/sparc64/{nptl => }/pthread_spin_unlock.S | 0 sysdeps/sparc/sparc64/{nptl => }/pthreaddef.h | 0 33 files changed, 68 insertions(+), 8 deletions(-) rename sysdeps/sparc/sparc32/{nptl => }/lowlevellock.c (100%) rename sysdeps/sparc/sparc32/{nptl => }/pthread_barrier_wait.c (100%) rename sysdeps/sparc/sparc32/{nptl => }/pthread_spin_lock.S (100%) rename sysdeps/sparc/sparc32/{nptl => }/pthread_spin_trylock.S (100%) rename sysdeps/sparc/sparc32/{nptl => }/pthreaddef.h (100%) rename sysdeps/sparc/sparc32/{nptl => }/sem_post.c (100%) rename sysdeps/sparc/sparc32/{nptl => }/sem_timedwait.c (100%) rename sysdeps/sparc/sparc32/{nptl => }/sem_trywait.c (100%) rename sysdeps/sparc/sparc32/{nptl => }/sem_wait.c (100%) create mode 100644 sysdeps/sparc/sparc32/sparcv9/cpu_relax.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c delete mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S rename sysdeps/sparc/sparc32/sparcv9/{nptl => }/pthread_barrier_wait.c (100%) create mode 100644 sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S rename sysdeps/sparc/sparc32/sparcv9/{nptl => }/sem_post.c (100%) rename sysdeps/sparc/sparc32/sparcv9/{nptl => }/sem_timedwait.c (100%) rename sysdeps/sparc/sparc32/sparcv9/{nptl => }/sem_trywait.c (100%) rename sysdeps/sparc/sparc32/sparcv9/{nptl => }/sem_wait.c (100%) rename sysdeps/sparc/sparc64/{nptl => }/cpu_relax.S (100%) delete mode 100644 sysdeps/sparc/sparc64/nptl/Makefile rename sysdeps/sparc/sparc64/{nptl => }/pthread_spin_init.c (100%) rename sysdeps/sparc/sparc64/{nptl => }/pthread_spin_lock.S (100%) rename sysdeps/sparc/sparc64/{nptl => }/pthread_spin_trylock.S (100%) rename sysdeps/sparc/sparc64/{nptl => }/pthread_spin_unlock.S (100%) rename sysdeps/sparc/sparc64/{nptl => }/pthreaddef.h (100%) diff --git a/ChangeLog b/ChangeLog index 1f7da98..94a1f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,64 @@ 2014-06-25 Roland McGrath + * 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 similarity index 100% rename from sysdeps/sparc/sparc32/nptl/lowlevellock.c rename to sysdeps/sparc/sparc32/lowlevellock.c diff --git a/sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/pthread_barrier_wait.c similarity index 100% rename from sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c rename to 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 similarity index 100% rename from sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S rename to 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 similarity index 100% rename from sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S rename to sysdeps/sparc/sparc32/pthread_spin_trylock.S diff --git a/sysdeps/sparc/sparc32/nptl/pthreaddef.h b/sysdeps/sparc/sparc32/pthreaddef.h similarity index 100% rename from sysdeps/sparc/sparc32/nptl/pthreaddef.h rename to sysdeps/sparc/sparc32/pthreaddef.h diff --git a/sysdeps/sparc/sparc32/nptl/sem_post.c b/sysdeps/sparc/sparc32/sem_post.c similarity index 100% rename from sysdeps/sparc/sparc32/nptl/sem_post.c rename to sysdeps/sparc/sparc32/sem_post.c diff --git a/sysdeps/sparc/sparc32/nptl/sem_timedwait.c b/sysdeps/sparc/sparc32/sem_timedwait.c similarity index 100% rename from sysdeps/sparc/sparc32/nptl/sem_timedwait.c rename to sysdeps/sparc/sparc32/sem_timedwait.c diff --git a/sysdeps/sparc/sparc32/nptl/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c similarity index 100% rename from sysdeps/sparc/sparc32/nptl/sem_trywait.c rename to sysdeps/sparc/sparc32/sem_trywait.c diff --git a/sysdeps/sparc/sparc32/nptl/sem_wait.c b/sysdeps/sparc/sparc32/sem_wait.c similarity index 100% rename from sysdeps/sparc/sparc32/nptl/sem_wait.c rename to 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 0000000..41a5e72 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/cpu_relax.S @@ -0,0 +1 @@ +#include 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 fa88647..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S +++ /dev/null @@ -1 +0,0 @@ -#include 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 c8edcb0..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c +++ /dev/null @@ -1 +0,0 @@ -#include 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 f2b898d..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S +++ /dev/null @@ -1 +0,0 @@ -#include 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 b324906..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S +++ /dev/null @@ -1 +0,0 @@ -#include 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 8c56ebe..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/sparcv9/pthread_barrier_wait.c similarity index 100% rename from sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c rename to 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 0000000..1eede86 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c @@ -0,0 +1 @@ +#include 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 0000000..ce53dfa --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S @@ -0,0 +1 @@ +#include 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 0000000..ffd632d --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S @@ -0,0 +1 @@ +#include 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 0000000..983c803 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c b/sysdeps/sparc/sparc32/sparcv9/sem_post.c similarity index 100% rename from sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c rename to 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 similarity index 100% rename from sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c rename to 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 similarity index 100% rename from sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c rename to 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 similarity index 100% rename from sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c rename to sysdeps/sparc/sparc32/sparcv9/sem_wait.c diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile index fb161ea..dd3023d 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 similarity index 100% rename from sysdeps/sparc/sparc64/nptl/cpu_relax.S rename to 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 ddc9038..0000000 --- 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 similarity index 100% rename from sysdeps/sparc/sparc64/nptl/pthread_spin_init.c rename to 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 similarity index 100% rename from sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S rename to 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 similarity index 100% rename from sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S rename to 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 similarity index 100% rename from sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S rename to sysdeps/sparc/sparc64/pthread_spin_unlock.S diff --git a/sysdeps/sparc/sparc64/nptl/pthreaddef.h b/sysdeps/sparc/sparc64/pthreaddef.h similarity index 100% rename from sysdeps/sparc/sparc64/nptl/pthreaddef.h rename to sysdeps/sparc/sparc64/pthreaddef.h -- 2.7.4