| Message ID | 20230318095826.1125734-3-gfleury@disroot.org |
|---|---|
| State | New |
| Headers | show |
| Series | htl: move some symbol into libc | expand |
Applied, thanks! Guy-Fleury Iteriteka via Libc-alpha, le sam. 18 mars 2023 11:58:25 +0200, a ecrit: > 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. > > Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org> > --- > 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 9194c4fb..622e85ce 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..c100471b > --- /dev/null > +++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c > @@ -0,0 +1,22 @@ > +/* ___pthread_self 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 > + <https://www.gnu.org/licenses/>. */ > + > +#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 0e8b537b..55b1a86e 100644 > --- a/sysdeps/mach/hurd/htl/pt-sysdep.c > +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c > @@ -26,8 +26,6 @@ > #include <pt-internal.h> > #include <pthreadP.h> > > -__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 bb32c28e..d533450b 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 <stddef.h> > #include <mach.h> > > /* 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.30.2 >
diff --git a/htl/Makefile b/htl/Makefile index 9194c4fb..622e85ce 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..c100471b --- /dev/null +++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c @@ -0,0 +1,22 @@ +/* ___pthread_self 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 + <https://www.gnu.org/licenses/>. */ + +#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 0e8b537b..55b1a86e 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.c +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c @@ -26,8 +26,6 @@ #include <pt-internal.h> #include <pthreadP.h> -__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 bb32c28e..d533450b 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 <stddef.h> #include <mach.h> /* 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() \ ({ \
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. Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org> --- 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