diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-07-27 13:46:00 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-07-27 13:46:00 +0200 |
| commit | bf735eb494ce184345c23ead87d7e05810c4d886 (patch) | |
| tree | f1893b8802126c2d4f85d3d87da392ac30fe6763 | |
| parent | ba97a399c28c081a65c7f2389c3a4b0cf66ee33a (diff) | |
silence warning about incompatible types with _dl_init_static_tls
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | ldso/include/ldsodefs.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/dl-tls.c | 2 | ||||
| -rw-r--r-- | ldso/libdl/libdl.c | 1 | ||||
| -rw-r--r-- | 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 0c15254c1..8f601e944 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 21c16dc19..43dd5a00a 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 f19a0151e..3957e846f 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 665b62a24..f1946924c 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) |