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 /stdlib | |
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 'stdlib')
-rw-r--r-- | stdlib/fmtmsg.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c index 2846d34..428dad0 100644 --- a/stdlib/fmtmsg.c +++ b/stdlib/fmtmsg.c @@ -122,13 +122,10 @@ fmtmsg (long int classification, const char *label, int severity, return MM_NOTOK; } -#ifdef __libc_ptf_call /* 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); -#endif + __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); __libc_lock_lock (lock); @@ -197,9 +194,7 @@ fmtmsg (long int classification, const char *label, int severity, __libc_lock_unlock (lock); -#ifdef __libc_ptf_call - __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); -#endif + __pthread_setcancelstate (state, NULL); return result; } |