summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-01-29 15:21:38 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-01-29 17:51:18 +0100
commit29962e14a1144ec4f9cfac8ab8a51af2b5692317 (patch)
treec8b262fbb4b6bb9ec7d2eadd877c62e8a3431a98
parent46aa707fc50415e90b0860258f4f5d78b7b96a7b (diff)
downloaduClibc-alpine-29962e14a1144ec4f9cfac8ab8a51af2b5692317.tar.bz2
uClibc-alpine-29962e14a1144ec4f9cfac8ab8a51af2b5692317.tar.xz
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 <rep.dot.nop@gmail.com>
-rw-r--r--libpthread/nptl/sysdeps/pthread/pthread.h2
-rw-r--r--libpthread/nptl_db/Makefile.in3
-rw-r--r--libpthread/nptl_db/thread_db.h4
3 files changed, 6 insertions, 3 deletions
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);