Move remaining S390 code out of nptl/.

This commit is contained in:
Roland McGrath 2014-06-26 09:31:11 -07:00
parent 39507e4a6c
commit 52ae23b4bf
29 changed files with 81 additions and 22 deletions

View File

@ -1,5 +1,59 @@
2014-06-26 Roland McGrath <roland@hack.frob.com>
* nptl/sysdeps/unix/sysv/linux/s390/Makefile: File removed, contents
folded into ...
* sysdeps/unix/sysv/linux/s390/Makefile [$(subdir) = nptl]: ... here.
* sysdeps/unix/sysv/linux/s390/Versions
(libpthread: GLIBC_2.19): New version set.
* nptl/sysdeps/unix/sysv/linux/s390/Versions: File removed.
* sysdeps/unix/sysv/linux/s390/s390-64/Versions
(librt: GLIBC_2.3.3): New version set.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/Versions: File removed.
* nptl/sysdeps/unix/sysv/linux/s390/elision-conf.c: Moved ...
* sysdeps/unix/sysv/linux/s390/elision-conf.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/elision-conf.h: Moved ...
* sysdeps/unix/sysv/linux/s390/elision-conf.h: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/elision-lock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/elision-lock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/elision-timed.c: Moved ...
* sysdeps/unix/sysv/linux/s390/elision-timed.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/elision-trylock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/elision-trylock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/elision-unlock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/elision-unlock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/force-elision.h: Moved ...
* sysdeps/unix/sysv/linux/s390/force-elision.h: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Moved ...
* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h: Moved ...
* sysdeps/unix/sysv/linux/s390/lowlevellock.h: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Moved ...
* sysdeps/unix/sysv/linux/s390/pt-longjmp.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/pthread_mutex_cond_lock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/pthread_mutex_lock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/pthread_mutex_timedlock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: Moved ...
* sysdeps/unix/sysv/linux/s390/pthread_mutex_trylock.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/pthread_once.c: Moved ...
* sysdeps/unix/sysv/linux/s390/pthread_once.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-64/timer_create.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-64/timer_delete.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-64/timer_gettime.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-64/timer_settime.c: ... here.
* nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Moved ...
* sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: ... here.
(__libc_vfork): Define the function under this name.

View File

@ -1,10 +0,0 @@
ifeq ($(enable-lock-elision),yes)
libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
elision-trylock
elision-CFLAGS = -mhtm
CFLAGS-elision-lock.c = $(elision-CFLAGS)
CFLAGS-elision-timed.c = $(elision-CFLAGS)
CFLAGS-elision-trylock.c = $(elision-CFLAGS)
CFLAGS-elision-unlock.c = $(elision-CFLAGS)
endif

View File

@ -1,5 +0,0 @@
libpthread {
GLIBC_2.19 {
longjmp; siglongjmp;
}
}

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

@ -22,3 +22,16 @@ ifeq (yes,$(build-shared))
sysdep_routines += v1-longjmp_chk
endif
endif
ifeq ($(subdir),nptl)
ifeq ($(enable-lock-elision),yes)
libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \
elision-trylock
elision-CFLAGS = -mhtm
CFLAGS-elision-lock.c = $(elision-CFLAGS)
CFLAGS-elision-timed.c = $(elision-CFLAGS)
CFLAGS-elision-trylock.c = $(elision-CFLAGS)
CFLAGS-elision-unlock.c = $(elision-CFLAGS)
endif
endif

View File

@ -8,3 +8,9 @@ libc {
__vdso_clock_getres;
}
}
libpthread {
GLIBC_2.19 {
longjmp; siglongjmp;
}
}

View File

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