From 814b0901f460a246315bfa7933a661f415bdc7fa Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 22 Apr 2011 01:08:06 +0200 Subject: enable the common code for NPTL the generic open, close, waitpid, read, write are good for NPTL too no good reason to have the same sleep in both libc and libpthread (NPTL) no good reason to add sigwaitinfo, sigtimedwait and sigwait to libpthread (NPTL) Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- .../sysdeps/unix/sysv/linux/Makefile.commonarch | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'libpthread/nptl') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch index 3034de1a5..477fb1a32 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.commonarch @@ -62,22 +62,24 @@ libpthread_linux_CSRC += pthread_attr_getaffinity.c pthread_attr_setaffinity.c \ pthread_getcpuclockid.c pthread_kill.c \ pthread_mutex_cond_lock.c pthread_yield.c \ sem_post.c sem_timedwait.c sem_trywait.c sem_wait.c \ - pt-fork.c pt-sleep.c pthread_sigqueue.c pt-tempname.c \ - sigtimedwait.c sigwaitinfo.c sigwait.c \ + pt-tempname.c \ + pthread_sigqueue.c \ lowlevellock.c lowlevelrobustlock.c +# pt-sleep.c pt-fork.c sigtimedwait.c sigwaitinfo.c sigwait.c libpthread_linux_SSRC := #ptw-close.S ptw-open.S ptw-waitid.S ptw-waidpid.S ptw-write.S libc_linux_CSRC += libc_pthread_init.c libc_multiple_threads.c \ register-atfork.c unregister-atfork.c getpid.c \ - raise.c sleep.c jmp-unwind.c libc-lowlevellock.c + raise.c jmp-unwind.c libc-lowlevellock.c + #sleep.c librt_linux_CSRC += mq_notify.c timer_create.c timer_delete.c \ timer_getoverr.c timer_gettime.c timer_routines.c \ timer_settime.c # These provide both a cancellable and a not cancellable implementation -libc_linux_SSRC = close.S open.S write.S read.S waitpid.S +libc_linux_SSRC = #close.S open.S write.S read.S waitpid.S libc_linux_SSRC := $(filter-out $(libc_linux_arch_SSRC-OMIT),$(libc_linux_SSRC)) libpthread_linux_CSRC := $(filter-out $(notdir $(libpthread_linux_arch_OBJS:.o=.c)),$(libpthread_linux_CSRC)) @@ -144,11 +146,11 @@ CFLAGS-OMIT-sleep.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-OMIT-jmp-unwind.c = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-OMIT-libc-lowlevellock.c = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-close.S = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-open.S = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-read.S = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-write.S = -DNOT_IN_libc -DIS_IN_libpthread -CFLAGS-OMIT-waitpid.S = -DNOT_IN_libc -DIS_IN_libpthread +#CFLAGS-OMIT-close.S = -DNOT_IN_libc -DIS_IN_libpthread +#CFLAGS-OMIT-open.S = -DNOT_IN_libc -DIS_IN_libpthread +#CFLAGS-OMIT-read.S = -DNOT_IN_libc -DIS_IN_libpthread +#CFLAGS-OMIT-write.S = -DNOT_IN_libc -DIS_IN_libpthread +#CFLAGS-OMIT-waitpid.S = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-OMIT-mq_notify.c = -DIS_IN_libpthread CFLAGS-OMIT-timer_create.c = -DIS_IN_libpthread @@ -158,11 +160,11 @@ CFLAGS-OMIT-timer_gettime.c = -DIS_IN_libpthread CFLAGS-OMIT-timer_routines.c = -DIS_IN_libpthread CFLAGS-OMIT-timer_settime.c = -DIS_IN_libpthread -ASFLAGS-open.S = -D_LIBC_REENTRANT -ASFLAGS-close.S = -D_LIBC_REENTRANT -ASFLAGS-read.S = -D_LIBC_REENTRANT -ASFLAGS-write.S = -D_LIBC_REENTRANT -ASFLAGS-waitpid.S = -D_LIBC_REENTRANT +#ASFLAGS-open.S = -D_LIBC_REENTRANT +#ASFLAGS-close.S = -D_LIBC_REENTRANT +#ASFLAGS-read.S = -D_LIBC_REENTRANT +#ASFLAGS-write.S = -D_LIBC_REENTRANT +#ASFLAGS-waitpid.S = -D_LIBC_REENTRANT # # Create header files. -- cgit v1.2.3