Re: [PATCH 04/18] nptl: Move legacy cancelation handling into libc as compat symbols

[Adhemerval Zanella <adhemerval.zanella@linaro.org>]

On 16/03/2021 11:45, Florian Weimer wrote:
> * Adhemerval Zanella:
> 
>>> diff --git a/nptl/Versions b/nptl/Versions
>>> index e3eb686a04..ff6eae2566 100644
>>> --- a/nptl/Versions
>>> +++ b/nptl/Versions
>>> @@ -1,5 +1,9 @@
>>>  libc {
>>>    GLIBC_2.0 {
>>> +    _pthread_cleanup_pop;
>>> +    _pthread_cleanup_pop_restore;
>>> +    _pthread_cleanup_push;
>>> +    _pthread_cleanup_push_defer;
>>>      pthread_attr_destroy;
>>>      pthread_attr_getdetachstate;
>>>      pthread_attr_getinheritsched;
>>> @@ -103,6 +107,8 @@ libc {
>>>      __pthread_attr_init;
>>>      __pthread_attr_setaffinity_np;
>>>      __pthread_attr_setsigmask_internal;
>>> +    __pthread_cleanup_pop;
>>> +    __pthread_cleanup_push;
>>>      __pthread_cond_destroy; # Used by the C11 threads.
>>>      __pthread_cond_init; # Used by the C11 threads.
>>>      __pthread_force_elision;
>>
>> Why are you exporting the double underscore __pthread_cleanup_[pop,push]
>> on older versions here?
> 
> More patch context:
> 
>    GLIBC_PRIVATE {
>      __futex_abstimed_wait64;
>      __futex_abstimed_wait_cancelable64;
>      __libc_alloca_cutoff;
>      __libc_allocate_rtsig_private;
>      __libc_cleanup_pop_restore;
>      __libc_cleanup_push_defer;
>      __libc_current_sigrtmax_private;
>      __libc_current_sigrtmin_private;
>      __libc_dl_error_tsd;
>      __libc_pthread_init;
>      __lll_clocklock_elision;
>      __lll_lock_elision;
>      __lll_lock_wait;
>      __lll_lock_wait_private;
>      __lll_trylock_elision;
>      __lll_unlock_elision;
>      __pthread_attr_copy;
>      __pthread_attr_destroy;
>      __pthread_attr_init;
>      __pthread_attr_setaffinity_np;
>      __pthread_attr_setsigmask_internal;
> +    __pthread_cleanup_pop;
> +    __pthread_cleanup_push;
>      __pthread_cond_destroy; # Used by the C11 threads.
>      __pthread_cond_init; # Used by the C11 threads.
>      __pthread_force_elision;
>      __pthread_getattr_default_np;
>    }
> 
> I've added this to the commit message:
> 
> __pthread_cleanup_pop and __pthread_cleanup_push are added as
> GLIBC_PRIVATE symbols because they are also used internally, for
> glibc's own cancellation handling.


Ack I missed this.