From patchwork Wed Feb 17 17:21:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1441302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=T41jK4nT; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dgl4X41QDz9sRf for ; Thu, 18 Feb 2021 04:21:32 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8B626394740B; Wed, 17 Feb 2021 17:21:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B626394740B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613582490; bh=F5qMlXi4BORqxiHgrExAg+el69wFUa39PxxI5SvxMHY=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=T41jK4nT+XukW4lgBGaHgLCcr1CyODxDxprnbns85D+YIOFSxj6uOeuJWL+RfXZTG BjX3ZV3p2lWJuZOmKo6m3GSzo6N0C7uYmWGpvF7MltmLpLCBSGXQ99a68dLobk4t94 14t+yT/9zeaPwPsB2XW0Gsei5e8iAXzzUoo0QLu0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 3318F3945C3C for ; Wed, 17 Feb 2021 17:21:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3318F3945C3C Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-503-eAFXWFMQOamZ8CyMLrCwPQ-1; Wed, 17 Feb 2021 12:21:24 -0500 X-MC-Unique: eAFXWFMQOamZ8CyMLrCwPQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A1F6107ACFA for ; Wed, 17 Feb 2021 17:21:24 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-131.ams2.redhat.com [10.36.113.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3732910013D7 for ; Wed, 17 Feb 2021 17:21:22 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 5/6] nptl: Move futex-internal into libc In-Reply-To: References: Message-Id: Date: Wed, 17 Feb 2021 18:21:55 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This moves __futex_abstimed_wait64 and __futex_abstimed_wait_cancelable64 and exports these functions as GLIBC_PRIVATE. 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 \ 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; @@ -387,8 +389,6 @@ libpthread { } GLIBC_PRIVATE { - __futex_abstimed_wait64; - __futex_abstimed_wait_cancelable64; __libpthread_freeres; __pthread_barrier_init; __pthread_barrier_wait; 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) 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