diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-19 18:03:26 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-19 18:03:26 +0200 |
| commit | 318edb20cda375745d599417491ae51aae374145 (patch) | |
| tree | 8394b3db82191594e134bb9699f27d3f2736ddc6 /sysdeps | |
| parent | 1d39694fcbc8e3675d86204225e3d479874eef15 (diff) | |
| parent | 8042775b6f2ab0fd27119725bffa2ee7a11a4478 (diff) | |
Merge branch 't/tls-threadvar' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/cthreads.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c index b53a1899cc..d8c175ccff 100644 --- a/sysdeps/mach/hurd/cthreads.c +++ b/sysdeps/mach/hurd/cthreads.c @@ -20,7 +20,13 @@ #include <stdlib.h> char __libc_lock_self0[0]; +#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]; +#else static __thread char __libc_lock_self[0]; +#endif void * __libc_get_lock_self(void) |