From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 861243858C83 for ; Tue, 3 Jan 2023 10:45:26 +0000 (GMT) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B997B408B1; Tue, 3 Jan 2023 11:45:24 +0100 (CET) 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 GuSne-0g2gst; Tue, 3 Jan 2023 11:45:23 +0100 (CET) From: Guy-Fleury Iteriteka DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1672742723; bh=ylJklYSM8+zNWGQUK1g0/ZI2lN0xO3NTJOix5Gj+mrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FMXVmKM9sNHTX98nEPnIRMfB4PveLlFDxDmLhhMqbpEUi/enuSpS1+McZ52k9QtTC D5kQz99QDgSzt2qEODp6H6khR3EZ9pdcNWPPiiHrYbhYaiqRB7DkUklMnKSsTKoe7o 8JILzHh+rVaQaKynRTvmk6UEPrlsRal8PYpXEThak1rwi8k1k4IWqb5apjHANVK5pz JHRNeG0sw3VsoEH1QBSKYqN4eoC6aovPFomjPnI4411A+KvLGQEBFJ+AXaC35Qr02o Nqz+74BpOKOtlRz8c1ZvzxPxV8wiW1wE9I80bLbWvSRGvV24v5FRFHfgj84/nK/KU3 E4AvThb/wyPvQ== To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org Subject: [PATCH 2/3] htl: move ___pthread_self into libc. Date: Tue, 3 Jan 2023 12:45:14 +0200 Message-Id: <20230103104515.324527-3-gfleury@disroot.org> In-Reply-To: <20230103104515.324527-1-gfleury@disroot.org> References: <20230103104515.324527-1-gfleury@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,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 List-Id: sysdeps/mach/hurd/htl/pt-pthread_self.c: New file. htl/Makefile: .. Add it to libc routine. sysdeps/mach/hurd/htl/pt-sysdep.c(__pthread_self): Remove it. sysdeps/mach/hurd/htl/pt-sysdep.h(__pthread_self): Add hidden propertie. htl/Versions(__pthread_self) Version it as private symbol. --- htl/Makefile | 2 +- htl/Versions | 1 + sysdeps/mach/hurd/htl/pt-pthread_self.c | 22 ++++++++++++++++++++++ sysdeps/mach/hurd/htl/pt-sysdep.c | 2 -- sysdeps/mach/hurd/htl/pt-sysdep.h | 3 +++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 sysdeps/mach/hurd/htl/pt-pthread_self.c diff --git a/htl/Makefile b/htl/Makefile index 61944148..b569cfcd 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -164,7 +164,7 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_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-pthread_self.c b/sysdeps/mach/hurd/htl/pt-pthread_self.c new file mode 100644 index 00000000..6398af65 --- /dev/null +++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c @@ -0,0 +1,22 @@ +/* Thread counter variable. + Copyright (C) 2021-2023 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 + +__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..4cd6ba3a 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.c +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c @@ -26,8 +26,6 @@ #include #include -__thread struct __pthread *___pthread_self; - 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..94d77678 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.h +++ b/sysdeps/mach/hurd/htl/pt-sysdep.h @@ -19,6 +19,7 @@ #ifndef _PT_SYSDEP_H #define _PT_SYSDEP_H 1 +#include #include /* XXX */ @@ -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() \ ({ \ -- 2.38.1