diff options
author | Florian Weimer <fweimer@redhat.com> | 2016-12-21 14:30:56 +0100 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2016-12-21 14:30:56 +0100 |
commit | d08ab9ced75e0d88827e0bb58183612afb7fe1fd (patch) | |
tree | 437b4b894b06b9252fb56e3e569da2ba59d5b180 /elf | |
parent | fcd942370ff863f67f971e255d30fb9c1f127607 (diff) | |
download | glibc-d08ab9ced75e0d88827e0bb58183612afb7fe1fd.tar glibc-d08ab9ced75e0d88827e0bb58183612afb7fe1fd.tar.gz glibc-d08ab9ced75e0d88827e0bb58183612afb7fe1fd.tar.bz2 glibc-d08ab9ced75e0d88827e0bb58183612afb7fe1fd.zip |
Remove unused function _dl_tls_setup
Commit 7a5e3d9d633c828d84a9535f26b202a6179978e7 (elf: Assume TLS is
initialized in _dl_map_object_from_fd) removed the last call of
_dl_tls_setup, but did not remove the function itself.
Diffstat (limited to 'elf')
-rw-r--r-- | elf/Versions | 2 | ||||
-rw-r--r-- | elf/dl-tls.c | 34 |
2 files changed, 2 insertions, 34 deletions
diff --git a/elf/Versions b/elf/Versions index 08f76a7a20..3d57e36fd2 100644 --- a/elf/Versions +++ b/elf/Versions @@ -59,7 +59,7 @@ ld { _dl_allocate_tls; _dl_allocate_tls_init; _dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info; _dl_deallocate_tls; _dl_make_stack_executable; _dl_out_of_memory; - _dl_rtld_di_serinfo; _dl_starting_up; _dl_tls_setup; + _dl_rtld_di_serinfo; _dl_starting_up; _rtld_global; _rtld_global_ro; # Only here for gdb while a better method is developed. diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 60f4c1da5c..97bd9779c6 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -274,39 +274,7 @@ _dl_determine_tlsoffset (void) /* The alignment requirement for the static TLS block. */ GL(dl_tls_static_align) = max_align; } - - -/* This is called only when the data structure setup was skipped at startup, - when there was no need for it then. Now we have dynamically loaded - something needing TLS, or libpthread needs it. */ -int -internal_function -_dl_tls_setup (void) -{ - assert (GL(dl_tls_dtv_slotinfo_list) == NULL); - assert (GL(dl_tls_max_dtv_idx) == 0); - - const size_t nelem = 2 + TLS_SLOTINFO_SURPLUS; - - GL(dl_tls_dtv_slotinfo_list) - = calloc (1, (sizeof (struct dtv_slotinfo_list) - + nelem * sizeof (struct dtv_slotinfo))); - if (GL(dl_tls_dtv_slotinfo_list) == NULL) - return -1; - - GL(dl_tls_dtv_slotinfo_list)->len = nelem; - - /* Number of elements in the static TLS block. It can't be zero - because of various assumptions. The one element is null. */ - GL(dl_tls_static_nelem) = GL(dl_tls_max_dtv_idx) = 1; - - /* This initializes more variables for us. */ - _dl_determine_tlsoffset (); - - return 0; -} -rtld_hidden_def (_dl_tls_setup) -#endif +#endif /* SHARED */ static void * internal_function |