[git commit master] ldso: fix USE_TLS check

Austin Foxley austinf at cetoncorp.com
Fri Apr 23 14:31:55 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=f77f0e479274d401b36efce2e1e2a44753157daf
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

this was causing tls symbols to leak into non-tls builds

Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 ldso/include/ldso.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index e566905..53bb5be 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -72,7 +72,7 @@ extern char *_dl_ldsopath;             /* Where the shared lib loader was found
 extern const char *_dl_progname;       /* The name of the executable being run */
 extern size_t _dl_pagesize;            /* Store the page size for use later */
 
-#ifdef USE_TLS
+#if defined(USE_TLS) && USE_TLS
 extern void _dl_add_to_slotinfo (struct link_map  *l);
 extern void ** __attribute__ ((const)) _dl_initial_error_catch_tsd (void);
 #endif
-- 
1.6.3.3



More information about the uClibc-cvs mailing list