From patchwork Sat Nov 22 20:55:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 125077 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 9EC2F3858CDA for ; Sat, 22 Nov 2025 20:56:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9EC2F3858CDA X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 047723858D3C for ; Sat, 22 Nov 2025 20:55:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 047723858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 047723858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1763844957; cv=none; b=CxaqYSIQa8CUVdOvRAvAOReTDolF9Ns2AEECXsa13O4qROGIjm1tcZE/FjVmDF+bP53WZuEbL0gwruOLeyDtWdTGpaUGLp2WB5Ytf+8GWGt+OQtx+CbqtpiWuRMQBdGlZbCYX5ZNLs7YBFpIrvaNeizbJVQ9Ne2blvzfVmIFQuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1763844957; c=relaxed/simple; bh=k799GOu5ftDeTr94jn9uZAfsErp6cR9jrSQlH3lOwUE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ucUrTF3GH0fdLGsG7rUVvMXg7KXi19/Micw/6RYKt4FAlsYTydvOWT4Nl3z1d3ADku+yXjoFthCDqCGHrhkxo7cxwHBVc0gTcAOzg/B4EsyA5dRLVmqIViM9iC/ZY1/W8U/vM8y8fpU18pJJ9wfPfWTB2VeWK5Fsl3cr+oD8DqE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 047723858D3C Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 329E8A5E37; Sat, 22 Nov 2025 21:55:56 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id De0kcJbxezLF; Sat, 22 Nov 2025 21:55:56 +0100 (CET) Received: from end (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 1893FA1DBE; Sat, 22 Nov 2025 21:55:56 +0100 (CET) Received: from samy by end with local (Exim 4.99) (envelope-from ) id 1vMueB-00000002gjc-2g8o; Sat, 22 Nov 2025 21:55:55 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] htl: Fix conditions for thread list variables Date: Sat, 22 Nov 2025 21:55:49 +0100 Message-ID: <20251122205549.640915-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_PASS, 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 _dl_stack_used/user/etc. vs _dl_pthread_num_threads etc. is really an nptl vs htl question rather than pthread being in libc. --- elf/dl-support.c | 5 +++-- sysdeps/generic/ldsodefs.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/elf/dl-support.c b/elf/dl-support.c index bbef3ab6b6..f5b7550bf5 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -169,14 +169,15 @@ fpu_control_t _dl_fpu_control = _FPU_DEFAULT; /* Required flags used for stack allocation. */ int _dl_stack_prot_flags = DEFAULT_STACK_PROT_PERMS; -#if PTHREAD_IN_LIBC +#if !defined (__PTHREAD_HTL) list_t _dl_stack_used; list_t _dl_stack_user; list_t _dl_stack_cache; size_t _dl_stack_cache_actsize; uintptr_t _dl_in_flight_stack; int _dl_stack_cache_lock; -#else +#endif +#if !PTHREAD_IN_LIBC void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls; #endif struct dl_scope_free_list *_dl_scope_free_list; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index cb318ade7b..8c3541602f 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -451,7 +451,7 @@ struct rtld_global size_t count; void *list[50]; } *_dl_scope_free_list; -#if PTHREAD_IN_LIBC +#if !defined __PTHREAD_HTL /* List of active thread stacks, with memory managed by glibc. */ EXTERN list_t _dl_stack_used;