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/mips/libc-tls.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libpthread/nptl/sysdeps/mips') 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/mips/libc-tls.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libpthread/nptl/sysdeps/mips') 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