diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-10-08 01:51:37 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-10-08 01:51:37 +0200 |
| commit | 4b15b8b5fe6ef0cdb11c792c4c6c48b9bb1bdb69 (patch) | |
| tree | 494b2be7e50880884ea515f8cac01f556765a19e | |
| parent | 49fb710ff3a8ff50d2f44116ce4f296e4f3afdeb (diff) | |
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)
| -rw-r--r-- | .topdeps | 3 | ||||
| -rw-r--r-- | .topmsg | 10 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/cthreads.c | 2 |
3 files changed, 5 insertions, 10 deletions
@@ -1,2 +1 @@ -baseline -t/tcbhead_t +t/tls-threadvar @@ -1,7 +1,3 @@ -From: Thomas Schwinge <thomas@schwinge.name> -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 <stdlib.h> 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]; |