diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-02-03 11:14:03 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-02-03 11:16:42 +0100 |
| commit | ac5e9d08f4f7aa004e48b9484c3005f0ecc0a105 (patch) | |
| tree | 32d30bd157f862792fdc4193eb2372e4d8cd0df4 /libpthread/nptl/sysdeps/arm | |
| parent | fd3120fb9ec9fe01d458962dca510eb81d06fcc8 (diff) | |
| parent | 269f901e62106e2d36acf4c2b79a9a5ec6d684ff (diff) | |
Merge remote branch 'origin/master' into prelink
* origin/master:
arm: fix the static link problem for ARM due to undefined __tls_get_addr
nios2: Name architecture correctly in endian.h header
nptl/mips64: Fix build when using mips64 and ABIs other than o32
mips: avoid segmentation fault when RLD_MAP is 0
libc: fix linker script generation for libubacktrace.so
stdio: fix diagnostic message
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/arm')
| -rw-r--r-- | libpthread/nptl/sysdeps/arm/Makefile.arch | 1 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/arm/libc-tls.c | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/libpthread/nptl/sysdeps/arm/Makefile.arch b/libpthread/nptl/sysdeps/arm/Makefile.arch index a8bc1aadf..284dba43c 100644 --- a/libpthread/nptl/sysdeps/arm/Makefile.arch +++ b/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/libpthread/nptl/sysdeps/arm/libc-tls.c b/libpthread/nptl/sysdeps/arm/libc-tls.c new file mode 100644 index 000000000..1f98cd985 --- /dev/null +++ b/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 <sysdeps/generic/libc-tls.c> +#include <dl-tls.h> + +#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 |