diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:23:01 +0000 |
| commit | 519f6620457d9f84d0125c0c7d01abebaae8efaa (patch) | |
| tree | 28e2b20214b72aa7a633a5910dba7d2388620a78 /elf/tlsdeschtab.h | |
| parent | 74f331b3ccf81cf9404be03e62bde9efcc0878c2 (diff) | |
| parent | 68e2fa8ed9dbf0edfdaed0310801e764c12af46e (diff) | |
Merge commit 'refs/top-bases/t/libc_cleanup' into t/libc_cleanup
Diffstat (limited to 'elf/tlsdeschtab.h')
| -rw-r--r-- | elf/tlsdeschtab.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h index 38eba77472..fea9eefe72 100644 --- a/elf/tlsdeschtab.h +++ b/elf/tlsdeschtab.h @@ -1,5 +1,5 @@ /* Hash table for TLS descriptors. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Alexandre Oliva <aoliva@redhat.com> @@ -79,7 +79,6 @@ map_generation (struct link_map *map) } void * -internal_function _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) { struct hashtab *ht; @@ -138,6 +137,7 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) avoid introducing such dependencies. */ static int +__attribute__ ((unused)) _dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller) { if (caller != atomic_load_relaxed (&td->entry)) @@ -156,6 +156,7 @@ _dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller) } static void +__attribute__ ((unused)) _dl_tlsdesc_wake_up_held_fixups (void) { __rtld_lock_unlock_recursive (GL(dl_load_lock)); |