Move remaining SPARC code out of nptl/.

This commit is contained in:
Roland McGrath 2014-06-20 17:13:47 -07:00
parent 9bc6103d04
commit 4b88139b6f
47 changed files with 133 additions and 29 deletions

View File

@ -1,3 +1,98 @@
2014-06-20 Roland McGrath <roland@hack.frob.com>
* 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 <joseph@codesourcery.com> 2014-06-20 Joseph Myers <joseph@codesourcery.com>
* nptl/pthread_cond_wait.c: Include <kernel-features.h>. * nptl/pthread_cond_wait.c: Include <kernel-features.h>.

View File

@ -1,2 +0,0 @@
# pull in __syscall_error routine
libpthread-routines += sysdep

View File

@ -1,6 +0,0 @@
libpthread {
GLIBC_2.3.3 {
# Changed PTHREAD_STACK_MIN.
pthread_attr_setstack; pthread_attr_setstacksize;
}
}

View File

@ -1 +0,0 @@
libpthread-routines += cpu_relax

View File

@ -1 +0,0 @@
#include <sparc64/cpu_relax.S>

View File

@ -1 +0,0 @@
#include "../../pthread_barrier_wait.c"

View File

@ -1 +0,0 @@
#include "../../sem_post.c"

View File

@ -1 +0,0 @@
#include "../../sem_timedwait.c"

View File

@ -1 +0,0 @@
#include "../../../sem_trywait.c"

View File

@ -1 +0,0 @@
#include "../../sem_wait.c"

View File

@ -1,6 +0,0 @@
libpthread-routines += cpu_relax
ifeq ($(subdir),nptl)
CFLAGS-pause.c += -fexceptions
CFLAGS-sigsuspend.c += -fexceptions
endif

View File

@ -1,7 +0,0 @@
librt {
GLIBC_2.3.3 {
# Changed timer_t.
timer_create; timer_delete; timer_getoverrun; timer_gettime;
timer_settime;
}
}

View File

@ -1,5 +1,6 @@
#ifndef _INTERNALTYPES_H #ifndef _INTERNALTYPES_H
#include "../internaltypes.h"
#include_next <internaltypes.h>
union sparc_pthread_barrier union sparc_pthread_barrier
{ {

View File

@ -18,3 +18,7 @@ ASFLAGS-.op += -Wa,-Av9a
ASFLAGS-.og += -Wa,-Av9a ASFLAGS-.og += -Wa,-Av9a
ASFLAGS-.oS += -Wa,-Av9a ASFLAGS-.oS += -Wa,-Av9a
endif endif
ifeq ($(subdir), nptl)
libpthread-routines += cpu_relax
endif

View File

@ -0,0 +1 @@
#include <sysdeps/sparc/sparc64/nptl/cpu_relax.S>

View File

@ -0,0 +1 @@
#include <sysdeps/sparc/nptl/pthread_barrier_wait.c>

View File

@ -0,0 +1 @@
#include <sysdeps/sparc/nptl/sem_post.c>

View File

@ -0,0 +1 @@
#include <sysdeps/sparc/nptl/sem_timedwait.c>

View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/sem_trywait.c>

View File

@ -0,0 +1 @@
#include <sysdeps/sparc/nptl/sem_wait.c>

View File

@ -11,3 +11,8 @@ endif
ifeq ($(subdir),sysvipc) ifeq ($(subdir),sysvipc)
sysdep_routines += getshmlba sysdep_routines += getshmlba
endif endif
ifeq ($(subdir),nptl)
# pull in __syscall_error routine
libpthread-routines += sysdep
endif

View File

@ -30,6 +30,14 @@ libc {
__getshmlba; __getshmlba;
} }
} }
libpthread {
GLIBC_2.3.3 {
# Changed PTHREAD_STACK_MIN.
pthread_attr_setstack; pthread_attr_setstacksize;
}
}
librt { librt {
GLIBC_2.3 { GLIBC_2.3 {
# AIO functions. # AIO functions.

View File

@ -7,3 +7,8 @@ LD += -melf64_sparc
ifeq ($(subdir),stdlib) ifeq ($(subdir),stdlib)
sysdep_routines += __start_context sysdep_routines += __start_context
endif endif
ifeq ($(subdir),nptl)
CFLAGS-pause.c += -fexceptions
CFLAGS-sigsuspend.c += -fexceptions
endif

View File

@ -9,3 +9,11 @@ libc {
wordexp; wordexp;
} }
} }
librt {
GLIBC_2.3.3 {
# Changed timer_t.
timer_create; timer_delete; timer_getoverrun; timer_gettime;
timer_settime;
}
}