From f47f1d91af985a9028fb399da21eab460d887a15 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 21 May 2021 22:35:00 +0200 Subject: nptl: Move pthread_create, thrd_create into libc The symbols were moved using scripts/move-symbol-to-libc.py. The libpthread placeholder symbols need some changes because some symbol versions have gone away completely. But __errno_location@@GLIBC_2.0 still exists, so the GLIBC_2.0 version is still there. The internal __pthread_create symbol now points to the correct function, so the sysdeps/nptl/thrd_create.c override is no longer necessary. There was an issue how the hidden alias of pthread_getattr_default_np was defined, so this commit cleans up that aspects and removes the GLIBC_PRIVATE export altogether. Reviewed-by: Adhemerval Zanella --- nptl_db/Makefile | 2 +- nptl_db/structs.def | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'nptl_db') diff --git a/nptl_db/Makefile b/nptl_db/Makefile index 8873a0a0ee..ea721c1dcf 100644 --- a/nptl_db/Makefile +++ b/nptl_db/Makefile @@ -56,7 +56,7 @@ tests-special += $(objpfx)db-symbols.out include ../Rules $(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \ - $(common-objpfx)nptl/libpthread.so + $(common-objpfx)libc.so LC_ALL=C $(READELF) -W -s $(filter %.so,$^) | $(AWK) -f $< > $@; \ $(evaluate-test) diff --git a/nptl_db/structs.def b/nptl_db/structs.def index 71c9f7bfc2..6a726f207e 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -1,4 +1,4 @@ -/* List of types and symbols in libpthread examined by libthread_db. +/* List of types and symbols in libc examined by libthread_db. Copyright (C) 2003-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -27,7 +27,7 @@ #endif /* DB_MAIN_VARIABLE, DB_MAIN_SYMBOL, DB_MAIN_ARRAY_VARIABLE are not - covered by the libpthread symbol check in db-symbols.awk. */ + covered by the libc symbol check in db-symbols.awk. */ #ifndef DB_MAIN_VARIABLE # define DB_MAIN_VARIABLE(name) DB_VARIABLE (name) #endif @@ -39,7 +39,7 @@ #endif #ifndef DB_RTLD_GLOBAL_FIELD -# if !IS_IN (libpthread) +# if !IS_IN (libc) # define DB_RTLD_GLOBAL_FIELD(field) \ DB_STRUCT_FIELD (rtld_global, _##field) \ DB_MAIN_VARIABLE (_##field) @@ -103,11 +103,11 @@ DB_STRUCT_ARRAY_FIELD (dtv, dtv) #define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */ DB_STRUCT_FIELD (dtv_t, pointer_val) DB_STRUCT_FIELD (dtv_t, counter) -#if !IS_IN (libpthread) || TLS_TCB_AT_TP +#if !IS_IN (libc) || TLS_TCB_AT_TP DB_STRUCT_FIELD (pthread, dtvp) #endif -#if !(IS_IN (libpthread) && !defined SHARED) +#if !(IS_IN (libc) && !defined SHARED) DB_VARIABLE (__nptl_rtld_global) #endif DB_RTLD_GLOBAL_FIELD (dl_tls_dtv_slotinfo_list) -- cgit 1.4.1