From 33237fe83d553dff111915024c9670adc3f06048 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Thu, 23 Mar 2023 10:13:51 -0300 Subject: Remove --enable-tunables configure option And make always supported. The configure option was added on glibc 2.25 and some features require it (such as hwcap mask, huge pages support, and lock elisition tuning). It also simplifies the build permutations. Changes from v1: * Remove glibc.rtld.dynamic_sort changes, it is orthogonal and needs more discussion. * Cleanup more code. Reviewed-by: Siddhesh Poyarekar --- nptl/pthread_mutex_conf.c | 4 +--- nptl/tst-mutex8.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'nptl') diff --git a/nptl/pthread_mutex_conf.c b/nptl/pthread_mutex_conf.c index 329c4cbb8f..9133384d47 100644 --- a/nptl/pthread_mutex_conf.c +++ b/nptl/pthread_mutex_conf.c @@ -16,8 +16,7 @@ License along with the GNU C Library; if not, see . */ -#if HAVE_TUNABLES -# define TUNABLE_NAMESPACE pthread +#define TUNABLE_NAMESPACE pthread #include #include #include @@ -53,4 +52,3 @@ __pthread_tunables_init (void) TUNABLE_GET (stack_cache_size, size_t, TUNABLE_CALLBACK (set_stack_cache_size)); } -#endif diff --git a/nptl/tst-mutex8.c b/nptl/tst-mutex8.c index 4ac5f5059f..e16284d29e 100644 --- a/nptl/tst-mutex8.c +++ b/nptl/tst-mutex8.c @@ -98,7 +98,6 @@ check_type (const char *mas, pthread_mutexattr_t *ma) /* Check if a mutex will be elided. Lock elision can only be activated via the tunables framework. By default, lock elision is disabled. */ bool assume_elided_mutex = false; -#if HAVE_TUNABLES int ma_type = PTHREAD_MUTEX_TIMED_NP; if (ma != NULL) { @@ -117,7 +116,6 @@ check_type (const char *mas, pthread_mutexattr_t *ma) if (TUNABLE_GET_FULL (glibc, elision, enable, int32_t, NULL) == 1) assume_elided_mutex = true; } -#endif e = pthread_mutex_init (m, ma); if (e != 0) -- cgit 1.4.1