From patchwork Wed Feb 17 17:21:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42087 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BB1503848011; Wed, 17 Feb 2021 17:21:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB1503848011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613582462; bh=TJLbDDscdBlUS/YHIyjtQiE2O3IdwRWQr1vz5Kif2xw=; 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=i6fcq8dIwAh9buIFA7NrvfFMoXvNk9t9rnWO3mzZvdBOnJPewsCGTJlAYwRYxVz6i fY39XNWnUmB+WMyN38pEDxbW1uudurA9Nnq5VSiVkedDPkE0KJJiYZhzE+WpPXaKK2 0IfadEGPF9bIATmU2bcFTnJETV3v3TQGU345GdOQ= 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 27F253854808 for ; Wed, 17 Feb 2021 17:21:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 27F253854808 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-565-9oshLW5DN6GBFuOPloEg5A-1; Wed, 17 Feb 2021 12:20:57 -0500 X-MC-Unique: 9oshLW5DN6GBFuOPloEg5A-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C99ED85B6C5 for ; Wed, 17 Feb 2021 17:20:56 +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 EDDDC5D74E for ; Wed, 17 Feb 2021 17:20:55 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 1/6] nptl: Split libpthread-routines into one routine per line In-Reply-To: References: Message-Id: <26e80fbbc1331f7b7adaac2ccdf1434fcdb57fa3.1613582255.git.fweimer@redhat.com> Date: Wed, 17 Feb 2021 18:21:27 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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" And sort the lines lexicographically. This will make it easier to review patches which move symbols from libpthread to libc. Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 238 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 152 insertions(+), 86 deletions(-) diff --git a/nptl/Makefile b/nptl/Makefile index 8fb7fee6db..94c3873623 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -85,92 +85,158 @@ pthread-compat-wrappers = \ sigwait sigsuspend \ recvmsg sendmsg -libpthread-routines = nptl-init nptlfreeres vars events version pt-interp \ - pthread_create pthread_exit pthread_detach \ - pthread_join pthread_tryjoin pthread_timedjoin \ - pthread_clockjoin pthread_join_common pthread_yield \ - pthread_getconcurrency pthread_setconcurrency \ - pthread_setschedprio \ - pthread_attr_getguardsize pthread_attr_setguardsize \ - pthread_attr_getstackaddr pthread_attr_setstackaddr \ - pthread_attr_getstacksize pthread_attr_setstacksize \ - pthread_attr_getstack pthread_attr_setstack \ - pthread_mutex_init pthread_mutex_destroy \ - pthread_mutex_lock pthread_mutex_trylock \ - pthread_mutex_timedlock pthread_mutex_unlock \ - pthread_mutex_cond_lock \ - pthread_mutexattr_init pthread_mutexattr_destroy \ - pthread_mutexattr_getpshared \ - pthread_mutexattr_setpshared \ - pthread_mutexattr_gettype pthread_mutexattr_settype \ - pthread_rwlock_init pthread_rwlock_destroy \ - pthread_rwlock_rdlock pthread_rwlock_timedrdlock \ - pthread_rwlock_clockrdlock \ - pthread_rwlock_wrlock pthread_rwlock_timedwrlock \ - pthread_rwlock_clockwrlock \ - pthread_rwlock_tryrdlock pthread_rwlock_trywrlock \ - pthread_rwlock_unlock \ - pthread_rwlockattr_init pthread_rwlockattr_destroy \ - pthread_rwlockattr_getpshared \ - pthread_rwlockattr_setpshared \ - pthread_rwlockattr_getkind_np \ - pthread_rwlockattr_setkind_np \ - pthread_cond_wait \ - pthread_cond_signal pthread_cond_broadcast \ - old_pthread_cond_wait old_pthread_cond_timedwait \ - old_pthread_cond_signal old_pthread_cond_broadcast \ - pthread_condattr_getpshared pthread_condattr_setpshared \ - pthread_condattr_getclock pthread_condattr_setclock \ - pthread_spin_init pthread_spin_destroy \ - pthread_spin_lock pthread_spin_trylock \ - pthread_spin_unlock \ - pthread_barrier_init pthread_barrier_destroy \ - pthread_barrier_wait \ - pthread_barrierattr_init pthread_barrierattr_destroy \ - pthread_barrierattr_getpshared \ - pthread_barrierattr_setpshared \ - pthread_key_create pthread_key_delete \ - pthread_getspecific pthread_setspecific \ - pthread_kill pthread_sigqueue \ - pthread_cancel pthread_testcancel \ - pthread_setcancelstate pthread_setcanceltype \ - pthread_once \ - old_pthread_atfork \ - pthread_getcpuclockid \ - sem_init sem_destroy sem_routines \ - sem_open sem_close sem_unlink \ - sem_getvalue \ - sem_wait sem_timedwait sem_clockwait sem_post \ - cleanup cleanup_defer cleanup_compat \ - cleanup_defer_compat unwind \ - pt-longjmp pt-cleanup\ - cancellation \ - lowlevellock \ - pt-fork pt-fcntl \ - $(pthread-compat-wrappers) \ - pt-raise pt-system \ - flockfile ftrylockfile funlockfile \ - sigaction \ - herrno res pt-allocrtsig \ - pthread_kill_other_threads \ - pthread_setaffinity \ - pthread_attr_getaffinity \ - pthread_mutexattr_getrobust pthread_mutexattr_setrobust \ - pthread_mutex_consistent \ - cleanup_routine unwind-forcedunwind \ - pthread_mutexattr_getprotocol \ - pthread_mutexattr_setprotocol \ - pthread_mutexattr_getprioceiling \ - pthread_mutexattr_setprioceiling tpp \ - pthread_mutex_getprioceiling \ - pthread_mutex_setprioceiling \ - pthread_setname pthread_getname \ - pthread_setattr_default_np pthread_getattr_default_np \ - pthread_mutex_conf \ - libpthread-compat - -libpthread-shared-only-routines = version pt-interp pt-allocrtsig \ - unwind-forcedunwind +libpthread-routines = \ + $(pthread-compat-wrappers) \ + cancellation \ + cleanup \ + cleanup_compat \ + cleanup_defer \ + cleanup_defer_compat \ + cleanup_routine \ + events \ + flockfile \ + ftrylockfile \ + funlockfile \ + herrno \ + libpthread-compat \ + lowlevellock \ + nptl-init \ + nptlfreeres \ + old_pthread_atfork \ + old_pthread_cond_broadcast \ + old_pthread_cond_signal \ + old_pthread_cond_timedwait \ + old_pthread_cond_wait \ + pt-allocrtsig \ + pt-cleanup \ + pt-fcntl \ + pt-fork \ + pt-interp \ + pt-longjmp \ + pt-raise \ + pt-system \ + pthread_attr_getaffinity \ + pthread_attr_getguardsize \ + pthread_attr_getstack \ + pthread_attr_getstackaddr \ + pthread_attr_getstacksize \ + pthread_attr_setguardsize \ + pthread_attr_setstack \ + pthread_attr_setstackaddr \ + pthread_attr_setstacksize \ + pthread_barrier_destroy \ + pthread_barrier_init \ + pthread_barrier_wait \ + pthread_barrierattr_destroy \ + pthread_barrierattr_getpshared \ + pthread_barrierattr_init \ + pthread_barrierattr_setpshared \ + pthread_cancel \ + pthread_clockjoin \ + pthread_cond_broadcast \ + pthread_cond_signal \ + pthread_cond_wait \ + pthread_condattr_getclock \ + pthread_condattr_getpshared \ + pthread_condattr_setclock \ + pthread_condattr_setpshared \ + pthread_create \ + pthread_detach \ + pthread_exit \ + pthread_getattr_default_np \ + pthread_getconcurrency \ + pthread_getcpuclockid \ + pthread_getname \ + pthread_getspecific \ + pthread_join \ + pthread_join_common \ + pthread_key_create \ + pthread_key_delete \ + pthread_kill \ + pthread_kill_other_threads \ + pthread_mutex_cond_lock \ + pthread_mutex_conf \ + pthread_mutex_consistent \ + pthread_mutex_destroy \ + pthread_mutex_getprioceiling \ + pthread_mutex_init \ + pthread_mutex_lock \ + pthread_mutex_setprioceiling \ + pthread_mutex_timedlock \ + pthread_mutex_trylock \ + pthread_mutex_unlock \ + pthread_mutexattr_destroy \ + pthread_mutexattr_getprioceiling \ + pthread_mutexattr_getprotocol \ + pthread_mutexattr_getpshared \ + pthread_mutexattr_getrobust \ + pthread_mutexattr_gettype \ + pthread_mutexattr_init \ + pthread_mutexattr_setprioceiling \ + pthread_mutexattr_setprotocol \ + pthread_mutexattr_setpshared \ + pthread_mutexattr_setrobust \ + pthread_mutexattr_settype \ + pthread_once \ + pthread_rwlock_clockrdlock \ + pthread_rwlock_clockwrlock \ + pthread_rwlock_destroy \ + pthread_rwlock_init \ + pthread_rwlock_rdlock \ + pthread_rwlock_timedrdlock \ + pthread_rwlock_timedwrlock \ + pthread_rwlock_tryrdlock \ + pthread_rwlock_trywrlock \ + pthread_rwlock_unlock \ + pthread_rwlock_wrlock \ + pthread_rwlockattr_destroy \ + pthread_rwlockattr_getkind_np \ + pthread_rwlockattr_getpshared \ + pthread_rwlockattr_init \ + pthread_rwlockattr_setkind_np \ + pthread_rwlockattr_setpshared \ + pthread_setaffinity \ + pthread_setattr_default_np \ + pthread_setcancelstate \ + pthread_setcanceltype \ + pthread_setconcurrency \ + pthread_setname \ + pthread_setschedprio \ + pthread_setspecific \ + pthread_sigqueue \ + pthread_spin_destroy \ + pthread_spin_init \ + pthread_spin_lock \ + pthread_spin_trylock \ + pthread_spin_unlock \ + pthread_testcancel \ + pthread_timedjoin \ + pthread_tryjoin \ + pthread_yield \ + res \ + sem_clockwait \ + sem_close \ + sem_destroy \ + sem_getvalue \ + sem_init \ + sem_open \ + sem_post \ + sem_routines \ + sem_timedwait \ + sem_unlink \ + sem_wait \ + sigaction \ + tpp \ + unwind \ + unwind-forcedunwind \ + vars \ + version \ + +libpthread-shared-only-routines = \ + pt-allocrtsig \ + pt-interp \ + unwind-forcedunwind \ + version \ # Since cancellation handling is in large parts handled using exceptions # we have to compile some files with exception handling enabled, some