From 7c78a5c52b2db6bb0d6e163b38897a003a289958 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 18 Apr 2015 21:37:30 +0200 Subject: NPTL: Rename a variable There seems to be a bug in gold with static TLS at least on x86_64 (?) Signed-off-by: Bernhard Reutner-Fischer --- libc/misc/pthread/tsd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libc/misc/pthread') diff --git a/libc/misc/pthread/tsd.c b/libc/misc/pthread/tsd.c index 586ead3fa..3598b8927 100644 --- a/libc/misc/pthread/tsd.c +++ b/libc/misc/pthread/tsd.c @@ -1,11 +1,18 @@ +/* + * Copyright (C) 2006 by Steven J. Hill + * + * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. + */ /* libpthread sets _dl_error_catch_tsd to point to this function. We define it here instead of in libpthread so that it doesn't need to have a TLS segment of its own just for this one pointer. */ +#include + void **__libc_dl_error_tsd(void) __attribute__ ((const)); void ** __attribute__ ((const)) __libc_dl_error_tsd (void) { - static __thread void *data __attribute__ ((tls_model ("initial-exec"))); - return &data; + static __thread void *__tsd_data attribute_tls_model_ie; + return &__tsd_data; } -- cgit v1.2.3