diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-21 19:49:50 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-21 19:49:50 +0200 |
| commit | 93d78ec1cba68184931b75bef29afd3aed30f43a (patch) | |
| tree | 0306d8f4d7a01432f22b0471bed572803fb7a973 /misc | |
| parent | c62cef023cdcd8349369ef4e0d08290e495659be (diff) | |
| download | glibc-93d78ec1cba68184931b75bef29afd3aed30f43a.zip glibc-93d78ec1cba68184931b75bef29afd3aed30f43a.tar.gz glibc-93d78ec1cba68184931b75bef29afd3aed30f43a.tar.bz2 | |
nptl: Move pthread_setcancelstate into libc
No new symbol version is required because there was a forwarder.
The symbol has been moved using scripts/move-symbol-to-libc.py.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/error.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/misc/error.c b/misc/error.c index 06cc4a5..0400c84 100644 --- a/misc/error.c +++ b/misc/error.c @@ -236,12 +236,11 @@ void __error_internal (int status, int errnum, const char *message, va_list args, unsigned int mode_flags) { -#if defined _LIBC && defined __libc_ptf_call +#if defined _LIBC /* We do not want this call to be cut short by a thread cancellation. Therefore disable cancellation for now. */ int state = PTHREAD_CANCEL_ENABLE; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); #endif flush_stdout (); @@ -263,9 +262,7 @@ __error_internal (int status, int errnum, const char *message, #ifdef _LIBC _IO_funlockfile (stderr); -# ifdef __libc_ptf_call - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); -# endif + __pthread_setcancelstate (state, NULL); #endif } @@ -305,13 +302,11 @@ __error_at_line_internal (int status, int errnum, const char *file_name, old_line_number = line_number; } -#if defined _LIBC && defined __libc_ptf_call +#if defined _LIBC /* We do not want this call to be cut short by a thread cancellation. Therefore disable cancellation for now. */ int state = PTHREAD_CANCEL_ENABLE; - __libc_ptf_call (__pthread_setcancelstate, - (PTHREAD_CANCEL_DISABLE, &state), - 0); + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); #endif flush_stdout (); @@ -341,9 +336,7 @@ __error_at_line_internal (int status, int errnum, const char *file_name, #ifdef _LIBC _IO_funlockfile (stderr); -# ifdef __libc_ptf_call - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); -# endif + __pthread_setcancelstate (state, NULL); #endif } |