Merge branch 't/tls-threadvar' into refs/top-bases/tschwinge/Roger_Whittaker

Conflicts:
	hurd/hurd/signal.h
	sysdeps/mach/hurd/i386/init-first.c

1 files changed, 2 insertions, 2 deletions

diff --git a/hurd/Versions b/hurd/Versions
index 19525a1f2e..74df5298a6 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -25,14 +25,13 @@ libc {
 
     # weak refs to libthreads functions that libc calls iff libthreads in use
     cthread_fork; cthread_detach;
+    pthread_getattr_np; pthread_attr_getstack;
 %endif
 
     # necessary for the Hurd brk implementation
     _end;
 
     # variables used in macros & inline functions
-    __hurd_sigthread_stack_base; __hurd_sigthread_stack_end;
-    __hurd_sigthread_variables;
     __hurd_threadvar_max;
     __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
 
@@ -166,6 +165,7 @@ libc {
   HURD_CTHREADS_0.3 {
     # weak refs to libthreads functions that libc calls iff libthreads in use
     cthread_fork; cthread_detach;
+    pthread_getattr_np; pthread_attr_getstack;
 
     # variables used for detecting cthreads
     _cthread_exit_routine; _cthread_init_routine;