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.
---
nptl/Makefile | 2 +-
nptl/Versions | 1 +
nptl/nptl-init.c | 1 -
nptl/pthreadP.h | 4 +---
nptl/{pt-cleanup.c => pthread_cleanup_upto.c} | 2 +-
sysdeps/nptl/jmp-unwind.c | 8 ++------
sysdeps/unix/sysv/linux/s390/jmp-unwind.c | 7 ++-----
7 files changed, 8 insertions(+), 17 deletions(-)
rename nptl/{pt-cleanup.c => pthread_cleanup_upto.c} (98%)
@@ -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 \
@@ -114,7 +115,6 @@ libpthread-routines = \
old_pthread_cond_timedwait \
old_pthread_cond_wait \
pt-allocrtsig \
- pt-cleanup \
pt-fcntl \
pt-fork \
pt-interp \
@@ -109,6 +109,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;
@@ -88,7 +88,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,
@@ -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. */
similarity index 98%
rename from nptl/pt-cleanup.c
rename to nptl/pthread_cleanup_upto.c
@@ -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)
@@ -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);
}
@@ -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);
}