From: Carlos O'Donell <carlos@redhat.com>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 06/19] nptl: Make __pthread_attr_init, __pthread_attr_destroy available internally
Date: Wed, 20 May 2020 09:59:56 -0400 [thread overview]
Message-ID: <9038079b-1cee-9da5-014e-73cb92c13ad1@redhat.com> (raw)
In-Reply-To: <dd7d115d4be92c3b483c46bdb24331c80d53ec31.1589884403.git.fweimer@redhat.com>
On 5/19/20 6:44 AM, Florian Weimer via Libc-alpha wrote:
> pthread_attr_destroy needs to be a weak alias to avoid future
> linknamespace failures.
Agreed.
> ---
> nptl/Versions | 1 +
> nptl/pthreadP.h | 4 +++-
> nptl/pthread_attr_destroy.c | 3 ++-
> nptl/pthread_attr_init.c | 5 +++--
> 4 files changed, 9 insertions(+), 4 deletions(-)
>
OK for master.
Tested clean on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> diff --git a/nptl/Versions b/nptl/Versions
> index ce08076611..65f0c077da 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -59,6 +59,7 @@ libc {
> # Used by the C11 threads implementation.
> __pthread_cond_destroy; __pthread_cond_init;
> __pthread_attr_setaffinity_np;
> + __pthread_attr_init; __pthread_attr_destroy;
OK.
> }
> }
>
> diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
> index ac0135422b..f218b01574 100644
> --- a/nptl/pthreadP.h
> +++ b/nptl/pthreadP.h
> @@ -347,7 +347,8 @@ extern int __pthread_create_2_1 (pthread_t *newthread,
> extern int __pthread_create_2_0 (pthread_t *newthread,
> const pthread_attr_t *attr,
> void *(*start_routine) (void *), void *arg);
> -extern int __pthread_attr_init_2_1 (pthread_attr_t *attr);
> +extern int __pthread_attr_init (pthread_attr_t *attr);
> +libc_hidden_proto (__pthread_attr_init)
> extern int __pthread_attr_init_2_0 (pthread_attr_t *attr);
>
>
> @@ -403,6 +404,7 @@ extern int __pthread_mutexattr_init (pthread_mutexattr_t *attr);
> extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *attr);
> extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind);
> extern int __pthread_attr_destroy (pthread_attr_t *attr);
> +libc_hidden_proto (__pthread_attr_destroy)
> extern int __pthread_attr_getdetachstate (const pthread_attr_t *attr,
> int *detachstate);
> extern int __pthread_attr_setdetachstate (pthread_attr_t *attr,
> diff --git a/nptl/pthread_attr_destroy.c b/nptl/pthread_attr_destroy.c
> index d20f209377..21f8026a2c 100644
> --- a/nptl/pthread_attr_destroy.c
> +++ b/nptl/pthread_attr_destroy.c
> @@ -39,4 +39,5 @@ __pthread_attr_destroy (pthread_attr_t *attr)
>
> return 0;
> }
> -strong_alias (__pthread_attr_destroy, pthread_attr_destroy)
> +libc_hidden_def (__pthread_attr_destroy)
> +weak_alias (__pthread_attr_destroy, pthread_attr_destroy)
OK.
> diff --git a/nptl/pthread_attr_init.c b/nptl/pthread_attr_init.c
> index f15cccab0a..acc22c64c4 100644
> --- a/nptl/pthread_attr_init.c
> +++ b/nptl/pthread_attr_init.c
> @@ -29,7 +29,7 @@ int __attr_list_lock = LLL_LOCK_INITIALIZER;
>
>
> int
> -__pthread_attr_init_2_1 (pthread_attr_t *attr)
> +__pthread_attr_init (pthread_attr_t *attr)
> {
> struct pthread_attr *iattr;
>
> @@ -48,7 +48,8 @@ __pthread_attr_init_2_1 (pthread_attr_t *attr)
>
> return 0;
> }
> -versioned_symbol (libc, __pthread_attr_init_2_1, pthread_attr_init, GLIBC_2_1);
> +libc_hidden_def (__pthread_attr_init)
> +versioned_symbol (libc, __pthread_attr_init, pthread_attr_init, GLIBC_2_1);
>
>
> #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_1)
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2020-05-20 14:01 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 10:43 [PATCH 00/19] Signal mask for timer helper thread Florian Weimer
2020-05-19 10:44 ` [PATCH 01/19] manual: Add missing section and node for clockid_t wait functions Florian Weimer
2020-05-20 13:12 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 02/19] nptl: Replace some stubs with the Linux implementation Florian Weimer
2020-05-20 13:27 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 03/19] nptl: Move pthread_attr_setaffinity_np into libc Florian Weimer
2020-05-20 13:31 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 04/19] nptl: Move pthread_getaffinity_np " Florian Weimer
2020-05-20 13:52 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 05/19] nptl: Move pthread_gettattr_np " Florian Weimer
2020-05-20 13:57 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 06/19] nptl: Make __pthread_attr_init, __pthread_attr_destroy available internally Florian Weimer
2020-05-20 13:59 ` Carlos O'Donell [this message]
2020-05-19 10:44 ` [PATCH 07/19] nptl: Add __pthread_attr_copy for copying pthread_attr_t objects Florian Weimer
2020-05-20 14:10 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 08/19] nptl: Use __pthread_attr_copy in pthread_getattr_default_np (bug 25999) Florian Weimer
2020-05-20 14:42 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 09/19] nptl: Use __pthread_attr_copy in pthread_setattr_default_np Florian Weimer
2020-05-20 14:48 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 10/19] <libc-symbols.h>: Add libpthread hidden alias support Florian Weimer
2020-05-20 14:51 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 11/19] nptl: Add internal alias __pthread_getattr_default_np Florian Weimer
2020-06-02 3:28 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 12/19] nptl: Use __pthread_getattr_default_np in pthread_create Florian Weimer
2020-06-02 3:34 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 13/19] nptl: Use __pthread_attr_setaffinity_np in pthread_getattr_np Florian Weimer
2020-06-02 3:36 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 14/19] nptl: Change type of __default_pthread_attr Florian Weimer
2020-06-02 3:39 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 15/19] nptl: Destroy the default thread attribute as part of freeres Florian Weimer
2020-06-02 3:41 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 16/19] nptl: Make pthread_attr_t dynamically extensible Florian Weimer
2020-06-02 3:47 ` Carlos O'Donell
2020-05-19 10:44 ` [PATCH 17/19] nptl: Add pthread_attr_setsigmask_np, pthread_attr_getsigmask_np Florian Weimer
2020-06-02 4:01 ` Carlos O'Donell
2020-05-19 10:45 ` [PATCH 18/19] manual: " Florian Weimer
2020-05-20 7:39 ` Michael Kerrisk
2020-06-03 9:26 ` Florian Weimer
2020-06-02 4:05 ` Carlos O'Donell
2020-05-19 10:45 ` [PATCH 19/19] Linux: Use __pthread_attr_setsigmask_internal for timer helper thread Florian Weimer
2020-06-02 4:07 ` Carlos O'Donell
2020-05-20 13:11 ` [PATCH 00/19] Signal mask " Carlos O'Donell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9038079b-1cee-9da5-014e-73cb92c13ad1@redhat.com \
--to=carlos@redhat.com \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).