From patchwork Tue Dec 17 11:50:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 103262 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 885313858406 for ; Tue, 17 Dec 2024 11:51:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 885313858406 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=A6I5gpcE 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 4CA4A3858D1E for ; Tue, 17 Dec 2024 11:50:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4CA4A3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4CA4A3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734436235; cv=none; b=RlvvozK0U9VA0wbVXAMAnV0+rnBitoq2sOd4988rOnVg2aWYceldhE3e8lr8acUhcwG+SaTMc4zshpj2vHrPqWe+NI3VklwKPocwFyLZt4ok0EDXLypfYhYBUvW2ga0a1YhzUeew4FkZqm5io6wT6z/05sZxZ+DosSHN5rYQuAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734436235; c=relaxed/simple; bh=bEL7nN8g4TsP7Jj378xDqASQOkurhpYoO7Q2QXMcaq4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=EnJkh0wroRb0SOwspaod9/dbpp/6n8sjDz4RdUV3Lk/3rkJg2GdTrcICspYD7HbXLyaONDsooFamVQDDsR6XmOY6PyMmb3nLLEqyYSw9ZOs3owcnWCh31oHS6/J0Q3gtnBz4SBg6qaJgYSd4kGYoH+E8HepxyUW+zDihl3Qohb0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CA4A3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734436235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=vRJ657RCz9D+gYOSicgMiux+YGRZE9vIzoDVKJRuaIk=; b=A6I5gpcE8PrTxCvjN1sN3jDkKrmAXjQwmpzPYy9v4gjQs7wAEA/9s3Z0C8X3KjPopJlO28 yhq0EsDx6S5lX3PuZDsOZdaN5p4yNkgTukOYNXiLHggMSulrwZL35lW5vDBMV6OZWbSntq ZxN99HXj8pCz4A0oYuxm2kDw5F19pOE= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-550-cPBTet4mNR6HYuqQXZCndA-1; Tue, 17 Dec 2024 06:50:33 -0500 X-MC-Unique: cPBTet4mNR6HYuqQXZCndA-1 X-Mimecast-MFC-AGG-ID: cPBTet4mNR6HYuqQXZCndA Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ACB761956046 for ; Tue, 17 Dec 2024 11:50:32 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.21]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BA55B19560AD for ; Tue, 17 Dec 2024 11:50:31 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] elf: Remove code dependent on __rtld_lock_default_lock_recursive macro Date: Tue, 17 Dec 2024 12:50:28 +0100 Message-ID: <87ldwev88r.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6ZaZQxOZK4Q3UyGaimcpEftwS39Sx4gxgivxS0k96m0_1734436232 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.3 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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Neither NPTL nor Hurd define this macro anymore. Reviewed-by: Adhemerval Zanella --- elf/dl-tls_init_tp.c | 21 --------------------- sysdeps/generic/ldsodefs.h | 6 ------ 2 files changed, 27 deletions(-) base-commit: bac29d17c7abd4c72ccbb66ba4787894085ac9ba diff --git a/elf/dl-tls_init_tp.c b/elf/dl-tls_init_tp.c index f180d16b50..4c3ca3dc4b 100644 --- a/elf/dl-tls_init_tp.c +++ b/elf/dl-tls_init_tp.c @@ -18,33 +18,12 @@ #include -#if defined SHARED && defined _LIBC_REENTRANT \ - && defined __rtld_lock_default_lock_recursive -static void -rtld_lock_default_lock_recursive (void *lock) -{ - __rtld_lock_default_lock_recursive (lock); -} - -static void -rtld_lock_default_unlock_recursive (void *lock) -{ - __rtld_lock_default_unlock_recursive (lock); -} -#endif - void __tls_pre_init_tp (void) { #if !PTHREAD_IN_LIBC GL(dl_init_static_tls) = &_dl_nothread_init_static_tls; #endif - -#if defined SHARED && defined _LIBC_REENTRANT \ - && defined __rtld_lock_default_lock_recursive - GL(dl_rtld_lock_recursive) = rtld_lock_default_lock_recursive; - GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive; -#endif } void diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index dd1fd62fc1..cec56e2214 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -392,12 +392,6 @@ struct rtld_global /* List of search directories. */ EXTERN struct r_search_path_elem *_dl_all_dirs; -#if !PTHREAD_IN_LIBC && defined SHARED \ - && defined __rtld_lock_default_lock_recursive - EXTERN void (*_dl_rtld_lock_recursive) (void *); - EXTERN void (*_dl_rtld_unlock_recursive) (void *); -#endif - /* Get architecture specific definitions. */ #define PROCINFO_DECL #ifndef PROCINFO_CLASS