[git commit master 1/1] libc_tls: Do not include generic libc-tls from arch specific implementation

Carmelo Amoroso carmelo.amoroso at st.com
Mon Nov 29 21:21:52 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=0c468129356f5ce6780e7369c271d74631ae03ba
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

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 <carmelo.amoroso at st.com>
---
 libpthread/nptl/sysdeps/alpha/libc-tls.c |    1 -
 libpthread/nptl/sysdeps/mips/libc-tls.c  |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libpthread/nptl/sysdeps/alpha/libc-tls.c b/libpthread/nptl/sysdeps/alpha/libc-tls.c
index a3b68e9..01f6f3c 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 <sysdeps/generic/libc-tls.c>
 #include <dl-tls.h>
 
 #if USE_TLS
diff --git a/libpthread/nptl/sysdeps/mips/libc-tls.c b/libpthread/nptl/sysdeps/mips/libc-tls.c
index fdedc9f..7bbba01 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 <dl-tls.h>
 
 #if USE_TLS
-- 
1.7.2.2



More information about the uClibc-cvs mailing list