Browse Source

silence warning about incompatible types with _dl_init_static_tls

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Bernhard Reutner-Fischer 13 years ago
parent
commit
bf735eb494
4 changed files with 3 additions and 4 deletions
  1. 1 1
      ldso/include/ldsodefs.h
  2. 1 1
      ldso/ldso/dl-tls.c
  3. 0 1
      ldso/libdl/libdl.c
  4. 1 1
      libc/misc/elf/dl-support.c

+ 1 - 1
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;

+ 1 - 1
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

+ 0 - 1
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
 

+ 1 - 1
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)