diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2007-11-22 09:57:06 +0000 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2007-11-22 09:57:06 +0000 |
| commit | 0957a1a07cba013759ac2067979e6792f804af90 (patch) | |
| tree | edc6fd9cfd79b40b7567bc08c9364a44378565d2 | |
| parent | 4ae685ecc4e94df58b5a7da4915716cbe651d932 (diff) | |
| download | uClibc-alpine-0957a1a07cba013759ac2067979e6792f804af90.tar.bz2 uClibc-alpine-0957a1a07cba013759ac2067979e6792f804af90.tar.xz | |
Removed #if USE_TLS guard around tls_tpnt, otherwise it will not compile
if TLS is disabled (once merged into the trunk)
Pointed out by Peter Mazinger.
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
| -rw-r--r-- | ldso/ldso/sh/elfinterp.c | 3 | ||||
| -rw-r--r-- | ldso/libdl/libdl.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c index db86b0c0c..92199ef13 100644 --- a/ldso/ldso/sh/elfinterp.c +++ b/ldso/ldso/sh/elfinterp.c @@ -167,9 +167,8 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, #if defined (__SUPPORT_LD_DEBUG__) unsigned long old_val; #endif -#if USE_TLS + struct elf_resolve *tls_tpnt = NULL; -#endif reloc_addr = (unsigned long *)(intptr_t) (tpnt->loadaddr + (unsigned long) rpnt->r_offset); diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index cd18729a9..e4f564bc2 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -606,10 +606,7 @@ void *dlsym(void *vhandle, const char *name) struct dyn_elf *rpnt; void *ret; -#if defined USE_TLS -struct elf_resolve *tls_tpnt = NULL; -#endif - + struct elf_resolve *tls_tpnt = NULL; handle = (struct dyn_elf *) vhandle; |