[git commit master 1/1] silence warning about incompatible types with _dl_init_static_tls

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Tue Jul 27 11:46:00 UTC 2010


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

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 ldso/include/ldsodefs.h    |    2 +-
 ldso/ldso/dl-tls.c         |    2 +-
 ldso/libdl/libdl.c         |    1 -
 libc/misc/elf/dl-support.c |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ldso/include/ldsodefs.h b/ldso/include/ldsodefs.h
index 0c15254..8f601e9 100644
--- a/ldso/include/ldsodefs.h
+++ b/ldso/include/ldsodefs.h
@@ -79,7 +79,7 @@ extern void *_dl_allocate_tls_init (void *) internal_function;
 /* Deallocate memory allocated with _dl_allocate_tls.  */
 extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb) internal_function;
 
-extern void _dl_nothread_init_static_tls (struct link_map *) internal_function attribute_hidden;
+extern void _dl_nothread_init_static_tls (struct link_map *) attribute_hidden;
 
 /* Highest dtv index currently needed.  */
 EXTERN size_t _dl_tls_max_dtv_idx;
diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c
index 21c16dc..43dd5a0 100644
--- a/ldso/ldso/dl-tls.c
+++ b/ldso/ldso/dl-tls.c
@@ -176,7 +176,7 @@ fail:
    libpthread implementations should provide their own hook
    to handle all threads.  */
 void
-internal_function __attribute_noinline__
+attribute_hidden __attribute_noinline__
 _dl_nothread_init_static_tls (struct link_map *map)
 {
 # ifdef TLS_TCB_AT_TP
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index f19a015..3957e84 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -41,7 +41,6 @@
 
 #if defined(USE_TLS) && USE_TLS
 #include <ldsodefs.h>
-extern void (*_dl_init_static_tls) (struct link_map *);
 extern void _dl_add_to_slotinfo(struct link_map  *l);
 #endif
 
diff --git a/libc/misc/elf/dl-support.c b/libc/misc/elf/dl-support.c
index 665b62a..f194692 100644
--- a/libc/misc/elf/dl-support.c
+++ b/libc/misc/elf/dl-support.c
@@ -44,7 +44,7 @@ void internal_function _dl_aux_init (ElfW(auxv_t) *av)
    libpthread implementations should provide their own hook
    to handle all threads.  */
 void
-internal_function
+attribute_hidden
 _dl_nothread_init_static_tls (struct link_map *map)
 {
 # if defined(TLS_TCB_AT_TP)
-- 
1.7.1



More information about the uClibc-cvs mailing list