From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by sourceware.org (Postfix) with ESMTPS id B175B393F861 for ; Wed, 19 May 2021 20:09:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B175B393F861 Received: by mail-pg1-x52d.google.com with SMTP id 27so8931552pgy.3 for ; Wed, 19 May 2021 13:09:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BxVHxCSGynlVon0I9baqXTIIQE2ao/LqTYSxiIsBEBM=; b=lg0foT7WAA4qBhIbpYCeFJLp+DCSnn90jkziKb8Zk7fwyxVpQVlfk+XWaoAxXc0NJd 6Rq5Ico3LcTn4K1bdSokP+tKYqnoq/21dqsiDrm3vS1H/O/Bg+MO+ezUlCrfGWAVkg9n BNEBowOeFfH+AW0Kd29N7XUXcqnl1ijiPf2+v19D/dIMgsIhrRzZidLUK6oeySWZSub9 SE+aRDN5Vpq/vgLMoPN/lpo3xiZh8ALEcLgpjqyBf04FJHi3ek7kDS8AxODRlSM95ydT RU4qQu548ixr/oBcVwVh+gHeMysBunz5dp8iQMQfu10DfxdPxum1xrUgXWEbiywpZUKE SQvQ== X-Gm-Message-State: AOAM531RDv5bJifwd+cBpDotKETRjOvNq9CIW3Ar4IXUUyyZexIgnc9o S3AQc8h+KWuH5fxaq6yAw8o= X-Google-Smtp-Source: ABdhPJwvi1Na9L+IawdmqVg8nolpI09HhVcJpBsoNf0wCMiuNsVXxgKIAADLfM6AQFTW1tM/gFYz3A== X-Received: by 2002:a63:ba1b:: with SMTP id k27mr826042pgf.381.1621454976762; Wed, 19 May 2021 13:09:36 -0700 (PDT) Received: from google.com ([2620:15c:2ce:200:4edd:d685:2ff9:b567]) by smtp.gmail.com with ESMTPSA id u4sm171030pgl.43.2021.05.19.13.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 13:09:36 -0700 (PDT) Date: Wed, 19 May 2021 13:09:34 -0700 From: Jonathan Nieder To: Florian Weimer Cc: libc-alpha@sourceware.org, Szabolcs Nagy Subject: Re: [PATCH] nptl: Add missing __pthread_cond_wait alias in static builds Message-ID: References: <87eee2v8tj.fsf@oldenburg.str.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87eee2v8tj.fsf@oldenburg.str.redhat.com> X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 20:09:39 -0000 Hi, Florian Weimer wrote: > Fixes commit cf3fff1c195f859ba949a7ad86d4fca70bd99740 ("nptl: Move > cnd_wait into libc"). > > I think this is the only missing strong_alias. The other places either > have a matching versioned_symbol for the __pthread_ internal alias, > already define the strong alias, or there are no internal callers. > > Tested on i686-linux-gnu and x86_64-linux-gnu. Built with > build-many-glibcs.py. > > Thanks, > Florian > --- > nptl/pthread_cond_wait.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c > index 54e504a6b5..409a99ecb7 100644 > --- a/nptl/pthread_cond_wait.c > +++ b/nptl/pthread_cond_wait.c > @@ -622,6 +622,9 @@ ___pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) > versioned_symbol (libc, ___pthread_cond_wait, pthread_cond_wait, > GLIBC_2_3_2); > libc_hidden_ver (___pthread_cond_wait, __pthread_cond_wait) > +#ifndef SHARED > +strong_alias (___pthread_cond_wait, __pthread_cond_wait) > +#endif It took me a while to catch what is going on here: the left-hand side has *three* underscores, while the right-hand side has the usual two. I think the three underscores means it's not meant to be exported, but I'm not sure; is there some documentation that covers the conventions in this area? In any event, this matches the code in similar cases, so in addition to getting the job done it's improving consistency. :) So, Reviewed-by: Jonathan Nieder Thanks.