svn commit: branches/uClibc-nptl/ldso: ldso/sh libdl

[carmelo at uclibc.org]

Author: carmelo
Date: 2007-11-22 01:57:06 -0800 (Thu, 22 Nov 2007)
New Revision: 20471

Log:
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 at st.com>


Modified:
   branches/uClibc-nptl/ldso/ldso/sh/elfinterp.c
   branches/uClibc-nptl/ldso/libdl/libdl.c


Changeset:
Modified: branches/uClibc-nptl/ldso/ldso/sh/elfinterp.c
===================================================================
--- branches/uClibc-nptl/ldso/ldso/sh/elfinterp.c	2007-11-22 08:16:57 UTC (rev 20470)
+++ branches/uClibc-nptl/ldso/ldso/sh/elfinterp.c	2007-11-22 09:57:06 UTC (rev 20471)
@@ -167,9 +167,8 @@
 #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);

Modified: branches/uClibc-nptl/ldso/libdl/libdl.c
===================================================================
--- branches/uClibc-nptl/ldso/libdl/libdl.c	2007-11-22 08:16:57 UTC (rev 20470)
+++ branches/uClibc-nptl/ldso/libdl/libdl.c	2007-11-22 09:57:06 UTC (rev 20471)
@@ -606,11 +606,8 @@
 	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;
 
 	/* First of all verify that we have a real handle