From e26822463f4c36746a25b9b25552c43c350862b8 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 12 Jun 2014 14:33:59 -0700 Subject: [PATCH] Move SPARC code out of nptl/sysdeps/sparc/. --- ChangeLog | 35 ++++++++++++++++++++++ .../sparc/sparc32/sparcv9/pthread_spin_init.c | 1 - .../sparc/sparc32/sparcv9/pthread_spin_lock.S | 1 - .../sparc/sparc32/sparcv9/pthread_spin_trylock.S | 1 - .../sparc/sparc32/sparcv9/pthread_spin_unlock.S | 1 - .../sysdeps/sparc => sysdeps/sparc/nptl}/Makefile | 0 .../sparc => sysdeps/sparc/nptl}/tcb-offsets.sym | 0 {nptl/sysdeps/sparc => sysdeps/sparc/nptl}/tls.h | 0 .../sparc/sparc32/nptl}/pthread_spin_lock.S | 0 .../sparc/sparc32/nptl}/pthread_spin_trylock.S | 0 .../sparc/sparc32/nptl}/pthreaddef.h | 0 .../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 + .../sparc/sparc64/nptl}/pthread_spin_init.c | 0 .../sparc/sparc64/nptl}/pthread_spin_lock.S | 0 .../sparc/sparc64/nptl}/pthread_spin_trylock.S | 0 .../sparc/sparc64/nptl}/pthread_spin_unlock.S | 0 .../sparc/sparc64/nptl}/pthreaddef.h | 0 20 files changed, 39 insertions(+), 4 deletions(-) delete mode 100644 nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c delete mode 100644 nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S delete mode 100644 nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S delete mode 100644 nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S rename {nptl/sysdeps/sparc => sysdeps/sparc/nptl}/Makefile (100%) rename {nptl/sysdeps/sparc => sysdeps/sparc/nptl}/tcb-offsets.sym (100%) rename {nptl/sysdeps/sparc => sysdeps/sparc/nptl}/tls.h (100%) rename {nptl/sysdeps/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/pthread_spin_lock.S (100%) rename {nptl/sysdeps/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/pthread_spin_trylock.S (100%) rename {nptl/sysdeps/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/pthreaddef.h (100%) create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S rename {nptl/sysdeps/sparc/sparc64 => sysdeps/sparc/sparc64/nptl}/pthread_spin_init.c (100%) rename {nptl/sysdeps/sparc/sparc64 => sysdeps/sparc/sparc64/nptl}/pthread_spin_lock.S (100%) rename {nptl/sysdeps/sparc/sparc64 => sysdeps/sparc/sparc64/nptl}/pthread_spin_trylock.S (100%) rename {nptl/sysdeps/sparc/sparc64 => sysdeps/sparc/sparc64/nptl}/pthread_spin_unlock.S (100%) rename {nptl/sysdeps/sparc/sparc64 => sysdeps/sparc/sparc64/nptl}/pthreaddef.h (100%) diff --git a/ChangeLog b/ChangeLog index c1e5241..4e0e179 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,40 @@ 2014-06-12 Roland McGrath + * nptl/sysdeps/sparc/Makefile: Moved ... + * sysdeps/sparc/nptl/Makefile: ... here. + * nptl/sysdeps/sparc/tcb-offsets.sym: Moved ... + * sysdeps/sparc/nptl/tcb-offsets.sym: ... here. + * nptl/sysdeps/sparc/tls.h: Moved ... + * sysdeps/sparc/nptl/tls.h: ... here. + * nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S: Moved ... + * sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S: ... here. + * nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S: Moved ... + * sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S: ... here. + * nptl/sysdeps/sparc/sparc32/pthreaddef.h: Moved ... + * sysdeps/sparc/sparc32/nptl/pthreaddef.h: ... here. + * nptl/sysdeps/sparc/sparc64/pthread_spin_init.c: Moved ... + * sysdeps/sparc/sparc64/nptl/pthread_spin_init.c: ... here. + * nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S: Moved ... + * sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S: ... here. + * nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S: Moved ... + * sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S: ... here. + * nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S: Moved ... + * sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S: ... here. + * nptl/sysdeps/sparc/sparc64/pthreaddef.h: Moved ... + * sysdeps/sparc/sparc64/nptl/pthreaddef.h: ... here. + * nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c: Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c: ... here. + Update #include. + * nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S: Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S: ... here. + Update #include. + * nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S: Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S: ... here. + Update #include. + * nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S: Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S: ... here. + Update #include. + * nptl/sysdeps/sparc/tls.h (TLS_DEFINE_INIT_TP): New macro. * sysdeps/unix/sysv/linux/sparc/arch-fork.h: New file. diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c deleted file mode 100644 index d27e550..0000000 --- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_init.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S deleted file mode 100644 index d33b375..0000000 --- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_lock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S deleted file mode 100644 index af5b151..0000000 --- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_trylock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S b/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S deleted file mode 100644 index c40d80f..0000000 --- a/nptl/sysdeps/sparc/sparc32/sparcv9/pthread_spin_unlock.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/sparc/Makefile b/sysdeps/sparc/nptl/Makefile similarity index 100% rename from nptl/sysdeps/sparc/Makefile rename to sysdeps/sparc/nptl/Makefile diff --git a/nptl/sysdeps/sparc/tcb-offsets.sym b/sysdeps/sparc/nptl/tcb-offsets.sym similarity index 100% rename from nptl/sysdeps/sparc/tcb-offsets.sym rename to sysdeps/sparc/nptl/tcb-offsets.sym diff --git a/nptl/sysdeps/sparc/tls.h b/sysdeps/sparc/nptl/tls.h similarity index 100% rename from nptl/sysdeps/sparc/tls.h rename to sysdeps/sparc/nptl/tls.h diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S b/sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S similarity index 100% rename from nptl/sysdeps/sparc/sparc32/pthread_spin_lock.S rename to sysdeps/sparc/sparc32/nptl/pthread_spin_lock.S diff --git a/nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S similarity index 100% rename from nptl/sysdeps/sparc/sparc32/pthread_spin_trylock.S rename to sysdeps/sparc/sparc32/nptl/pthread_spin_trylock.S diff --git a/nptl/sysdeps/sparc/sparc32/pthreaddef.h b/sysdeps/sparc/sparc32/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/sparc/sparc32/pthreaddef.h rename to sysdeps/sparc/sparc32/nptl/pthreaddef.h diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c new file mode 100644 index 0000000..c8edcb0 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_init.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S new file mode 100644 index 0000000..f2b898d --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_lock.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S new file mode 100644 index 0000000..b324906 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_trylock.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S new file mode 100644 index 0000000..8c56ebe --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_spin_unlock.S @@ -0,0 +1 @@ +#include diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_init.c b/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c similarity index 100% rename from nptl/sysdeps/sparc/sparc64/pthread_spin_init.c rename to sysdeps/sparc/sparc64/nptl/pthread_spin_init.c diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S b/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S similarity index 100% rename from nptl/sysdeps/sparc/sparc64/pthread_spin_lock.S rename to sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S b/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S similarity index 100% rename from nptl/sysdeps/sparc/sparc64/pthread_spin_trylock.S rename to sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S diff --git a/nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S b/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S similarity index 100% rename from nptl/sysdeps/sparc/sparc64/pthread_spin_unlock.S rename to sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S diff --git a/nptl/sysdeps/sparc/sparc64/pthreaddef.h b/sysdeps/sparc/sparc64/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/sparc/sparc64/pthreaddef.h rename to sysdeps/sparc/sparc64/nptl/pthreaddef.h -- 2.7.4