From patchwork Sat Oct 29 12:00:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 59628 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 5ACC33858431 for ; Sat, 29 Oct 2022 16:16:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5ACC33858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667060203; bh=4MEiK92JDbQZdLz8jyiE1y0p8KRPbdKToIZgVbduq4w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=gZ02998WcBLedPqGeJNoEKEjMUfa4x45IbNnYT9tCUs6WnVRnCBn9GDOON78OGr8S vMIyuDkUWpVKXbTd2WIvDANKrbSAna3mcsXec/+FiWDv3ZAB955rc5njI+Y0jyvsj2 H0DKnfeUwpdc8T5gjbxwo4J6nuSDg0FzhfvyC5LU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 512A53858402 for ; Sat, 29 Oct 2022 16:16:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 512A53858402 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 016F340A2D; Sat, 29 Oct 2022 18:16:12 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2wvqo0PsVWBx; Sat, 29 Oct 2022 18:16:10 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH 2/4] htl: move ___pthread_self to libc Date: Sat, 29 Oct 2022 13:00:28 +0100 Message-Id: <20221029120030.1448-3-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Cc: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" htl/Makefile(routine): add pt-dep-self htl/Versions(___pthread_self): add to libc symbol sysdeps/mach/hurd/htl/pt-dep-self.c: New file sysdeps/mach/hurd/htl/pt-sysdep.c(___pthread_seld): remove definition. sysdeps/mach/hurd/htl/pt-sysdep.h(___pthread_self): add hidden property --- htl/Makefile | 3 ++- htl/Versions | 1 + sysdeps/mach/hurd/htl/pt-dep-self.c | 22 ++++++++++++++++++++++ sysdeps/mach/hurd/htl/pt-sysdep.c | 2 +- sysdeps/mach/hurd/htl/pt-sysdep.h | 3 +++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 sysdeps/mach/hurd/htl/pt-dep-self.c diff --git a/htl/Makefile b/htl/Makefile index ad0e2645..72e37fbd 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -164,7 +164,8 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \ + pt-dep-self shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 113110f4..9ec84811 100644 --- a/htl/Versions +++ b/htl/Versions @@ -31,6 +31,7 @@ libc { __libc_pthread_init; __pthread_cleanup_stack; __pthread_total; + ___pthread_self; } } diff --git a/sysdeps/mach/hurd/htl/pt-dep-self.c b/sysdeps/mach/hurd/htl/pt-dep-self.c new file mode 100644 index 00000000..82cb0524 --- /dev/null +++ b/sysdeps/mach/hurd/htl/pt-dep-self.c @@ -0,0 +1,22 @@ +/* Thread counter variable. + Copyright (C) 2021-2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include "pt-sysdep.h" + +__thread struct __pthread *___pthread_self; +libc_hidden_tls_def (___pthread_self) diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.c b/sysdeps/mach/hurd/htl/pt-sysdep.c index 2d828545..3597166d 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.c +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c @@ -26,7 +26,7 @@ #include #include -__thread struct __pthread *___pthread_self; +#include "pt-sysdep.h" static void reset_pthread_total (void) diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.h b/sysdeps/mach/hurd/htl/pt-sysdep.h index 854c365c..b28c60d0 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.h +++ b/sysdeps/mach/hurd/htl/pt-sysdep.h @@ -20,6 +20,7 @@ #define _PT_SYSDEP_H 1 #include +#include /* XXX */ #define _POSIX_THREAD_THREADS_MAX 64 @@ -32,6 +33,8 @@ mach_msg_header_t wakeupmsg; extern __thread struct __pthread *___pthread_self; +libc_hidden_tls_proto (___pthread_self) + #ifdef DEBUG #define _pthread_self() \ ({ \