about summary refs log tree commit diff
path: root/sunrpc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-06-26 15:13:54 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-06-26 15:27:12 +0200
commit124e025864bb39732c71fc60c1443d5680881a0a (patch)
tree2af69c84acc461764f9b8873089b3277b22725c0 /sunrpc
parent935d920e763626dbcbbf655117285d1d270791a1 (diff)
downloadglibc-124e025864bb39732c71fc60c1443d5680881a0a.tar.gz
glibc-124e025864bb39732c71fc60c1443d5680881a0a.tar.xz
glibc-124e025864bb39732c71fc60c1443d5680881a0a.zip
Run thread shutdown functions in an explicit order
This removes the __libc_thread_subfreeres hook in favor of explict
calls.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/rpc_thread.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index 068a49f92b..a65a90dc15 100644
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -15,7 +15,7 @@ static __thread struct rpc_thread_variables *thread_rpc_vars
 /*
  * Task-variable destructor
  */
-void __attribute__ ((section ("__libc_thread_freeres_fn")))
+void
 __rpc_thread_destroy (void)
 {
 	struct rpc_thread_variables *tvp = thread_rpc_vars;
@@ -36,12 +36,8 @@ __rpc_thread_destroy (void)
 		thread_rpc_vars = NULL;
 	}
 }
-#ifdef _LIBC_REENTRANT
-text_set_element (__libc_thread_subfreeres, __rpc_thread_destroy);
-#endif
 text_set_element (__libc_subfreeres, __rpc_thread_destroy);
 
-
 /*
  * Initialize RPC multi-threaded operation
  */