From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 631EE3854801 for ; Thu, 18 Mar 2021 22:06:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 631EE3854801 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-195-_Kjif_OhO9ucGWo4spJGxA-1; Thu, 18 Mar 2021 18:06:35 -0400 X-MC-Unique: _Kjif_OhO9ucGWo4spJGxA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 073B518C89CC for ; Thu, 18 Mar 2021 22:06:34 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-121.ams2.redhat.com [10.36.115.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F0CE5C1D1 for ; Thu, 18 Mar 2021 22:06:33 +0000 (UTC) From: Florian Weimer To: Florian Weimer via Libc-alpha Subject: Re: [PATCH v3 00/37] libpthread removal: NPTL forwarders are gone References: Date: Thu, 18 Mar 2021 23:06:42 +0100 In-Reply-To: (Florian Weimer via Libc-alpha's message of "Tue, 16 Mar 2021 18:27:16 +0100") Message-ID: <87tup8ktfx.fsf@oldenburg.str.redhat.com> 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.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.5 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-List-Received-Date: Thu, 18 Mar 2021 22:06:38 -0000 I've pushed a rebase to fw/libpthread-20180318b. Apart from abilist merges (automatically resolved) and various nptl/Versions and nptl/Makefile conflicts (manually resolved), the main difference is this: diff --git a/nptl/pthread_exit.c b/nptl/pthread_exit.c index 1a93f371a9..6abf66463e 100644 --- a/nptl/pthread_exit.c +++ b/nptl/pthread_exit.c @@ -25,16 +25,22 @@ void __pthread_exit (void *value) { { struct unwind_link *unwind_link = __libc_unwind_link_get (); if (unwind_link == NULL) __libc_fatal (LIBGCC_S_SO " must be installed for pthread_exit to work\n"); } THREAD_SETMEM (THREAD_SELF, result, value); __do_cancel (); } libc_hidden_def (__pthread_exit) weak_alias (__pthread_exit, pthread_exit) + +/* Ensure that the unwinder is always linked in (the __pthread_unwind + reference from __do_cancel is weak). Use ___pthread_unwind_next + (three underscores) to produce a strong reference to the same + file. */ +PTHREAD_STATIC_FN_REQUIRE (___pthread_unwind_next) Without this, nptl/tst-pthread_exit-nothreads-static fails. After Adhemerval's cleanups, we no longer link in the unwinder in that minimal test program, so the call to __pthread_unwind turns into a call to a null pointer. Thanks, Florian