mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nptl: Move __pthread_cleanup_upto into libc

Browse Source 
This internal symbol is used as part of the longjmp implementation.
Rename the file from nptl/pt-cleanup.c to nptl/pthread_cleanup_upto.c
so that the pt-* files remain restricted to libpthread.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-04-21 19:49:50 +02:00
parent 5a3140b489
commit 4647ce82c7
8 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nptl/Makefile
View File

@ -66,6 +66,7 @@ routines = \
pthread_attr_setscope \
pthread_attr_setsigmask \
pthread_attr_setsigmask_internal \
pthread_cleanup_upto \
pthread_cond_destroy \
pthread_cond_init \
pthread_condattr_destroy \
@ -100,7 +101,6 @@ libpthread-routines = \
old_pthread_cond_signal \
old_pthread_cond_timedwait \
old_pthread_cond_wait \
pt-cleanup \
pt-interp \
pthread_attr_getaffinity \
pthread_attr_getguardsize \

1
nptl/Versions
View File

@ -108,6 +108,7 @@ libc {
__pthread_attr_setsigmask_internal;
__pthread_cleanup_pop;
__pthread_cleanup_push;
__pthread_cleanup_upto;
__pthread_cond_destroy; # Used by the C11 threads.
__pthread_cond_init; # Used by the C11 threads.
__pthread_force_elision;

1
nptl/nptl-init.c
View File

@ -87,7 +87,6 @@ static const struct pthread_functions pthread_functions =
.ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
.ptr___pthread_setcancelstate = __pthread_setcancelstate,
.ptr_pthread_setcanceltype = __pthread_setcanceltype,
.ptr___pthread_cleanup_upto = __pthread_cleanup_upto,
.ptr___pthread_once = __pthread_once,
.ptr___pthread_rwlock_rdlock = __pthread_rwlock_rdlock,
.ptr___pthread_rwlock_wrlock = __pthread_rwlock_wrlock,

4
nptl/pthreadP.h
View File

@ -332,9 +332,7 @@ extern int __make_stacks_executable (void **stack_endp) attribute_hidden;
/* longjmp handling. */
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
#if IS_IN (libpthread)
hidden_proto (__pthread_cleanup_upto)
#endif
libc_hidden_proto (__pthread_cleanup_upto)
/* Functions with versioned interfaces. */

2
nptl/pt-cleanup.c → nptl/pthread_cleanup_upto.c
View File

@ -59,4 +59,4 @@ __pthread_cleanup_upto (__jmp_buf target, char *targetframe)
THREAD_SETMEM (self, cleanup, cbuf);
}
hidden_def (__pthread_cleanup_upto)
libc_hidden_def (__pthread_cleanup_upto)

8
sysdeps/nptl/jmp-unwind.c
View File

@ -19,14 +19,10 @@
#include <setjmp.h>
#include <stddef.h>
#include <libc-lock.h>
extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
#pragma weak __pthread_cleanup_upto
#include <nptl/pthreadP.h>
void
_longjmp_unwind (jmp_buf env, int val)
{
__libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf,
CURRENT_STACK_FRAME), 0);
__pthread_cleanup_upto (env->__jmpbuf, CURRENT_STACK_FRAME);
}

1
sysdeps/nptl/pthread-functions.h
View File

@ -49,7 +49,6 @@ struct pthread_functions
int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
int (*ptr___pthread_setcancelstate) (int, int *);
int (*ptr_pthread_setcanceltype) (int, int *);
void (*ptr___pthread_cleanup_upto) (__jmp_buf, char *);
int (*ptr___pthread_once) (pthread_once_t *, void (*) (void));
int (*ptr___pthread_rwlock_rdlock) (pthread_rwlock_t *);
int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *);

7
sysdeps/unix/sysv/linux/s390/jmp-unwind.c
View File

@ -19,15 +19,12 @@
#include <setjmp.h>
#include <stddef.h>
#include <libc-lock.h>
extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
#pragma weak __pthread_cleanup_upto
#include <nptl/pthreadP.h>
void
_longjmp_unwind (jmp_buf env, int val)
{
char local_var;
__libc_ptf_call (__pthread_cleanup_upto, (env->__jmpbuf, &local_var), 0);
__pthread_cleanup_upto (env->__jmpbuf, &local_var);
}