_dl_stack_used/user/etc. vs _dl_pthread_num_threads etc. is really an
nptl vs htl question rather than pthread being in libc.
---
elf/dl-support.c | 5 +++--
sysdeps/generic/ldsodefs.h | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/elf/dl-support.c b/elf/dl-support.c
index bbef3ab6b6..f5b7550bf5 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -169,14 +169,15 @@ fpu_control_t _dl_fpu_control = _FPU_DEFAULT;
/* Required flags used for stack allocation. */
int _dl_stack_prot_flags = DEFAULT_STACK_PROT_PERMS;
-#if PTHREAD_IN_LIBC
+#if !defined (__PTHREAD_HTL)
list_t _dl_stack_used;
list_t _dl_stack_user;
list_t _dl_stack_cache;
size_t _dl_stack_cache_actsize;
uintptr_t _dl_in_flight_stack;
int _dl_stack_cache_lock;
-#else
+#endif
+#if !PTHREAD_IN_LIBC
void (*_dl_init_static_tls) (struct link_map *) =
&_dl_nothread_init_static_tls;
#endif
struct dl_scope_free_list *_dl_scope_free_list;
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index cb318ade7b..8c3541602f 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -451,7 +451,7 @@ struct rtld_global
size_t count;
void *list[50];
} *_dl_scope_free_list;
-#if PTHREAD_IN_LIBC
+#if !defined __PTHREAD_HTL
/* List of active thread stacks, with memory managed by glibc. */
EXTERN list_t _dl_stack_used;
--
2.51.0
