From 4b15b8b5fe6ef0cdb11c792c4c6c48b9bb1bdb69 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 8 Oct 2015 01:51:37 +0200 Subject: glibc 2.19 does not have the IS_IN generic macro yet To be removed for glibc versions which have it (and thus don't define IS_IN_rtld) --- .topdeps | 3 +-- .topmsg | 10 +++------- sysdeps/mach/hurd/cthreads.c | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.topdeps b/.topdeps index b515ffd41e..26ad2813bc 100644 --- a/.topdeps +++ b/.topdeps @@ -1,2 +1 @@ -baseline -t/tcbhead_t +t/tls-threadvar diff --git a/.topmsg b/.topmsg index cdf5ad38b5..2718034d3f 100644 --- a/.topmsg +++ b/.topmsg @@ -1,7 +1,3 @@ -From: Thomas Schwinge -Subject: [PATCH] tls-threadvar - -replace the custom threadvar mechanism with generic TLS. -That will fix sigaltstack. - -Note: the added reply_port and _hurd_sigstate fields should be kept last. +glibc 2.19 does not have the IS_IN generic macro yet. +To be removed for glibc versions which have it (and thus don't define +IS_IN_rtld) diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c index b309301d93..273cd0f8a2 100644 --- a/sysdeps/mach/hurd/cthreads.c +++ b/sysdeps/mach/hurd/cthreads.c @@ -20,7 +20,7 @@ #include char __libc_lock_self0[0]; -#if IS_IN (rtld) +#if IS_IN_rtld /* We don't support static tls relocation so early, but we do not have threads there either anyway. */ static char __libc_lock_self[0]; -- cgit v1.2.3