From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by sourceware.org (Postfix) with ESMTPS id 49871385801D for ; Mon, 22 Feb 2021 16:39:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 49871385801D Received: by mail-qt1-x82b.google.com with SMTP id z6so9125548qts.0 for ; Mon, 22 Feb 2021 08:39:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/hifkUwt/Ag79W8jV+MMSL8ANxTdD3CTf00SrvLYqFc=; b=JjV4HwPKcLH+vLQia/PYx15SHhSOn4Q/hp3Ln2sG3+Jv4lia4gOjAmnsopsBrKK+sr buXHkNGMDb945fDa9W1WWMPg7wxIC52YJhQu8wmTRglxT1dM1AshobVcx4WH0ymtOUaS yLbjDgUhH4J9Kysj2r0ccLdJ8gouBp4GsSIsPP5if8FKhvinQ8bXnmMajwhvDsge1A51 o7V2R4ZAxCQnqOriRQxZ1algbnXWAc9yYB7soUbPVJ67B/kFbvrGd6A6aDV2rc8huyjk vw82R0cKRuo7nDpVVTwR2ePb5QAyGIkLHjRdWnnr+yVedO9xhPNEYPsRChsJ5qmiG3dD oXdw== X-Gm-Message-State: AOAM5320fVqIHFtz93X6D2r4DiijFMtTjs7yw/inEQJc8TrwZkktvdB2 ApTzPqQT1UO5TeiFOG16LKBDqlVX87d2HQ== X-Google-Smtp-Source: ABdhPJzdYermlQrcHuAALs/huhFBe7znMsBlwE24NqpRY21uWO5FetJpE9qQCJEgYFYIpg6fTf77zQ== X-Received: by 2002:ac8:1115:: with SMTP id c21mr20918963qtj.389.1614011988731; Mon, 22 Feb 2021 08:39:48 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id b190sm12860541qkg.103.2021.02.22.08.39.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Feb 2021 08:39:48 -0800 (PST) Subject: Re: [PATCH 5/6] nptl: Move futex-internal into libc To: Florian Weimer , libc-alpha@sourceware.org References: From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <9d3c0da1-f8ae-a719-b5dc-f8726a576f7a@linaro.org> Date: Mon, 22 Feb 2021 13:39:46 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, 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: Mon, 22 Feb 2021 16:39:50 -0000 On 17/02/2021 14:21, Florian Weimer via Libc-alpha wrote: > This moves __futex_abstimed_wait64 and > __futex_abstimed_wait_cancelable64 and exports these functions as > GLIBC_PRIVATE. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > nptl/Makefile | 2 +- > nptl/Versions | 4 ++-- > nptl/futex-internal.c | 4 ++-- > sysdeps/nptl/futex-internal.h | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/nptl/Makefile b/nptl/Makefile > index 62f368af1e..4dd9c6a6a8 100644 > --- a/nptl/Makefile > +++ b/nptl/Makefile > @@ -31,6 +31,7 @@ extra-libs-others := $(extra-libs) > routines = \ > alloca_cutoff \ > forward \ > + futex-internal \ > libc-cancellation \ > libc-cleanup \ > libc_multiple_threads \ > @@ -97,7 +98,6 @@ libpthread-routines = \ > flockfile \ > ftrylockfile \ > funlockfile \ > - futex-internal \ > herrno \ > libpthread-compat \ > nptl-init \ Ok. > diff --git a/nptl/Versions b/nptl/Versions > index 694747bb44..6cca579a0a 100644 > --- a/nptl/Versions > +++ b/nptl/Versions > @@ -71,6 +71,8 @@ libc { > pthread_sigmask; > } > GLIBC_PRIVATE { > + __futex_abstimed_wait64; > + __futex_abstimed_wait_cancelable64; > __libc_alloca_cutoff; > __libc_allocate_rtsig_private; > __libc_current_sigrtmax_private; Ok. > @@ -387,8 +389,6 @@ libpthread { > } > > GLIBC_PRIVATE { > - __futex_abstimed_wait64; > - __futex_abstimed_wait_cancelable64; > __libpthread_freeres; > __pthread_barrier_init; > __pthread_barrier_wait; Ok. > diff --git a/nptl/futex-internal.c b/nptl/futex-internal.c > index 89b4ba76e9..850bf4fd83 100644 > --- a/nptl/futex-internal.c > +++ b/nptl/futex-internal.c > @@ -112,7 +112,7 @@ __futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected, > return __futex_abstimed_wait_common64 (futex_word, expected, clockid, > abstime, private, false); > } > -libpthread_hidden_def (__futex_abstimed_wait64) > +libc_hidden_def (__futex_abstimed_wait64) > > int > __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, > @@ -123,4 +123,4 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, > return __futex_abstimed_wait_common64 (futex_word, expected, clockid, > abstime, private, true); > } > -libpthread_hidden_def (__futex_abstimed_wait_cancelable64) > +libc_hidden_def (__futex_abstimed_wait_cancelable64) Ok. > diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h > index 4c192c99e3..969ab2bf4b 100644 > --- a/sysdeps/nptl/futex-internal.h > +++ b/sysdeps/nptl/futex-internal.h > @@ -345,14 +345,14 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, > unsigned int expected, clockid_t clockid, > const struct __timespec64* abstime, > int private); > -libpthread_hidden_proto (__futex_abstimed_wait_cancelable64); > +libc_hidden_proto (__futex_abstimed_wait_cancelable64); > > int > __futex_abstimed_wait64 (unsigned int* futex_word, unsigned int expected, > clockid_t clockid, > const struct __timespec64* abstime, > int private); > -libpthread_hidden_proto (__futex_abstimed_wait64); > +libc_hidden_proto (__futex_abstimed_wait64); > > > static __always_inline int > Ok.