From 4b88139b6f22b70048793725a6c3f67bddc7baee Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 20 Jun 2014 17:13:47 -0700 Subject: [PATCH] Move remaining SPARC code out of nptl/. --- ChangeLog | 95 +++++++++++++++++++ nptl/sysdeps/unix/sysv/linux/sparc/Makefile | 2 - nptl/sysdeps/unix/sysv/linux/sparc/Versions | 6 -- .../sysv/linux/sparc/sparc32/sparcv9/Makefile | 1 - .../linux/sparc/sparc32/sparcv9/cpu_relax.S | 1 - .../sparc32/sparcv9/pthread_barrier_wait.c | 1 - .../linux/sparc/sparc32/sparcv9/sem_post.c | 1 - .../sparc/sparc32/sparcv9/sem_timedwait.c | 1 - .../linux/sparc/sparc32/sparcv9/sem_trywait.c | 1 - .../linux/sparc/sparc32/sparcv9/sem_wait.c | 1 - .../unix/sysv/linux/sparc/sparc64/Makefile | 6 -- .../unix/sysv/linux/sparc/sparc64/Versions | 7 -- .../sparc/nptl}/internaltypes.h | 3 +- .../sparc/nptl}/pthread_barrier_destroy.c | 0 .../sparc/nptl}/pthread_barrier_init.c | 0 .../sparc/nptl}/pthread_barrier_wait.c | 0 .../sparc => sysdeps/sparc/nptl}/sem_init.c | 0 .../sparc => sysdeps/sparc/nptl}/sem_post.c | 0 .../sparc/nptl}/sem_timedwait.c | 0 .../sparc => sysdeps/sparc/nptl}/sem_wait.c | 0 .../sparc/sparc32/nptl}/lowlevellock.c | 0 .../sparc32/nptl}/pthread_barrier_wait.c | 0 .../sparc/sparc32/nptl}/sem_post.c | 0 .../sparc/sparc32/nptl}/sem_timedwait.c | 0 .../sparc/sparc32/nptl}/sem_trywait.c | 0 .../sparc/sparc32/nptl}/sem_wait.c | 0 sysdeps/sparc/sparc32/sparcv9/Makefile | 4 + .../sparc/sparc32/sparcv9/nptl/cpu_relax.S | 1 + .../sparcv9/nptl/pthread_barrier_wait.c | 1 + sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c | 1 + .../sparc32/sparcv9/nptl/sem_timedwait.c | 1 + .../sparc/sparc32/sparcv9/nptl/sem_trywait.c | 1 + sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c | 1 + .../sparc/sparc64/nptl}/cpu_relax.S | 0 sysdeps/unix/sysv/linux/sparc/Makefile | 5 + sysdeps/unix/sysv/linux/sparc/Versions | 8 ++ .../unix/sysv/linux/sparc/aio_cancel.c | 0 .../unix/sysv/linux/sparc/lowlevellock.h | 0 .../sysv/linux/sparc/sparc32/sysdep-cancel.h | 0 .../unix/sysv/linux/sparc/sparc64/Makefile | 5 + .../unix/sysv/linux/sparc/sparc64/Versions | 8 ++ .../sysv/linux/sparc/sparc64/sysdep-cancel.h | 0 .../sysv/linux/sparc/sparc64/timer_create.c | 0 .../sysv/linux/sparc/sparc64/timer_delete.c | 0 .../sysv/linux/sparc/sparc64/timer_getoverr.c | 0 .../sysv/linux/sparc/sparc64/timer_gettime.c | 0 .../sysv/linux/sparc/sparc64/timer_settime.c | 0 47 files changed, 133 insertions(+), 29 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/Makefile delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/Versions delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/Makefile delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/cpu_relax.S delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_post.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_timedwait.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_trywait.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_wait.c delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile delete mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Versions rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/internaltypes.h (94%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/pthread_barrier_destroy.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/pthread_barrier_init.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/pthread_barrier_wait.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/sem_init.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/sem_post.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/sem_timedwait.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc => sysdeps/sparc/nptl}/sem_wait.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/lowlevellock.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/pthread_barrier_wait.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/sem_post.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/sem_timedwait.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/sem_trywait.c (100%) rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc32 => sysdeps/sparc/sparc32/nptl}/sem_wait.c (100%) create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c rename {nptl/sysdeps/unix/sysv/linux/sparc/sparc64 => sysdeps/sparc/sparc64/nptl}/cpu_relax.S (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/aio_cancel.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/lowlevellock.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/timer_create.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/timer_delete.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/timer_getoverr.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/timer_gettime.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/sparc/sparc64/timer_settime.c (100%) diff --git a/ChangeLog b/ChangeLog index 8cbe2ffa16..99e68955fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,98 @@ +2014-06-20 Roland McGrath + + * sysdeps/unix/sysv/linux/sparc/Makefile [$(subdir) = nptl] + (libpthread-routines): Add sysdep. + * nptl/sysdeps/unix/sysv/linux/sparc/Makefile: File removed. + * sysdeps/unix/sysv/linux/sparc/Versions + (libpthread: GLIBC_2.3.3): New version set. + * nptl/sysdeps/unix/sysv/linux/sparc/Versions: File removed. + * nptl/sysdeps/unix/sysv/linux/sparc/aio_cancel.c: Moved ... + * sysdeps/unix/sysv/linux/sparc/aio_cancel.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/internaltypes.h: Moved ... + * sysdeps/sparc/nptl/internaltypes.h: ... here. Use #include_next. + * nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_destroy.c: + Moved ... + * sysdeps/sparc/nptl/pthread_barrier_destroy.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c: Moved ... + * sysdeps/sparc/nptl/pthread_barrier_init.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c: Moved ... + * sysdeps/sparc/nptl/pthread_barrier_wait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c: Moved ... + * sysdeps/sparc/nptl/sem_init.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sem_post.c: Moved ... + * sysdeps/sparc/nptl/sem_post.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c: Moved ... + * sysdeps/sparc/nptl/sem_timedwait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c: Moved ... + * sysdeps/sparc/nptl/sem_wait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Moved ... + * sysdeps/unix/sysv/linux/sparc/lowlevellock.h: ... here. + * sysdeps/sparc/sparc32/sparcv9/Makefile [$(subdir) = nptl] + (libpthread-routines): Add cpu_relax. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/Makefile: + File removed. + * sysdeps/unix/sysv/linux/sparc/sparc64/Versions + (librt: GLIBC_2.3.3): New version set. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Versions: File removed. + * sysdeps/sparc/sparc64/nptl/Makefile: New file. + * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile [$(subdir) = nptl] + (CFLAGS-pause.c, CFLAGS-sigsuspend.c): New variables. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: File removed. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c: Moved ... + * sysdeps/sparc/sparc32/nptl/lowlevellock.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pthread_barrier_wait.c: + Moved ... + * sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c: Moved ... + * sysdeps/sparc/sparc32/nptl/sem_post.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c: Moved ... + * sysdeps/sparc/sparc32/nptl/sem_timedwait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c: Moved ... + * sysdeps/sparc/sparc32/nptl/sem_trywait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c: Moved ... + * sysdeps/sparc/sparc32/nptl/sem_wait.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/cpu_relax.S: + Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S: ... here. + Update #include. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c: + Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c: ... here. + Update #include. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_post.c: + Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c: ... here. + Update #include. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_timedwait.c: + Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c: ... here. + Update #include. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_trywait.c: + Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c: ... here. + Update #include. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_wait.c: + Moved ... + * sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c: ... here. + Update #include. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S: Moved ... + * sysdeps/sparc/sparc64/nptl/cpu_relax.S: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c: Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c: Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c: + Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c: Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c: ... here. + * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c: Moved ... + * sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c: ... here. + 2014-06-20 Joseph Myers * nptl/pthread_cond_wait.c: Include . diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/Makefile b/nptl/sysdeps/unix/sysv/linux/sparc/Makefile deleted file mode 100644 index e98c9bd866..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# pull in __syscall_error routine -libpthread-routines += sysdep diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/Versions b/nptl/sysdeps/unix/sysv/linux/sparc/Versions deleted file mode 100644 index d102772482..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/Versions +++ /dev/null @@ -1,6 +0,0 @@ -libpthread { - GLIBC_2.3.3 { - # Changed PTHREAD_STACK_MIN. - pthread_attr_setstack; pthread_attr_setstacksize; - } -} diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/Makefile b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/Makefile deleted file mode 100644 index f7acc019aa..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/Makefile +++ /dev/null @@ -1 +0,0 @@ -libpthread-routines += cpu_relax diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/cpu_relax.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/cpu_relax.S deleted file mode 100644 index 4ac4d14486..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/cpu_relax.S +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c deleted file mode 100644 index 2d32e58240..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/pthread_barrier_wait.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../pthread_barrier_wait.c" diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_post.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_post.c deleted file mode 100644 index 73d7c56675..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_post.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../sem_post.c" diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_timedwait.c deleted file mode 100644 index 03945b7279..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_timedwait.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../sem_timedwait.c" diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_trywait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_trywait.c deleted file mode 100644 index aae46f725e..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_trywait.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../../sem_trywait.c" diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_wait.c deleted file mode 100644 index a5dbc5a4b8..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/sem_wait.c +++ /dev/null @@ -1 +0,0 @@ -#include "../../sem_wait.c" diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile deleted file mode 100644 index 656d2e09c5..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -libpthread-routines += cpu_relax - -ifeq ($(subdir),nptl) -CFLAGS-pause.c += -fexceptions -CFLAGS-sigsuspend.c += -fexceptions -endif diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Versions b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Versions deleted file mode 100644 index 3b111ddb51..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/Versions +++ /dev/null @@ -1,7 +0,0 @@ -librt { - GLIBC_2.3.3 { - # Changed timer_t. - timer_create; timer_delete; timer_getoverrun; timer_gettime; - timer_settime; - } -} diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/internaltypes.h b/sysdeps/sparc/nptl/internaltypes.h similarity index 94% rename from nptl/sysdeps/unix/sysv/linux/sparc/internaltypes.h rename to sysdeps/sparc/nptl/internaltypes.h index 4f400a3fe3..e5c27408d8 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/internaltypes.h +++ b/sysdeps/sparc/nptl/internaltypes.h @@ -1,5 +1,6 @@ #ifndef _INTERNALTYPES_H -#include "../internaltypes.h" + +#include_next union sparc_pthread_barrier { diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_destroy.c b/sysdeps/sparc/nptl/pthread_barrier_destroy.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_destroy.c rename to sysdeps/sparc/nptl/pthread_barrier_destroy.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c b/sysdeps/sparc/nptl/pthread_barrier_init.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c rename to sysdeps/sparc/nptl/pthread_barrier_init.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c b/sysdeps/sparc/nptl/pthread_barrier_wait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_wait.c rename to sysdeps/sparc/nptl/pthread_barrier_wait.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c b/sysdeps/sparc/nptl/sem_init.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sem_init.c rename to sysdeps/sparc/nptl/sem_init.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sem_post.c b/sysdeps/sparc/nptl/sem_post.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sem_post.c rename to sysdeps/sparc/nptl/sem_post.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c b/sysdeps/sparc/nptl/sem_timedwait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sem_timedwait.c rename to sysdeps/sparc/nptl/sem_timedwait.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c b/sysdeps/sparc/nptl/sem_wait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sem_wait.c rename to sysdeps/sparc/nptl/sem_wait.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c b/sysdeps/sparc/sparc32/nptl/lowlevellock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c rename to sysdeps/sparc/sparc32/nptl/lowlevellock.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pthread_barrier_wait.c rename to sysdeps/sparc/sparc32/nptl/pthread_barrier_wait.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c b/sysdeps/sparc/sparc32/nptl/sem_post.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c rename to sysdeps/sparc/sparc32/nptl/sem_post.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c b/sysdeps/sparc/sparc32/nptl/sem_timedwait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_timedwait.c rename to sysdeps/sparc/sparc32/nptl/sem_timedwait.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c b/sysdeps/sparc/sparc32/nptl/sem_trywait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_trywait.c rename to sysdeps/sparc/sparc32/nptl/sem_trywait.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c b/sysdeps/sparc/sparc32/nptl/sem_wait.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_wait.c rename to sysdeps/sparc/sparc32/nptl/sem_wait.c diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile index 7d475b0897..36f889ec96 100644 --- a/sysdeps/sparc/sparc32/sparcv9/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/Makefile @@ -18,3 +18,7 @@ ASFLAGS-.op += -Wa,-Av9a ASFLAGS-.og += -Wa,-Av9a ASFLAGS-.oS += -Wa,-Av9a endif + +ifeq ($(subdir), nptl) +libpthread-routines += cpu_relax +endif diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S b/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S new file mode 100644 index 0000000000..fa886470cd --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/cpu_relax.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c new file mode 100644 index 0000000000..8336f5e00c --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/pthread_barrier_wait.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c new file mode 100644 index 0000000000..3c4b940fe6 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_post.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c new file mode 100644 index 0000000000..f19b2c5487 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_timedwait.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c new file mode 100644 index 0000000000..80157c5d2a --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_trywait.c @@ -0,0 +1 @@ +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c new file mode 100644 index 0000000000..b6d8287d92 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/nptl/sem_wait.c @@ -0,0 +1 @@ +#include diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S b/sysdeps/sparc/sparc64/nptl/cpu_relax.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S rename to sysdeps/sparc/sparc64/nptl/cpu_relax.S diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile index 96b783e5bb..e67aecf8f0 100644 --- a/sysdeps/unix/sysv/linux/sparc/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/Makefile @@ -11,3 +11,8 @@ endif ifeq ($(subdir),sysvipc) sysdep_routines += getshmlba endif + +ifeq ($(subdir),nptl) +# pull in __syscall_error routine +libpthread-routines += sysdep +endif diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions index 5d31d1d14a..4dc1cd720b 100644 --- a/sysdeps/unix/sysv/linux/sparc/Versions +++ b/sysdeps/unix/sysv/linux/sparc/Versions @@ -30,6 +30,14 @@ libc { __getshmlba; } } + +libpthread { + GLIBC_2.3.3 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; pthread_attr_setstacksize; + } +} + librt { GLIBC_2.3 { # AIO functions. diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/aio_cancel.c b/sysdeps/unix/sysv/linux/sparc/aio_cancel.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/aio_cancel.c rename to sysdeps/unix/sysv/linux/sparc/aio_cancel.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h rename to sysdeps/unix/sysv/linux/sparc/lowlevellock.h diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile index 715af3df7b..7ea433f21f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile @@ -7,3 +7,8 @@ LD += -melf64_sparc ifeq ($(subdir),stdlib) sysdep_routines += __start_context endif + +ifeq ($(subdir),nptl) +CFLAGS-pause.c += -fexceptions +CFLAGS-sigsuspend.c += -fexceptions +endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions index cfcc15b119..fbea1bb2ef 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions @@ -9,3 +9,11 @@ libc { wordexp; } } + +librt { + GLIBC_2.3.3 { + # Changed timer_t. + timer_create; timer_delete; timer_getoverrun; timer_gettime; + timer_settime; + } +} diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c rename to sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c rename to sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c rename to sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c rename to sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c rename to sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c