From 11eac1b1e79bf9d398fa19ac5fac6a188ee710e5 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Fri, 22 Apr 2011 15:06:18 -0700 Subject: [PATCH 334/396] nptl: remove sigaction, sigprocmask, and sigfillset from libpthread Having them defined in both places was causing errors with static linking Signed-off-by: Austin Foxley --- libpthread/nptl/sysdeps/pthread/Makefile.in | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in index 79765e9..0832180 100644 --- a/libpthread/nptl/sysdeps/pthread/Makefile.in +++ b/libpthread/nptl/sysdeps/pthread/Makefile.in @@ -33,17 +33,12 @@ libpthread_pthread_CSRC = \ pthread_spin_init.c \ pthread_spin_unlock.c \ pt-longjmp.c \ - pt-sigaction.c \ - pt-sigfillset.c \ - pt-sigprocmask.c \ tpp.c CFLAGS-pthread = $(SSP_ALL_CFLAGS) -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pthread_barrier_wait.c = -D_GNU_SOURCE CFLAGS-pthread_spin_destroy.c = -D_GNU_SOURCE CFLAGS-pthread_spin_init.c = -D_GNU_SOURCE CFLAGS-pthread_spin_unlock.c = -D_GNU_SOURCE -CFLAGS-pt-sigfillset.c = -I$(top_srcdir)libc/signal -CFLAGS-pt-sigprocmask.c = -I$(top_srcdir)libc/sysdeps/linux/common CFLAGS-unwind-forcedunwind.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-OMIT-librt-cancellation.c = -DIS_IN_libpthread @@ -53,8 +48,7 @@ CFLAGS-librt-cancellation.c = -DIS_IN_librt \ CFLAGS-rt-unwind-resume.c = -DIS_IN_librt \ -fexceptions -fasynchronous-unwind-tables -libpthread-so-y += $(patsubst %,$(libpthread_pthread_OUT)/%.oS, \ - pt-sigaction pt-sigprocmask unwind-forcedunwind) +libpthread-so-y += $(patsubst %,$(libpthread_pthread_OUT)/%.oS, unwind-forcedunwind) librt-pt-routines-y = librt-cancellation.c librt-pt-shared-only-routines-y = rt-unwind-resume.c @@ -104,6 +98,7 @@ $(libpthread_pthread_OUT)/pt-crtn.S: $(libpthread_pthread_OUT)/pt-initfini.s $(l -e '/@TRAILER_BEGINS/,$$p' $< > $@.tmp $(Q)mv $@.tmp $@ endif +<<<<<<< HEAD # It would have been easier to just add dummy files that include the real # impl, but ok. # Special rules needed since we do objdir->objdir compilation for these 3. @@ -119,11 +114,17 @@ ifeq ($(DOPIC),y) $(patsubst %,$(libpthread_pthread_OUT)/pt-%.os,$(pthread-lc-fwd)): $(libpthread_pthread_OUT)/pt-%.os: $(libpthread_pthread_OUT)/pt-%.c $(compile.c) endif +======= +>>>>>>> nptl: remove sigaction, sigprocmask, and sigfillset from libpthread objclean-y += CLEAN_libpthread/nptl/sysdeps/pthread CLEAN_libpthread/nptl/sysdeps/pthread: $(do_rm) $(addprefix $(libpthread_pthread_OUT)/*., o os oS s S) \ +<<<<<<< HEAD $(libpthread_pthread_OUT)/defs.h \ $(addprefix $(libpthread_pthread_DIR)/, \ pt-sigfillset.c pt-sigprocmask.c) +======= + $(libpthread_pthread_OUT)/defs.h +>>>>>>> nptl: remove sigaction, sigprocmask, and sigfillset from libpthread -- 1.7.0.4