From patchwork Wed Jul 17 13:08:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 94069 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 E3CB4385E45D for ; Wed, 17 Jul 2024 13:09:01 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 9DF7C385DDE1 for ; Wed, 17 Jul 2024 13:08:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9DF7C385DDE1 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 9DF7C385DDE1 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=1721221720; cv=none; b=nAqtHersqAEn9qo8sIkBsvRPnRXgiNsZtZ8II7cLpGIX7yQ+/TdjOkt9awJTjFlV1GIZ2ZcVXZ7WUbX+y2gkYVz4/z17Ojyw5bLOy1bdpHJszp67QK6Z0tBVBhbI8k2KwVK9VLSB9f4xqtR1MGu1dTQsNPmb5ZX+FH/lM/r2pWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721221720; c=relaxed/simple; bh=F4hbDq/xea9b6LoEQKlvuxs/zmPZOiWJEfvKCXEHxr0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=bK0carddkZL8omdMeEqFHs1mS/Rr6/BcJWDHl0YttZPm5mkfu0C28pHYoJxtg6jqwY08rVZHmtRtooMvg+hV+cvCYmfx9UszqyHCYoRLqHpsIRxiPeb0jhRziSO92i1bWP/O6XW4wv9ek3gzLerC9Y7gWs0CToXaqouwM84AYlQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 4C434A03B7; Wed, 17 Jul 2024 15:08:35 +0200 (CEST) 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 EmgQJKM5x7CL; Wed, 17 Jul 2024 15:08:35 +0200 (CEST) Received: from begin (nat-inria-interne-52-gw-01-bso.bordeaux.inria.fr [194.199.1.52]) (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 A462CA03B5; Wed, 17 Jul 2024 15:08:34 +0200 (CEST) Received: from samy by begin with local (Exim 4.98-RC3) (envelope-from ) id 1sU4OV-0000000F6cA-04at; Wed, 17 Jul 2024 15:08:31 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited] htl: Fix __pthread_init_thread declaration and definition Date: Wed, 17 Jul 2024 15:08:30 +0200 Message-ID: <20240717130830.3600338-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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 0e75c4a4634f ("hurd: Fix pthread_self() without libpthread") added a declaration for ___pthread_init_thread instead of __pthread_init_thread, and missed defining the external hidden symbol. --- sysdeps/mach/hurd/htl/pt-pthread_self.c | 1 + sysdeps/mach/hurd/htl/pt-sysdep.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sysdeps/mach/hurd/htl/pt-pthread_self.c b/sysdeps/mach/hurd/htl/pt-pthread_self.c index 08ef2e4956..d11d0ec676 100644 --- a/sysdeps/mach/hurd/htl/pt-pthread_self.c +++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c @@ -24,6 +24,7 @@ struct __pthread __pthread_init_thread = { .thread = 1, }; +libc_hidden_def (__pthread_init_thread) __thread struct __pthread *___pthread_self = &__pthread_init_thread; libc_hidden_tls_def (___pthread_self) diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.h b/sysdeps/mach/hurd/htl/pt-sysdep.h index ef7f509611..8e94395be7 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.h +++ b/sysdeps/mach/hurd/htl/pt-sysdep.h @@ -34,8 +34,8 @@ extern __thread struct __pthread *___pthread_self; libc_hidden_tls_proto (___pthread_self) -extern struct __pthread ___pthread_init_thread; -libc_hidden_proto (___pthread_init_thread) +extern struct __pthread __pthread_init_thread; +libc_hidden_proto (__pthread_init_thread) #ifdef DEBUG #define _pthread_self() \