From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id D036F3858C30; Mon, 4 Sep 2023 18:18:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D036F3858C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693851510; bh=aXtE1JBADaRq/dx1yITebI3b2vPjj1TRtX/9e9156Po=; h=From:To:Subject:Date:From; b=UCWraCRYRzhiwdRjBGQ+HchSGD1GhEPVz0wYSLKOPpmMZmyQeh6MoGSJLBRWqxpJ4 /UN0SUS5nioqoSg4XykRGAQwUDyBPZNmafXd6ao/2c2aeTQzenoeGPefVZpkbjxCdB nLy1+S3ufN3jKyt0jSQwERk+yDGiGytqRbxBi1oc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] __call_tls_dtors: Use call_function_static_weak X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 2897b231a6b71ee17d47d3d63f1112b2641a476c X-Git-Newrev: 6333a6014f32c7ced36ced610d5a5cecbafba6c3 Message-Id: <20230904181830.D036F3858C30@sourceware.org> Date: Mon, 4 Sep 2023 18:18:30 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6333a6014f32c7ced36ced610d5a5cecbafba6c3 commit 6333a6014f32c7ced36ced610d5a5cecbafba6c3 Author: Samuel Thibault Date: Mon Sep 4 20:03:37 2023 +0200 __call_tls_dtors: Use call_function_static_weak Diff: --- htl/pt-exit.c | 5 +---- include/stdlib.h | 6 +----- nptl/pthread_create.c | 5 +---- stdlib/exit.c | 7 ++----- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/htl/pt-exit.c b/htl/pt-exit.c index 22b585bb28..cb20a43aab 100644 --- a/htl/pt-exit.c +++ b/htl/pt-exit.c @@ -47,10 +47,7 @@ __pthread_exit (void *status) (*handlers)->__handler ((*handlers)->__arg); /* Call destructors for the thread_local TLS variables. */ -#ifndef SHARED - if (&__call_tls_dtors != NULL) -#endif - __call_tls_dtors (); + call_function_static_weak (__call_tls_dtors); __pthread_setcancelstate (oldstate, &oldstate); diff --git a/include/stdlib.h b/include/stdlib.h index d1d00c0f6f..0ed8271d9b 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -159,11 +159,7 @@ libc_hidden_proto (__cxa_atexit); extern int __cxa_thread_atexit_impl (void (*func) (void *), void *arg, void *d); -extern void __call_tls_dtors (void) -#ifndef SHARED - __attribute__ ((weak)) -#endif - ; +extern void __call_tls_dtors (void); libc_hidden_proto (__call_tls_dtors) extern void __cxa_finalize (void *d); diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 1ac8862ed2..6a41d50109 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -446,10 +446,7 @@ start_thread (void *arg) } /* Call destructors for the thread_local TLS variables. */ -#ifndef SHARED - if (&__call_tls_dtors != NULL) -#endif - __call_tls_dtors (); + call_function_static_weak (__call_tls_dtors); /* Run the destructor for the thread-local data. */ __nptl_deallocate_tsd (); diff --git a/stdlib/exit.c b/stdlib/exit.c index d6c188b739..0cf9bf7032 100644 --- a/stdlib/exit.c +++ b/stdlib/exit.c @@ -37,11 +37,8 @@ __run_exit_handlers (int status, struct exit_function_list **listp, bool run_list_atexit, bool run_dtors) { /* First, call the TLS destructors. */ -#ifndef SHARED - if (&__call_tls_dtors != NULL) -#endif - if (run_dtors) - __call_tls_dtors (); + if (run_dtors) + call_function_static_weak (__call_tls_dtors); __libc_lock_lock (__exit_funcs_lock);