diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2007-11-19 15:35:12 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2007-11-19 15:35:12 +0000 |
| commit | 414d8e5f2a73aff8e9404684571a65f85b27bf89 (patch) | |
| tree | 879ac217d477f76cf965b244d98b383b663ff47b /libpthread/nptl/sysdeps/generic/libc-tls.c | |
| parent | 381fb7688d356f03e35b9254796adb29c941532b (diff) | |
| download | uClibc-alpine-414d8e5f2a73aff8e9404684571a65f85b27bf89.tar.bz2 uClibc-alpine-414d8e5f2a73aff8e9404684571a65f85b27bf89.tar.xz | |
Synch nptl branch with SH port: as requested by sjhill for mips-ash4 merge
Diffstat (limited to 'libpthread/nptl/sysdeps/generic/libc-tls.c')
| -rw-r--r-- | libpthread/nptl/sysdeps/generic/libc-tls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c index 3b58ce21f..d302d31c9 100644 --- a/libpthread/nptl/sysdeps/generic/libc-tls.c +++ b/libpthread/nptl/sysdeps/generic/libc-tls.c @@ -26,13 +26,14 @@ #include <elf.h> #include <link.h> #include <string.h> +#include <stdlib.h> #ifdef SHARED #error makefile bug, this file is for static only #endif -#ifdef USE_TLS +#if USE_TLS extern ElfW(Phdr) *_dl_phdr; extern size_t _dl_phnum; @@ -191,7 +192,7 @@ __libc_setup_tls (size_t tcbsize, size_t tcbalign) const char *lossage = TLS_INIT_TP ((char *) tlsblock + tcb_offset, 0); # elif TLS_DTV_AT_TP INSTALL_DTV (tlsblock, static_dtv); - const char *lossage = TLS_INIT_TP (tlsblock, 0); + const char *lossage = (char *)TLS_INIT_TP (tlsblock, 0); # else # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" # endif |