diff options
| author | Roman I Khimov <khimov@altell.ru> | 2010-04-30 18:18:31 +0400 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-05-03 13:35:31 -0700 |
| commit | bb1a6cbd0ef6965e7a3eb65a4d8284c38be2fc19 (patch) | |
| tree | 1b289f3df3adda6532cfe76f34e07311fa3e108e /libpthread/nptl/Makefile.in | |
| parent | 57d82892913019352bf8e35c5a3e9965e1df0e6b (diff) | |
nptl: use arch-specific cancellation routines for x86_64
They were present in sources, but not compiled in. Generic routines are
broken badly on x86_64, even basic threading test like pthread/ex1 didn't
work with them.
Signed-off-by: Roman I Khimov <khimov@altell.ru>
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/nptl/Makefile.in')
| -rw-r--r-- | libpthread/nptl/Makefile.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index 9d3e393c0..c229673c5 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -103,6 +103,10 @@ libpthread-routines = init vars events version \ libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind +ifeq ($(TARGET_ARCH),x86_64) +libpthread-routines := $(filter-out cancellation,$(libpthread-routines)) +endif + CFLAGS-pthread_atfork.c = -DNOT_IN_libc # Since cancellation handling is in large parts handled using exceptions @@ -245,10 +249,16 @@ libpthread_so_SRC = $(patsubst %, $(PTHREAD_DIR)/%.c, \ $(filter-out $(libpthread-os-routines) \ $(libpthread-misc-routines), $(libpthread-routines))) +ifeq ($(TARGET_ARCH),x86_64) +libc-static-y += $(patsubst %.c, $(PTHREAD_OUT)/%.o, alloca_cutoff.c) +libc-shared-y += $(patsubst %.c, $(PTHREAD_OUT)/%.oS, forward.c) +else libc-static-y += $(patsubst %.c, $(PTHREAD_OUT)/%.o, alloca_cutoff.c \ libc-cancellation.c) libc-shared-y += $(patsubst %.c, $(PTHREAD_OUT)/%.oS, forward.c \ libc-cancellation.c) +endif + libpthread-nonshared-y += $(patsubst %,$(PTHREAD_OUT)/%.oS,$(libpthread_static_SRC)) |