From c7a8d667878a25bad5d7ab41fbbb603e535da661 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 21 May 2014 16:08:06 -0500 Subject: [PATCH] PowerPC: Move remaining nptl/sysdeps/unix/sysv/linux/powerpc/ files. --- ChangeLog | 33 +++++++++++++++++++ nptl/sysdeps/unix/sysv/linux/powerpc/Makefile | 2 -- nptl/sysdeps/unix/sysv/linux/powerpc/Versions | 9 ----- sysdeps/unix/sysv/linux/powerpc/Makefile | 4 +++ .../unix/sysv/linux/powerpc/bits/local_lim.h | 0 .../unix/sysv/linux/powerpc/createthread.c | 0 .../unix/sysv/linux/powerpc/lowlevellock.h | 0 .../sysv/linux/powerpc/powerpc32/Versions | 10 ++++++ .../linux/powerpc/powerpc32/sysdep-cancel.h | 0 .../sysv/linux/powerpc/powerpc64/Versions | 10 ++++++ .../linux/powerpc/powerpc64/sysdep-cancel.h | 0 .../unix/sysv/linux/powerpc/pt-longjmp.c | 0 .../linux/powerpc/pthread_attr_setstack.c | 0 .../linux/powerpc/pthread_attr_setstacksize.c | 0 .../sysv/linux/powerpc/pthread_spin_unlock.c | 0 .../unix/sysv/linux/powerpc/sem_post.c | 0 16 files changed, 57 insertions(+), 11 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/Makefile delete mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/Versions rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/bits/local_lim.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/createthread.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/lowlevellock.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/pt-longjmp.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/pthread_attr_setstack.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/pthread_spin_unlock.c (100%) rename {nptl/sysdeps => sysdeps}/unix/sysv/linux/powerpc/sem_post.c (100%) diff --git a/ChangeLog b/ChangeLog index 82d5fa81fe..683fa85ff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,38 @@ 2014-05-26 Adhemerval Zanella + * nptl/sysdeps/unix/sysv/linux/powerpc/Versions: Remove, merge into + ... + * sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions: ... here. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions: Likewise. + * nptl/sysdeps/unix/sysv/linux/powerpc/Makefile: Moved rules to ... + * sysdeps/unix/sysv/linux/powerpc/Makefile: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h: Moved ... + * sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Moved ... + * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: ...here. + * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: + Moved ... + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: + Moved ... + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/createthread.c: Moved ... + * sysdeps/unix/sysv/linux/powerpc/createthread.c: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: Moved ... + * sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstack.c: Moved + ... + * sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstack.c: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c: + Moved ... + * sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c: ... + here. + * nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c: Moved + ... + * sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c: Moved ... + * sysdeps/unix/sysv/linux/powerpc/sem_post.c: ... here. + * nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Moved ... * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: ... here. * nptl/sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: Moved ... diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile b/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile deleted file mode 100644 index e98c9bd866..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# pull in __syscall_error routine -libpthread-routines += sysdep diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/Versions b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions deleted file mode 100644 index 6b5a0362da..0000000000 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/Versions +++ /dev/null @@ -1,9 +0,0 @@ -libpthread { - GLIBC_2.3.4 { - longjmp; siglongjmp; - } - GLIBC_2.6 { - # Changed PTHREAD_STACK_MIN. - pthread_attr_setstack; pthread_attr_setstacksize; - } -} diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile index 395342f150..28f7165815 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Makefile +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -31,3 +31,7 @@ sysdep_headers += bits/ppc.h sysdep_routines += get_timebase_freq tests += test-gettimebasefreq endif + +ifeq ($(subdir),nptl) +libpthread-routines += sysdep +endif diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h b/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h rename to sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/createthread.c b/sysdeps/unix/sysv/linux/powerpc/createthread.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/createthread.c rename to sysdeps/unix/sysv/linux/powerpc/createthread.c diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h rename to sysdeps/unix/sysv/linux/powerpc/lowlevellock.h diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions index 8d1c3a59de..e13d20b93b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions @@ -34,3 +34,13 @@ libc { __ppc_get_timebase_freq; } } + +libpthread { + GLIBC_2.3.4 { + longjmp; siglongjmp; + } + GLIBC_2.6 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; pthread_attr_setstacksize; + } +} diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions index 569e79a5de..a8e88b89db 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions @@ -31,3 +31,13 @@ librt { timer_settime; } } + +libpthread { + GLIBC_2.3.4 { + longjmp; siglongjmp; + } + GLIBC_2.6 { + # Changed PTHREAD_STACK_MIN. + pthread_attr_setstack; pthread_attr_setstacksize; + } +} diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c b/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c rename to sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstack.c b/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstack.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstack.c rename to sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstack.c diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c b/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c rename to sysdeps/unix/sysv/linux/powerpc/pthread_attr_setstacksize.c diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c b/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c rename to sysdeps/unix/sysv/linux/powerpc/pthread_spin_unlock.c diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/sysdeps/unix/sysv/linux/powerpc/sem_post.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c rename to sysdeps/unix/sysv/linux/powerpc/sem_post.c -- 2.43.5