From 8b6785f0836011cace9a77f3c24e51a7379238a0 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 5 Feb 2014 21:21:00 +1000 Subject: Revert "Patch 3/4 of the effort to make TLS access async-signal-safe." This reverts commit 35e8f7ab94c910659de9d507aa0f3e1f8973d914. --- elf/Versions | 1 - elf/dl-tls.c | 12 ------------ 2 files changed, 13 deletions(-) (limited to 'elf') diff --git a/elf/Versions b/elf/Versions index 01b7a59d5e..238399232d 100644 --- a/elf/Versions +++ b/elf/Versions @@ -53,7 +53,6 @@ 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_clear_dtv; _dl_rtld_di_serinfo; _dl_starting_up; _dl_tls_setup; _rtld_global; _rtld_global_ro; diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 28e4fbef40..dbaea0aa91 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -463,18 +463,6 @@ _dl_allocate_tls (void *mem) } rtld_hidden_def (_dl_allocate_tls) -void -internal_function -_dl_clear_dtv (dtv_t *dtv) -{ - for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt) - if (! dtv[1 + cnt].pointer.is_static - && dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED) - free (dtv[1 + cnt].pointer.val); - memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t)); -} - -rtld_hidden_def (_dl_clear_dtv) #ifndef SHARED extern dtv_t _dl_static_dtv[]; -- cgit 1.4.1