From 0c468129356f5ce6780e7369c271d74631ae03ba Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Mon, 29 Nov 2010 22:21:52 +0100 Subject: libc_tls: Do not include generic libc-tls from arch specific implementation libpthread/nptl/sysdeps/generic/libc-tls.c is built as well, so it does not need that arch specific version of libc-tls.c (MIPS and ALPHA) includes it. The arch libc-tls.s is aimed to provide the implementation of __tls_get_addr for the static libc.a, because on these archs the linker relaxations are not required and it could be possible to have local-dynamic access models in static libraries as well. Signed-off-by: Carmelo Amoroso --- libpthread/nptl/sysdeps/alpha/libc-tls.c | 1 - libpthread/nptl/sysdeps/mips/libc-tls.c | 1 - 2 files changed, 2 deletions(-) (limited to 'libpthread/nptl') diff --git a/libpthread/nptl/sysdeps/alpha/libc-tls.c b/libpthread/nptl/sysdeps/alpha/libc-tls.c index a3b68e928..01f6f3c04 100644 --- a/libpthread/nptl/sysdeps/alpha/libc-tls.c +++ b/libpthread/nptl/sysdeps/alpha/libc-tls.c @@ -17,7 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include #include #if USE_TLS diff --git a/libpthread/nptl/sysdeps/mips/libc-tls.c b/libpthread/nptl/sysdeps/mips/libc-tls.c index fdedc9f5a..7bbba01d1 100644 --- a/libpthread/nptl/sysdeps/mips/libc-tls.c +++ b/libpthread/nptl/sysdeps/mips/libc-tls.c @@ -17,7 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <../generic/libc-tls.c> #include #if USE_TLS -- cgit v1.2.3 From bfeeeb57588f6a58d6a154fbc59b30fb48e27956 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 1 Dec 2010 17:04:05 +0100 Subject: Revert "libc_tls: Do not include generic libc-tls from arch specific implementation" This reverts commit 0c468129356f5ce6780e7369c271d74631ae03ba. Indeed recent updates into buildsys managed to filter-out generic implementation when arch specific one is defined, so duplicated symbols into the libc.a In the meanwhile, do a minor fix into mips version not using relative path to include Signed-off-by: Carmelo Amoroso --- libpthread/nptl/sysdeps/alpha/libc-tls.c | 1 + libpthread/nptl/sysdeps/mips/libc-tls.c | 1 + 2 files changed, 2 insertions(+) (limited to 'libpthread/nptl') diff --git a/libpthread/nptl/sysdeps/alpha/libc-tls.c b/libpthread/nptl/sysdeps/alpha/libc-tls.c index 01f6f3c04..a3b68e928 100644 --- a/libpthread/nptl/sysdeps/alpha/libc-tls.c +++ b/libpthread/nptl/sysdeps/alpha/libc-tls.c @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include #if USE_TLS diff --git a/libpthread/nptl/sysdeps/mips/libc-tls.c b/libpthread/nptl/sysdeps/mips/libc-tls.c index 7bbba01d1..157ba3389 100644 --- a/libpthread/nptl/sysdeps/mips/libc-tls.c +++ b/libpthread/nptl/sysdeps/mips/libc-tls.c @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include #if USE_TLS -- cgit v1.2.3 From c5db8f051be9846485911e973f26943c114c66fb Mon Sep 17 00:00:00 2001 From: Filippo Arcidiacono Date: Mon, 29 Nov 2010 23:31:49 +0100 Subject: libc_sh: add __tls_get_addr to static libc (SH) Add __tls_get_addr function to static libc allowing to handle local dynamic TLS access model. On SH, linker optimizations are not required, so __tls_get_addr can be called even in statically linked binaries. Signed-off-by: Filippo Arcidiacono Signed-off-by: Carmelo Amoroso --- libpthread/nptl/sysdeps/sh/Makefile.arch | 2 +- libpthread/nptl/sysdeps/sh/libc-tls.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 libpthread/nptl/sysdeps/sh/libc-tls.c (limited to 'libpthread/nptl') diff --git a/libpthread/nptl/sysdeps/sh/Makefile.arch b/libpthread/nptl/sysdeps/sh/Makefile.arch index 3cb58ec36..411622adc 100644 --- a/libpthread/nptl/sysdeps/sh/Makefile.arch +++ b/libpthread/nptl/sysdeps/sh/Makefile.arch @@ -10,4 +10,4 @@ ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE - +libc_arch_a_CSRC := libc-tls.c diff --git a/libpthread/nptl/sysdeps/sh/libc-tls.c b/libpthread/nptl/sysdeps/sh/libc-tls.c new file mode 100644 index 000000000..7b3389503 --- /dev/null +++ b/libpthread/nptl/sysdeps/sh/libc-tls.c @@ -0,0 +1,31 @@ +/* + * Thread-local storage handling in statically linked binaries. SH version. + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * Based on GNU C Library (file: libc/sysdeps/sh/libc-tls.c) + * + * Copyright (C) 2010 STMicroelectronics Ltd. + * Author: Filippo Arcidiacono + * + * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. + * + */ + +#include +#include + +#if defined (USE_TLS) && (USE_TLS) + +/* On SH, linker optimizations are not required, so __tls_get_addr + can be called even in statically linked binaries. In this case module + must be always 1 and PT_TLS segment exist in the binary, otherwise it + would not link. */ + +void * +__tls_get_addr (tls_index *ti) +{ + dtv_t *dtv = THREAD_DTV (); + return (char *) dtv[1].pointer.val + ti->ti_offset; +} + +#endif -- cgit v1.2.3