From ecada8e94a82cba1e5cd434b087889e949555736 Mon Sep 17 00:00:00 2001 From: Nitin Garg Date: Tue, 1 Feb 2011 19:30:23 -0600 Subject: [PATCH] [SIGNED-FF] Fix the static link problem for ARM due to undefined __tls_get_addr Signed-off-by: Nitin Garg --- uClibc/libpthread/nptl/sysdeps/arm/Makefile.arch | 1 + uClibc/libpthread/nptl/sysdeps/arm/libc-tls.c | 37 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 uClibc/libpthread/nptl/sysdeps/arm/libc-tls.c diff --git a/uClibc/libpthread/nptl/sysdeps/arm/Makefile.arch b/uClibc/libpthread/nptl/sysdeps/arm/Makefile.arch index a8bc1aa..284dba4 100644 --- a/uClibc/libpthread/nptl/sysdeps/arm/Makefile.arch +++ b/uClibc/libpthread/nptl/sysdeps/arm/Makefile.arch @@ -15,3 +15,4 @@ ASFLAGS-pthread_spin_lock.S = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-pthread_spin_trylock.S = -DNOT_IN_libc -DIS_IN_libpthread ASFLAGS-aeabi_read_tp.S = -DNOT_IN_libc=1 +libc_arch_a_CSRC = libc-tls.c diff --git a/uClibc/libpthread/nptl/sysdeps/arm/libc-tls.c b/uClibc/libpthread/nptl/sysdeps/arm/libc-tls.c new file mode 100644 index 0000000..1f98cd9 --- /dev/null +++ b/uClibc/libpthread/nptl/sysdeps/arm/libc-tls.c @@ -0,0 +1,37 @@ +/* Thread-local storage handling in the ELF dynamic linker. ARM version. + Copyright (C) 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +#if defined(USE_TLS) && USE_TLS + +/* On ARM, 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 -- 1.5.5.6