From 29962e14a1144ec4f9cfac8ab8a51af2b5692317 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sun, 29 Jan 2012 15:21:38 +0100 Subject: nptl_db: handle SUSv4-OB pthread_getconcurrency / pthread_setconcurrency is OBSOLETE in SUSv4 so disable pthread debug support too Signed-off-by: Bernhard Reutner-Fischer --- libpthread/nptl/sysdeps/pthread/pthread.h | 2 +- libpthread/nptl_db/Makefile.in | 3 +++ libpthread/nptl_db/thread_db.h | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'libpthread') diff --git a/libpthread/nptl/sysdeps/pthread/pthread.h b/libpthread/nptl/sysdeps/pthread/pthread.h index deb74309a..98c84aeaf 100644 --- a/libpthread/nptl/sysdeps/pthread/pthread.h +++ b/libpthread/nptl/sysdeps/pthread/pthread.h @@ -430,7 +430,7 @@ extern int pthread_setschedprio (pthread_t __target_thread, int __prio) __THROW; -#ifdef __USE_UNIX98 +#if defined __USE_UNIX98 && defined __UCLIBC_SUSV4_LEGACY__ /* Determine level of concurrency. */ extern int pthread_getconcurrency (void) __THROW; diff --git a/libpthread/nptl_db/Makefile.in b/libpthread/nptl_db/Makefile.in index a3fc1cd74..b1585299a 100644 --- a/libpthread/nptl_db/Makefile.in +++ b/libpthread/nptl_db/Makefile.in @@ -22,6 +22,9 @@ libthread_db_OUT := $(top_builddir)libpthread/nptl_db libthread_db_SRC := $(wildcard $(libthread_db_DIR)/td_*.c) \ $(libthread_db_DIR)/fetch-value.c +ifeq ($(UCLIBC_SUSV4_LEGACY),) +libthread_db_SRC := $(filter-out td_ta_setconcurrency.c,$(libthread_db_SRC)) +endif libthread_db_OBJ := $(patsubst $(libthread_db_DIR)/%.c,$(libthread_db_OUT)/%.o,$(libthread_db_SRC)) diff --git a/libpthread/nptl_db/thread_db.h b/libpthread/nptl_db/thread_db.h index 433b54fd5..23cb5c632 100644 --- a/libpthread/nptl_db/thread_db.h +++ b/libpthread/nptl_db/thread_db.h @@ -355,10 +355,10 @@ extern td_err_e td_ta_clear_event (const td_thragent_t *__ta, extern td_err_e td_ta_event_getmsg (const td_thragent_t *__ta, td_event_msg_t *__msg); - +#ifdef __UCLIBC_SUSV4_LEGACY__ /* Set suggested concurrency level for process associated with TA. */ extern td_err_e td_ta_setconcurrency (const td_thragent_t *__ta, int __level); - +#endif /* Enable collecting statistics for process associated with TA. */ extern td_err_e td_ta_enable_stats (const td_thragent_t *__ta, int __enable); -- cgit v1.2.3