[07/10] nptl: Remove remaining code from libpthread
Checks
Commit Message
Only the placeholder compatibility symbols are left now.
The __errno_location symbol was removed (moved) using
scripts/move-symbol-to-libc.py.
---
nptl/Makefile | 46 ++---------------
nptl/Versions | 12 +----
nptl/libpthread-compat.c | 10 ++--
nptl/nptl-init.c | 46 -----------------
nptl/pt-crti.S | 50 -------------------
nptl/pt-interp.c | 1 -
nptl/version.c | 41 ---------------
sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c | 1 -
sysdeps/arm/nptl/Makefile | 3 --
sysdeps/ia64/nptl/Makefile | 5 --
sysdeps/mips/Makefile | 5 --
sysdeps/mips/nptl/Makefile | 5 --
sysdeps/mips/nptl/nptl-sysdep.S | 2 -
sysdeps/nptl/Makefile | 4 --
sysdeps/riscv/nptl/Makefile | 5 --
sysdeps/riscv/nptl/nptl-sysdep.S | 2 -
sysdeps/s390/nptl/Makefile | 5 --
sysdeps/sparc/Makefile | 4 --
sysdeps/sparc/nptl/Makefile | 5 --
.../sysv/linux/aarch64/libpthread.abilist | 2 +-
sysdeps/unix/sysv/linux/alpha/Makefile | 6 ---
.../unix/sysv/linux/alpha/libpthread.abilist | 2 +-
.../unix/sysv/linux/arc/libpthread.abilist | 2 +-
sysdeps/unix/sysv/linux/arm/Makefile | 5 --
.../unix/sysv/linux/arm/be/libpthread.abilist | 1 -
.../unix/sysv/linux/arm/le/libpthread.abilist | 1 -
.../unix/sysv/linux/csky/libpthread.abilist | 2 +-
.../unix/sysv/linux/hppa/libpthread.abilist | 2 +-
sysdeps/unix/sysv/linux/i386/Makefile | 11 ----
.../unix/sysv/linux/i386/libpthread.abilist | 2 +-
.../unix/sysv/linux/ia64/libpthread.abilist | 2 +-
.../linux/m68k/coldfire/libpthread.abilist | 1 -
.../sysv/linux/m68k/m680x0/libpthread.abilist | 2 +-
sysdeps/unix/sysv/linux/microblaze/Makefile | 6 ---
.../linux/microblaze/be/libpthread.abilist | 2 +-
.../linux/microblaze/le/libpthread.abilist | 2 +-
.../sysv/linux/mips/mips32/libpthread.abilist | 2 +-
.../sysv/linux/mips/mips64/libpthread.abilist | 2 +-
.../unix/sysv/linux/nios2/libpthread.abilist | 2 +-
sysdeps/unix/sysv/linux/powerpc/Makefile | 5 --
.../powerpc/powerpc32/libpthread.abilist | 2 +-
.../powerpc/powerpc64/be/libpthread.abilist | 2 +-
.../powerpc/powerpc64/le/libpthread.abilist | 2 +-
.../sysv/linux/riscv/rv32/libpthread.abilist | 2 +-
.../sysv/linux/riscv/rv64/libpthread.abilist | 2 +-
.../linux/s390/s390-32/libpthread.abilist | 2 +-
.../linux/s390/s390-64/libpthread.abilist | 2 +-
.../unix/sysv/linux/sh/be/libpthread.abilist | 2 +-
.../unix/sysv/linux/sh/le/libpthread.abilist | 2 +-
sysdeps/unix/sysv/linux/sparc/Makefile | 6 ---
.../linux/sparc/sparc32/libpthread.abilist | 2 +-
.../linux/sparc/sparc64/libpthread.abilist | 2 +-
.../sysv/linux/x86_64/64/libpthread.abilist | 2 +-
.../sysv/linux/x86_64/x32/libpthread.abilist | 2 +-
54 files changed, 37 insertions(+), 309 deletions(-)
delete mode 100644 nptl/nptl-init.c
delete mode 100644 nptl/pt-crti.S
delete mode 100644 nptl/pt-interp.c
delete mode 100644 nptl/version.c
delete mode 100644 sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c
delete mode 100644 sysdeps/mips/nptl/nptl-sysdep.S
delete mode 100644 sysdeps/riscv/nptl/nptl-sysdep.S
Comments
On 18/05/2021 11:25, Florian Weimer via Libc-alpha wrote:
> Only the placeholder compatibility symbols are left now.
>
> The __errno_location symbol was removed (moved) using
> scripts/move-symbol-to-libc.py.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> nptl/Makefile | 46 ++---------------
> nptl/Versions | 12 +----
> nptl/libpthread-compat.c | 10 ++--
> nptl/nptl-init.c | 46 -----------------
> nptl/pt-crti.S | 50 -------------------
> nptl/pt-interp.c | 1 -
> nptl/version.c | 41 ---------------
> sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c | 1 -
> sysdeps/arm/nptl/Makefile | 3 --
> sysdeps/ia64/nptl/Makefile | 5 --
> sysdeps/mips/Makefile | 5 --
> sysdeps/mips/nptl/Makefile | 5 --
> sysdeps/mips/nptl/nptl-sysdep.S | 2 -
> sysdeps/nptl/Makefile | 4 --
> sysdeps/riscv/nptl/Makefile | 5 --
> sysdeps/riscv/nptl/nptl-sysdep.S | 2 -
> sysdeps/s390/nptl/Makefile | 5 --
> sysdeps/sparc/Makefile | 4 --
> sysdeps/sparc/nptl/Makefile | 5 --
> .../sysv/linux/aarch64/libpthread.abilist | 2 +-
> sysdeps/unix/sysv/linux/alpha/Makefile | 6 ---
> .../unix/sysv/linux/alpha/libpthread.abilist | 2 +-
> .../unix/sysv/linux/arc/libpthread.abilist | 2 +-
> sysdeps/unix/sysv/linux/arm/Makefile | 5 --
> .../unix/sysv/linux/arm/be/libpthread.abilist | 1 -
> .../unix/sysv/linux/arm/le/libpthread.abilist | 1 -
> .../unix/sysv/linux/csky/libpthread.abilist | 2 +-
> .../unix/sysv/linux/hppa/libpthread.abilist | 2 +-
> sysdeps/unix/sysv/linux/i386/Makefile | 11 ----
> .../unix/sysv/linux/i386/libpthread.abilist | 2 +-
> .../unix/sysv/linux/ia64/libpthread.abilist | 2 +-
> .../linux/m68k/coldfire/libpthread.abilist | 1 -
> .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 +-
> sysdeps/unix/sysv/linux/microblaze/Makefile | 6 ---
> .../linux/microblaze/be/libpthread.abilist | 2 +-
> .../linux/microblaze/le/libpthread.abilist | 2 +-
> .../sysv/linux/mips/mips32/libpthread.abilist | 2 +-
> .../sysv/linux/mips/mips64/libpthread.abilist | 2 +-
> .../unix/sysv/linux/nios2/libpthread.abilist | 2 +-
> sysdeps/unix/sysv/linux/powerpc/Makefile | 5 --
> .../powerpc/powerpc32/libpthread.abilist | 2 +-
> .../powerpc/powerpc64/be/libpthread.abilist | 2 +-
> .../powerpc/powerpc64/le/libpthread.abilist | 2 +-
> .../sysv/linux/riscv/rv32/libpthread.abilist | 2 +-
> .../sysv/linux/riscv/rv64/libpthread.abilist | 2 +-
> .../linux/s390/s390-32/libpthread.abilist | 2 +-
> .../linux/s390/s390-64/libpthread.abilist | 2 +-
> .../unix/sysv/linux/sh/be/libpthread.abilist | 2 +-
> .../unix/sysv/linux/sh/le/libpthread.abilist | 2 +-
> sysdeps/unix/sysv/linux/sparc/Makefile | 6 ---
> .../linux/sparc/sparc32/libpthread.abilist | 2 +-
> .../linux/sparc/sparc64/libpthread.abilist | 2 +-
> .../sysv/linux/x86_64/64/libpthread.abilist | 2 +-
> .../sysv/linux/x86_64/x32/libpthread.abilist | 2 +-
> 54 files changed, 37 insertions(+), 309 deletions(-)
> delete mode 100644 nptl/nptl-init.c
> delete mode 100644 nptl/pt-crti.S
> delete mode 100644 nptl/pt-interp.c
> delete mode 100644 nptl/version.c
> delete mode 100644 sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c
> delete mode 100644 sysdeps/mips/nptl/nptl-sysdep.S
> delete mode 100644 sysdeps/riscv/nptl/nptl-sysdep.S
>
> diff --git a/nptl/Makefile b/nptl/Makefile
> index a6e3b615a8..64cd0dcbf6 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -207,16 +207,8 @@ routines = \
> shared-only-routines = forward
> static-only-routines = pthread_atfork
>
> -libpthread-routines = \
> - libpthread-compat \
> - nptl-init \
> - pt-interp \
> - version \
> -
> -libpthread-shared-only-routines = \
> - pt-allocrtsig \
> - pt-interp \
> - version \
> +libpthread-routines = libpthread-compat
> +libpthread-shared-only-routines = libpthread-compat
>
> # Since cancellation handling is in large parts handled using exceptions
> # we have to compile some files with exception handling enabled, some
Ok.
> @@ -382,7 +374,7 @@ else
> tests-printers-libs := $(static-thread-library)
> endif
>
> -LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
> +LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete
>
> tests += tst-cancelx7 tst-cancelx17
>
Ok.
> @@ -432,17 +424,6 @@ $(objpfx)multidir.mk: $(common-objpfx)config.make
> echo "multidir := $$dir" > $@T
> mv -f $@T $@
>
> -crti-objs := crti.o
> -crtn-objs := crtn.o
> -ifneq (,$(patsubst .,,$(multidir)))
> -generated-dirs += $(firstword $(subst /, , $(multidir)))
> -crti-objs += $(multidir)/crti.o
> -crtn-objs += $(multidir)/crtn.o
> -$(objpfx)$(multidir):
> - mkdir -p $@
> -endif
> -extra-objs += $(crti-objs) $(crtn-objs)
> -extra-objs += pt-crti.o
> endif
>
> CFLAGS-ftrylockfile.c += $(libio-mtsafe)
Ok.
> @@ -577,11 +558,6 @@ $(objpfx)tst-cancelx17: $(librt)
> LDLIBS-tst-cancel24 = -Wl,--no-as-needed -lstdc++
> LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24)
>
> -extra-B-pthread.so = -B$(common-objpfx)nptl/
> -$(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
> -$(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs))
> -$(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs))
> -
> # Make sure we link with the thread library.
> ifeq ($(build-shared),yes)
> $(addprefix $(objpfx), \
Ok.
> @@ -601,23 +577,7 @@ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
> endif
>
> ifeq ($(build-shared),yes)
> -$(objpfx)crti.o: $(objpfx)pt-crti.o
> - ln -f $< $@
> -
> -ifneq ($(multidir),.)
> -$(objpfx)$(multidir)/crti.o: $(objpfx)crti.o $(objpfx)$(multidir)/
> - ln -f $< $@
> -
> -$(objpfx)$(multidir)/crtn.o: $(objpfx)crtn.o $(objpfx)$(multidir)/
> - ln -f $< $@
> -endif
> -
> generated += multidir.mk tst-tls6.out
> -
> -# Give libpthread.so an entry point and make it directly runnable itself.
> -LDFLAGS-pthread.so += -e __nptl_main
> -# pt-interp.c exists just to get the runtime linker path into libpthread.so.
> -$(objpfx)pt-interp.os: $(common-objpfx)runtime-linker.h
> endif
>
> tst-exec4-ARGS = $(host-test-program-cmd)
Ok.
> diff --git a/nptl/Versions b/nptl/Versions
> index 0db56bce29..af62a47cca 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -426,17 +426,7 @@ libc {
>
> libpthread {
> GLIBC_2.0 {
> - _Exit;
> - _IO_flockfile;
> - _IO_ftrylockfile;
> - _IO_funlockfile;
> - __errno_location;
> - _exit;
> - flockfile;
> - ftrylockfile;
> - funlockfile;
> - pthread_create;
> - pthread_sigmask;
> + __libpthread_version_placeholder;
> }
>
> GLIBC_2.1 {
Ok.
> diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c
> index 2dcf175f3f..fb336d0685 100644
> --- a/nptl/libpthread-compat.c
> +++ b/nptl/libpthread-compat.c
> @@ -28,6 +28,11 @@ __libpthread_version_placeholder_1 (void)
> }
> #endif
>
> +#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34)
> +compat_symbol (libpthread, __libpthread_version_placeholder_1,
> + __libpthread_version_placeholder, GLIBC_2_0);
> +#endif
> +
> #if (SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_2))
> compat_symbol (libpthread, __libpthread_version_placeholder_1,
> __libpthread_version_placeholder, GLIBC_2_1);
> @@ -42,7 +47,7 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1,
> __libpthread_version_placeholder, GLIBC_2_1_2);
> #endif
>
> -#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_2_3) \
> +#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_3) \
> && ABI_libpthread_GLIBC_2_2 != ABI_libpthread_GLIBC_2_0
> compat_symbol (libpthread, __libpthread_version_placeholder_1,
> __libpthread_version_placeholder, GLIBC_2_2);
> @@ -88,8 +93,7 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1,
> __libpthread_version_placeholder, GLIBC_2_12);
> #endif
>
> -#if SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_19) \
> - && ABI_libpthread_GLIBC_2_18 != ABI_libpthread_GLIBC_2_0
> +#if SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_19)
> compat_symbol (libpthread, __libpthread_version_placeholder_1,
> __libpthread_version_placeholder, GLIBC_2_18);
> #endif
Ok.
> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
> deleted file mode 100644
> index 5a460aedba..0000000000
> --- a/nptl/nptl-init.c
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -/* Copyright (C) 2002-2021 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
> -
> - 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 <assert.h>
> -#include <errno.h>
> -#include <limits.h>
> -#include <signal.h>
> -#include <stdlib.h>
> -#include <unistd.h>
> -#include <sys/param.h>
> -#include <sys/resource.h>
> -#include <pthreadP.h>
> -#include <atomic.h>
> -#include <ldsodefs.h>
> -#include <tls.h>
> -#include <list.h>
> -#include <version.h>
> -#include <shlib-compat.h>
> -#include <lowlevellock.h>
> -#include <futex-internal.h>
> -#include <kernel-features.h>
> -#include <libc-pointer-arith.h>
> -#include <pthread_mutex_conf.h>
> -#include <nptl-stack.h>
> -
> -void
> -__pthread_initialize_minimal_internal (void)
> -{
> -}
> -strong_alias (__pthread_initialize_minimal_internal,
> - __pthread_initialize_minimal)
Ok.
> diff --git a/nptl/pt-crti.S b/nptl/pt-crti.S
> deleted file mode 100644
> index e618986f98..0000000000
> --- a/nptl/pt-crti.S
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -/* Special .init and .fini section support for libpthread.
> - Copyright (C) 2012-2021 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.
> -
> - In addition to the permissions in the GNU Lesser General Public
> - License, the Free Software Foundation gives you unlimited
> - permission to link the compiled version of this file with other
> - programs, and to distribute those programs without any restriction
> - coming from the use of this file. (The GNU Lesser General Public
> - License restrictions do apply in other respects; for example, they
> - cover modification of the file, and distribution when not linked
> - into another program.)
> -
> - Note that people who make modified versions of this file are not
> - obligated to grant this special exception for their modified
> - versions; it is their choice whether to do so. The GNU Lesser
> - General Public License gives permission to release a modified
> - version without this exception; this exception also makes it
> - possible to release a modified version which carries forward this
> - exception.
> -
> - 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 <elf-initfini.h>
> -
> -/* Arrange for __pthread_initialize_minimal_internal to be called at
> - libpthread startup, instead of conditionally calling
> - __gmon_start__. */
> -
> -#if ELF_INITFINI
> -# define PREINIT_FUNCTION __pthread_initialize_minimal_internal
> -# define PREINIT_FUNCTION_WEAK 0
> -
> -# include <crti.S>
> -#else
> - .section .init_array,"a",%init_array
> - .dc.a __pthread_initialize_minimal_internal
> -#endif
Ok.
> diff --git a/nptl/pt-interp.c b/nptl/pt-interp.c
> deleted file mode 100644
> index ecf1fe70df..0000000000
> --- a/nptl/pt-interp.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <elf/interp.c>
Ok.
> diff --git a/nptl/version.c b/nptl/version.c
> deleted file mode 100644
> index 25e3a0c872..0000000000
> --- a/nptl/version.c
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -/* Entry point for libpthread DSO.
> - Copyright (C) 2002-2021 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
> -
> - 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 <unistd.h>
> -#include <sysdep.h>
> -
> -
> -static const char banner[] =
> -"Native POSIX Threads Library\n\
> -Copyright (C) 2021 Free Software Foundation, Inc.\n\
> -This is free software; see the source for copying conditions.\n\
> -There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
> -PARTICULAR PURPOSE.\n"
> -"Forced unwind support included.\n"
> -;
> -
> -
> -/* This is made the e_entry of libpthread.so by LDFLAGS-pthread.so. */
> -__attribute__ ((noreturn))
> -void
> -__nptl_main (void)
> -{
> - write (STDOUT_FILENO, banner, sizeof banner - 1);
> - _exit (0);
> -}
Ok.
> diff --git a/sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c b/sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c
> deleted file mode 100644
> index 7b83522437..0000000000
> --- a/sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include <aeabi_unwind_cpp_pr1.c>
Ok.
> diff --git a/sysdeps/arm/nptl/Makefile b/sysdeps/arm/nptl/Makefile
> index 5e4905df2f..44154bff37 100644
> --- a/sysdeps/arm/nptl/Makefile
> +++ b/sysdeps/arm/nptl/Makefile
> @@ -20,9 +20,6 @@ gen-as-const-headers += tcb-offsets.sym
> endif
>
> ifeq ($(subdir),nptl)
> -libpthread-sysdep_routines += nptl-aeabi_unwind_cpp_pr1
> -libpthread-shared-only-routines += nptl-aeabi_unwind_cpp_pr1
> -
> # This test relies on compiling part of the binary with EH information,
> # part without, and unwinding through. The .ARM.exidx tables have
> # start addresses for EH regions, but no end addresses. Every
Ok.
> diff --git a/sysdeps/ia64/nptl/Makefile b/sysdeps/ia64/nptl/Makefile
> index d8a8fc44fe..d99cfd5b34 100644
> --- a/sysdeps/ia64/nptl/Makefile
> +++ b/sysdeps/ia64/nptl/Makefile
> @@ -18,8 +18,3 @@
> ifeq ($(subdir),csu)
> gen-as-const-headers += tcb-offsets.sym
> endif
> -
> -ifeq ($(subdir),nptl)
> -libpthread-routines += sysdep
> -libpthread-shared-only-routines += sysdep
> -endif
Ok.
> diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile
> index 6ad69e9ef9..19e6a57622 100644
> --- a/sysdeps/mips/Makefile
> +++ b/sysdeps/mips/Makefile
> @@ -17,11 +17,6 @@ CPPFLAGS-crti.S += $(pic-ccflag)
> CPPFLAGS-crtn.S += $(pic-ccflag)
> endif
>
> -ifeq ($(subdir),nptl)
> -CPPFLAGS-pt-crti.S += $(pic-ccflag)
> -CPPFLAGS-crtn.S += $(pic-ccflag)
> -endif
> -
> ASFLAGS-.os += $(pic-ccflag)
> # libc.a and libc_p.a must be compiled with -fPIE/-fpie for static PIE.
> ASFLAGS-.o += $(pie-default)
Ok.
> diff --git a/sysdeps/mips/nptl/Makefile b/sysdeps/mips/nptl/Makefile
> index 87ba580ec2..329a57a473 100644
> --- a/sysdeps/mips/nptl/Makefile
> +++ b/sysdeps/mips/nptl/Makefile
> @@ -18,8 +18,3 @@
> ifeq ($(subdir),csu)
> gen-as-const-headers += tcb-offsets.sym
> endif
> -
> -ifeq ($(subdir),nptl)
> -libpthread-sysdep_routines += nptl-sysdep
> -libpthread-shared-only-routines += nptl-sysdep
> -endif
Ok.
> diff --git a/sysdeps/mips/nptl/nptl-sysdep.S b/sysdeps/mips/nptl/nptl-sysdep.S
> deleted file mode 100644
> index 3f5c2a364a..0000000000
> --- a/sysdeps/mips/nptl/nptl-sysdep.S
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* Pull in __syscall_error. */
> -#include <sysdep.S>
Ok.
> diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile
> index 632cd3686b..0707f130eb 100644
> --- a/sysdeps/nptl/Makefile
> +++ b/sysdeps/nptl/Makefile
> @@ -16,10 +16,6 @@
> # License along with the GNU C Library; if not, see
> # <https://www.gnu.org/licenses/>.
>
> -ifeq ($(subdir),nptl)
> -libpthread-sysdep_routines += errno-loc
> -endif
> -
> ifeq ($(subdir),rt)
> librt-sysdep_routines += timer_routines
>
Ok.
> diff --git a/sysdeps/riscv/nptl/Makefile b/sysdeps/riscv/nptl/Makefile
> index 85ef9cf691..cca67db324 100644
> --- a/sysdeps/riscv/nptl/Makefile
> +++ b/sysdeps/riscv/nptl/Makefile
> @@ -19,8 +19,3 @@
> ifeq ($(subdir),csu)
> gen-as-const-headers += tcb-offsets.sym
> endif
> -
> -ifeq ($(subdir),nptl)
> -libpthread-sysdep_routines += nptl-sysdep
> -libpthread-shared-only-routines += nptl-sysdep
> -endif
Ok.
> diff --git a/sysdeps/riscv/nptl/nptl-sysdep.S b/sysdeps/riscv/nptl/nptl-sysdep.S
> deleted file mode 100644
> index 3f5c2a364a..0000000000
> --- a/sysdeps/riscv/nptl/nptl-sysdep.S
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* Pull in __syscall_error. */
> -#include <sysdep.S>
Ok.
> diff --git a/sysdeps/s390/nptl/Makefile b/sysdeps/s390/nptl/Makefile
> index d8a8fc44fe..d99cfd5b34 100644
> --- a/sysdeps/s390/nptl/Makefile
> +++ b/sysdeps/s390/nptl/Makefile
> @@ -18,8 +18,3 @@
> ifeq ($(subdir),csu)
> gen-as-const-headers += tcb-offsets.sym
> endif
> -
> -ifeq ($(subdir),nptl)
> -libpthread-routines += sysdep
> -libpthread-shared-only-routines += sysdep
> -endif
Ok.
> diff --git a/sysdeps/sparc/Makefile b/sysdeps/sparc/Makefile
> index c123b527b5..1be9a3db2c 100644
> --- a/sysdeps/sparc/Makefile
> +++ b/sysdeps/sparc/Makefile
> @@ -30,9 +30,5 @@ ifeq ($(subdir),nscd)
> routines += cpu_relax
> endif
>
> -ifeq ($(subdir), nptl)
> -libpthread-routines += cpu_relax
> -endif
> -
> # The assembler on SPARC needs the -fPIC flag even when it's assembler code.
> ASFLAGS-.os += -fPIC
Ok.
> diff --git a/sysdeps/sparc/nptl/Makefile b/sysdeps/sparc/nptl/Makefile
> index 5372867dbd..81bddf688c 100644
> --- a/sysdeps/sparc/nptl/Makefile
> +++ b/sysdeps/sparc/nptl/Makefile
> @@ -1,8 +1,3 @@
> ifeq ($(subdir),csu)
> gen-as-const-headers += tcb-offsets.sym
> endif
> -
> -ifeq ($(subdir),nptl)
> -CPPFLAGS-pt-crti.S += -fPIC
> -CPPFLAGS-crtn.S += -fPIC
> -endif
Ok.
> diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> index 14ada15a35..cebf7c6064 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.17 __errno_location F
> +GLIBC_2.17 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
> index 92484bbe65..d7c7d7fc16 100644
> --- a/sysdeps/unix/sysv/linux/alpha/Makefile
> +++ b/sysdeps/unix/sysv/linux/alpha/Makefile
> @@ -30,12 +30,6 @@ ifeq ($(subdir),math)
> libm-routines += multc3 divtc3
> endif # math
>
> -ifeq ($(subdir),nptl)
> -# pull in __syscall_error routine, sigaction stubs.
> -libpthread-routines += sysdep rt_sigaction
> -libpthread-shared-only-routines += sysdep rt_sigaction
> -endif
> -
> ifeq ($(subdir),conform)
> # For bug 21260.
> conformtest-xfail-conds += alpha-linux
Ok.
> diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> index 47cbcf3baf..051caff7c0 100644
> --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.1 __libpthread_version_placeholder F
> GLIBC_2.1.1 __libpthread_version_placeholder F
> GLIBC_2.1.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> index c4264810e6..cd90b49787 100644
> --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
> @@ -1 +1 @@
> -GLIBC_2.32 __errno_location F
> +GLIBC_2.32 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile
> index abdf01f00c..32db854cbd 100644
> --- a/sysdeps/unix/sysv/linux/arm/Makefile
> +++ b/sysdeps/unix/sysv/linux/arm/Makefile
> @@ -26,11 +26,6 @@ librt-sysdep_routines += libc-do-syscall
> librt-shared-only-routines += libc-do-syscall
> endif
>
> -ifeq ($(subdir),nptl)
> -libpthread-sysdep_routines += libc-do-syscall
> -libpthread-shared-only-routines += libc-do-syscall
> -endif
> -
> ifeq ($(subdir),resolv)
> libanl-sysdep_routines += libc-do-syscall
> libanl-shared-only-routines += libc-do-syscall
Ok.
> diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> index f8ebb4cae2..1774f414c6 100644
> --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
> @@ -4,5 +4,4 @@ GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> -GLIBC_2.4 __errno_location F
> GLIBC_2.4 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> index f8ebb4cae2..1774f414c6 100644
> --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
> @@ -4,5 +4,4 @@ GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> -GLIBC_2.4 __errno_location F
> GLIBC_2.4 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> index f7649b87b2..8ce9efcbf8 100644
> --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
> @@ -1,3 +1,3 @@
> -GLIBC_2.29 __errno_location F
> +GLIBC_2.29 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> index f1adf37ff2..35b6df4615 100644
> --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
> @@ -1,7 +1,7 @@
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> -GLIBC_2.2 __errno_location F
> +GLIBC_2.2 __libpthread_version_placeholder F
> GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
> index da716e2c1b..26e0a8852b 100644
> --- a/sysdeps/unix/sysv/linux/i386/Makefile
> +++ b/sysdeps/unix/sysv/linux/i386/Makefile
> @@ -18,11 +18,6 @@ ifeq ($(subdir),io)
> sysdep_routines += libc-do-syscall
> endif
>
> -ifeq ($(subdir),nptl)
> -libpthread-sysdep_routines += libc-do-syscall
> -libpthread-shared-only-routines += libc-do-syscall
> -endif
> -
> ifeq ($(subdir),stdlib)
> gen-as-const-headers += ucontext_i.sym
> endif
Ok.
> @@ -36,12 +31,6 @@ CPPFLAGS-divdi3.c = -Din_divdi3_c
> endif
> endif
>
> -ifeq ($(subdir),nptl)
> -# pull in __syscall_error routine
> -libpthread-routines += sysdep
> -libpthread-shared-only-routines += sysdep
> -endif
> -
> ifeq ($(subdir),rt)
> # pull in __syscall_error routine
> librt-routines += sysdep
Ok.
> diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> index 47cbcf3baf..051caff7c0 100644
> --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.1 __libpthread_version_placeholder F
> GLIBC_2.1.1 __libpthread_version_placeholder F
> GLIBC_2.1.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> index f1adf37ff2..35b6df4615 100644
> --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
> @@ -1,7 +1,7 @@
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> -GLIBC_2.2 __errno_location F
> +GLIBC_2.2 __libpthread_version_placeholder F
> GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> index f8ebb4cae2..1774f414c6 100644
> --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
> @@ -4,5 +4,4 @@ GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> -GLIBC_2.4 __errno_location F
> GLIBC_2.4 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> index 47cbcf3baf..051caff7c0 100644
> --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.1 __libpthread_version_placeholder F
> GLIBC_2.1.1 __libpthread_version_placeholder F
> GLIBC_2.1.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/Makefile b/sysdeps/unix/sysv/linux/microblaze/Makefile
> index d178bc6f34..614553204f 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/Makefile
> +++ b/sysdeps/unix/sysv/linux/microblaze/Makefile
> @@ -1,9 +1,3 @@
> ifeq ($(subdir),resource)
> sysdep_routines += backtrace_linux
> endif
> -
> -ifeq ($(subdir),nptl)
> -# pull in __syscall_error routine
> -libpthread-routines += sysdep
> -libpthread-shared-only-routines += sysdep
> -endif
Ok.
> diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> index c99c8b026c..419561d3ce 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.18 __errno_location F
> +GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> index c99c8b026c..419561d3ce 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.18 __errno_location F
> +GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> index 2d0b9e3542..eac5591410 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> index 2d0b9e3542..eac5591410 100644
> --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> index 4d8ff6a262..714dfd90aa 100644
> --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.21 __errno_location F
> +GLIBC_2.21 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile
> index 06f1328fab..733557ba13 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/Makefile
> +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile
> @@ -25,8 +25,3 @@ tests += $(tests-static)
> tests += test-gettimebasefreq
> tests += test-powerpc-linux-sysconf
> endif
> -
> -ifeq ($(subdir),nptl)
> -libpthread-routines += sysdep
> -libpthread-shared-only-routines += sysdep
> -endif
Ok.
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> index e545bcc56c..5623c6a313 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.1 __libpthread_version_placeholder F
> GLIBC_2.1.1 __libpthread_version_placeholder F
> GLIBC_2.1.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> index e10c836946..3246752fdd 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
> @@ -2,7 +2,7 @@ GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> -GLIBC_2.3 __errno_location F
> +GLIBC_2.3 __libpthread_version_placeholder F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> GLIBC_2.3.3 __libpthread_version_placeholder F
> GLIBC_2.3.4 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> index 14ada15a35..cebf7c6064 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.17 __errno_location F
> +GLIBC_2.17 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> index 73188776b6..d8835698d8 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
> @@ -1 +1 @@
> -GLIBC_2.33 __errno_location F
> +GLIBC_2.33 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> index 35a6a20935..fb241212a5 100644
> --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.27 __errno_location F
> +GLIBC_2.27 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
> GLIBC_2.31 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> index ac212e942a..40ce2f1fbd 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.1 __libpthread_version_placeholder F
> GLIBC_2.1.1 __libpthread_version_placeholder F
> GLIBC_2.1.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> index e0feab34d5..08ef7c4283 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
> @@ -2,7 +2,7 @@ GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.19 __libpthread_version_placeholder F
> -GLIBC_2.2 __errno_location F
> +GLIBC_2.2 __libpthread_version_placeholder F
> GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> index f1adf37ff2..35b6df4615 100644
> --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
> @@ -1,7 +1,7 @@
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> -GLIBC_2.2 __errno_location F
> +GLIBC_2.2 __libpthread_version_placeholder F
> GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> index f1adf37ff2..35b6df4615 100644
> --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
> @@ -1,7 +1,7 @@
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> -GLIBC_2.2 __errno_location F
> +GLIBC_2.2 __libpthread_version_placeholder F
> GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile
> index 1475039677..e0056c9413 100644
> --- a/sysdeps/unix/sysv/linux/sparc/Makefile
> +++ b/sysdeps/unix/sysv/linux/sparc/Makefile
> @@ -14,9 +14,3 @@ endif
> ifeq ($(subdir),signal)
> sysdep_routines += sigreturn_stub
> endif
> -
> -ifeq ($(subdir),nptl)
> -# pull in __syscall_error routine
> -libpthread-routines += sysdep sigreturn_stub
> -libpthread-shared-only-routines += sysdep sigreturn_stub
> -endif
Ok.
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> index 47cbcf3baf..051caff7c0 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.0 __errno_location F
> +GLIBC_2.0 __libpthread_version_placeholder F
> GLIBC_2.1 __libpthread_version_placeholder F
> GLIBC_2.1.1 __libpthread_version_placeholder F
> GLIBC_2.1.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> index f1adf37ff2..35b6df4615 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
> @@ -1,7 +1,7 @@
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> -GLIBC_2.2 __errno_location F
> +GLIBC_2.2 __libpthread_version_placeholder F
> GLIBC_2.2.3 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> index ec4e3c0ecd..c94ae208cb 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
> @@ -1,7 +1,7 @@
> GLIBC_2.11 __libpthread_version_placeholder F
> GLIBC_2.12 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> -GLIBC_2.2.5 __errno_location F
> +GLIBC_2.2.5 __libpthread_version_placeholder F
> GLIBC_2.2.6 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.3.2 __libpthread_version_placeholder F
> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> index cc6e073a11..38308e4ca7 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
> @@ -1,4 +1,4 @@
> -GLIBC_2.16 __errno_location F
> +GLIBC_2.16 __libpthread_version_placeholder F
> GLIBC_2.18 __libpthread_version_placeholder F
> GLIBC_2.28 __libpthread_version_placeholder F
> GLIBC_2.30 __libpthread_version_placeholder F
>
@@ -207,16 +207,8 @@ routines = \
shared-only-routines = forward
static-only-routines = pthread_atfork
-libpthread-routines = \
- libpthread-compat \
- nptl-init \
- pt-interp \
- version \
-
-libpthread-shared-only-routines = \
- pt-allocrtsig \
- pt-interp \
- version \
+libpthread-routines = libpthread-compat
+libpthread-shared-only-routines = libpthread-compat
# Since cancellation handling is in large parts handled using exceptions
# we have to compile some files with exception handling enabled, some
@@ -382,7 +374,7 @@ else
tests-printers-libs := $(static-thread-library)
endif
-LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
+LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete
tests += tst-cancelx7 tst-cancelx17
@@ -432,17 +424,6 @@ $(objpfx)multidir.mk: $(common-objpfx)config.make
echo "multidir := $$dir" > $@T
mv -f $@T $@
-crti-objs := crti.o
-crtn-objs := crtn.o
-ifneq (,$(patsubst .,,$(multidir)))
-generated-dirs += $(firstword $(subst /, , $(multidir)))
-crti-objs += $(multidir)/crti.o
-crtn-objs += $(multidir)/crtn.o
-$(objpfx)$(multidir):
- mkdir -p $@
-endif
-extra-objs += $(crti-objs) $(crtn-objs)
-extra-objs += pt-crti.o
endif
CFLAGS-ftrylockfile.c += $(libio-mtsafe)
@@ -577,11 +558,6 @@ $(objpfx)tst-cancelx17: $(librt)
LDLIBS-tst-cancel24 = -Wl,--no-as-needed -lstdc++
LDLIBS-tst-cancel24-static = $(LDLIBS-tst-cancel24)
-extra-B-pthread.so = -B$(common-objpfx)nptl/
-$(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
-$(objpfx)libpthread.so: +preinit += $(addprefix $(objpfx),$(crti-objs))
-$(objpfx)libpthread.so: +postinit += $(addprefix $(objpfx),$(crtn-objs))
-
# Make sure we link with the thread library.
ifeq ($(build-shared),yes)
$(addprefix $(objpfx), \
@@ -601,23 +577,7 @@ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
ifeq ($(build-shared),yes)
-$(objpfx)crti.o: $(objpfx)pt-crti.o
- ln -f $< $@
-
-ifneq ($(multidir),.)
-$(objpfx)$(multidir)/crti.o: $(objpfx)crti.o $(objpfx)$(multidir)/
- ln -f $< $@
-
-$(objpfx)$(multidir)/crtn.o: $(objpfx)crtn.o $(objpfx)$(multidir)/
- ln -f $< $@
-endif
-
generated += multidir.mk tst-tls6.out
-
-# Give libpthread.so an entry point and make it directly runnable itself.
-LDFLAGS-pthread.so += -e __nptl_main
-# pt-interp.c exists just to get the runtime linker path into libpthread.so.
-$(objpfx)pt-interp.os: $(common-objpfx)runtime-linker.h
endif
tst-exec4-ARGS = $(host-test-program-cmd)
@@ -426,17 +426,7 @@ libc {
libpthread {
GLIBC_2.0 {
- _Exit;
- _IO_flockfile;
- _IO_ftrylockfile;
- _IO_funlockfile;
- __errno_location;
- _exit;
- flockfile;
- ftrylockfile;
- funlockfile;
- pthread_create;
- pthread_sigmask;
+ __libpthread_version_placeholder;
}
GLIBC_2.1 {
@@ -28,6 +28,11 @@ __libpthread_version_placeholder_1 (void)
}
#endif
+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libpthread, __libpthread_version_placeholder_1,
+ __libpthread_version_placeholder, GLIBC_2_0);
+#endif
+
#if (SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_2))
compat_symbol (libpthread, __libpthread_version_placeholder_1,
__libpthread_version_placeholder, GLIBC_2_1);
@@ -42,7 +47,7 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1,
__libpthread_version_placeholder, GLIBC_2_1_2);
#endif
-#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_2_3) \
+#if SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_3) \
&& ABI_libpthread_GLIBC_2_2 != ABI_libpthread_GLIBC_2_0
compat_symbol (libpthread, __libpthread_version_placeholder_1,
__libpthread_version_placeholder, GLIBC_2_2);
@@ -88,8 +93,7 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1,
__libpthread_version_placeholder, GLIBC_2_12);
#endif
-#if SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_19) \
- && ABI_libpthread_GLIBC_2_18 != ABI_libpthread_GLIBC_2_0
+#if SHLIB_COMPAT (libpthread, GLIBC_2_18, GLIBC_2_19)
compat_symbol (libpthread, __libpthread_version_placeholder_1,
__libpthread_version_placeholder, GLIBC_2_18);
#endif
deleted file mode 100644
@@ -1,46 +0,0 @@
-/* Copyright (C) 2002-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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 <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/resource.h>
-#include <pthreadP.h>
-#include <atomic.h>
-#include <ldsodefs.h>
-#include <tls.h>
-#include <list.h>
-#include <version.h>
-#include <shlib-compat.h>
-#include <lowlevellock.h>
-#include <futex-internal.h>
-#include <kernel-features.h>
-#include <libc-pointer-arith.h>
-#include <pthread_mutex_conf.h>
-#include <nptl-stack.h>
-
-void
-__pthread_initialize_minimal_internal (void)
-{
-}
-strong_alias (__pthread_initialize_minimal_internal,
- __pthread_initialize_minimal)
deleted file mode 100644
@@ -1,50 +0,0 @@
-/* Special .init and .fini section support for libpthread.
- Copyright (C) 2012-2021 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.
-
- In addition to the permissions in the GNU Lesser General Public
- License, the Free Software Foundation gives you unlimited
- permission to link the compiled version of this file with other
- programs, and to distribute those programs without any restriction
- coming from the use of this file. (The GNU Lesser General Public
- License restrictions do apply in other respects; for example, they
- cover modification of the file, and distribution when not linked
- into another program.)
-
- Note that people who make modified versions of this file are not
- obligated to grant this special exception for their modified
- versions; it is their choice whether to do so. The GNU Lesser
- General Public License gives permission to release a modified
- version without this exception; this exception also makes it
- possible to release a modified version which carries forward this
- exception.
-
- 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 <elf-initfini.h>
-
-/* Arrange for __pthread_initialize_minimal_internal to be called at
- libpthread startup, instead of conditionally calling
- __gmon_start__. */
-
-#if ELF_INITFINI
-# define PREINIT_FUNCTION __pthread_initialize_minimal_internal
-# define PREINIT_FUNCTION_WEAK 0
-
-# include <crti.S>
-#else
- .section .init_array,"a",%init_array
- .dc.a __pthread_initialize_minimal_internal
-#endif
deleted file mode 100644
@@ -1 +0,0 @@
-#include <elf/interp.c>
deleted file mode 100644
@@ -1,41 +0,0 @@
-/* Entry point for libpthread DSO.
- Copyright (C) 2002-2021 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
- 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 <unistd.h>
-#include <sysdep.h>
-
-
-static const char banner[] =
-"Native POSIX Threads Library\n\
-Copyright (C) 2021 Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.\n\
-There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.\n"
-"Forced unwind support included.\n"
-;
-
-
-/* This is made the e_entry of libpthread.so by LDFLAGS-pthread.so. */
-__attribute__ ((noreturn))
-void
-__nptl_main (void)
-{
- write (STDOUT_FILENO, banner, sizeof banner - 1);
- _exit (0);
-}
deleted file mode 100644
@@ -1 +0,0 @@
-#include <aeabi_unwind_cpp_pr1.c>
@@ -20,9 +20,6 @@ gen-as-const-headers += tcb-offsets.sym
endif
ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += nptl-aeabi_unwind_cpp_pr1
-libpthread-shared-only-routines += nptl-aeabi_unwind_cpp_pr1
-
# This test relies on compiling part of the binary with EH information,
# part without, and unwinding through. The .ARM.exidx tables have
# start addresses for EH regions, but no end addresses. Every
@@ -18,8 +18,3 @@
ifeq ($(subdir),csu)
gen-as-const-headers += tcb-offsets.sym
endif
-
-ifeq ($(subdir),nptl)
-libpthread-routines += sysdep
-libpthread-shared-only-routines += sysdep
-endif
@@ -17,11 +17,6 @@ CPPFLAGS-crti.S += $(pic-ccflag)
CPPFLAGS-crtn.S += $(pic-ccflag)
endif
-ifeq ($(subdir),nptl)
-CPPFLAGS-pt-crti.S += $(pic-ccflag)
-CPPFLAGS-crtn.S += $(pic-ccflag)
-endif
-
ASFLAGS-.os += $(pic-ccflag)
# libc.a and libc_p.a must be compiled with -fPIE/-fpie for static PIE.
ASFLAGS-.o += $(pie-default)
@@ -18,8 +18,3 @@
ifeq ($(subdir),csu)
gen-as-const-headers += tcb-offsets.sym
endif
-
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += nptl-sysdep
-libpthread-shared-only-routines += nptl-sysdep
-endif
deleted file mode 100644
@@ -1,2 +0,0 @@
-/* Pull in __syscall_error. */
-#include <sysdep.S>
@@ -16,10 +16,6 @@
# License along with the GNU C Library; if not, see
# <https://www.gnu.org/licenses/>.
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += errno-loc
-endif
-
ifeq ($(subdir),rt)
librt-sysdep_routines += timer_routines
@@ -19,8 +19,3 @@
ifeq ($(subdir),csu)
gen-as-const-headers += tcb-offsets.sym
endif
-
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += nptl-sysdep
-libpthread-shared-only-routines += nptl-sysdep
-endif
deleted file mode 100644
@@ -1,2 +0,0 @@
-/* Pull in __syscall_error. */
-#include <sysdep.S>
@@ -18,8 +18,3 @@
ifeq ($(subdir),csu)
gen-as-const-headers += tcb-offsets.sym
endif
-
-ifeq ($(subdir),nptl)
-libpthread-routines += sysdep
-libpthread-shared-only-routines += sysdep
-endif
@@ -30,9 +30,5 @@ ifeq ($(subdir),nscd)
routines += cpu_relax
endif
-ifeq ($(subdir), nptl)
-libpthread-routines += cpu_relax
-endif
-
# The assembler on SPARC needs the -fPIC flag even when it's assembler code.
ASFLAGS-.os += -fPIC
@@ -1,8 +1,3 @@
ifeq ($(subdir),csu)
gen-as-const-headers += tcb-offsets.sym
endif
-
-ifeq ($(subdir),nptl)
-CPPFLAGS-pt-crti.S += -fPIC
-CPPFLAGS-crtn.S += -fPIC
-endif
@@ -1,4 +1,4 @@
-GLIBC_2.17 __errno_location F
+GLIBC_2.17 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
@@ -30,12 +30,6 @@ ifeq ($(subdir),math)
libm-routines += multc3 divtc3
endif # math
-ifeq ($(subdir),nptl)
-# pull in __syscall_error routine, sigaction stubs.
-libpthread-routines += sysdep rt_sigaction
-libpthread-shared-only-routines += sysdep rt_sigaction
-endif
-
ifeq ($(subdir),conform)
# For bug 21260.
conformtest-xfail-conds += alpha-linux
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.1 __libpthread_version_placeholder F
GLIBC_2.1.1 __libpthread_version_placeholder F
GLIBC_2.1.2 __libpthread_version_placeholder F
@@ -1 +1 @@
-GLIBC_2.32 __errno_location F
+GLIBC_2.32 __libpthread_version_placeholder F
@@ -26,11 +26,6 @@ librt-sysdep_routines += libc-do-syscall
librt-shared-only-routines += libc-do-syscall
endif
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += libc-do-syscall
-libpthread-shared-only-routines += libc-do-syscall
-endif
-
ifeq ($(subdir),resolv)
libanl-sysdep_routines += libc-do-syscall
libanl-shared-only-routines += libc-do-syscall
@@ -4,5 +4,4 @@ GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
-GLIBC_2.4 __errno_location F
GLIBC_2.4 __libpthread_version_placeholder F
@@ -4,5 +4,4 @@ GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
-GLIBC_2.4 __errno_location F
GLIBC_2.4 __libpthread_version_placeholder F
@@ -1,3 +1,3 @@
-GLIBC_2.29 __errno_location F
+GLIBC_2.29 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
@@ -1,7 +1,7 @@
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
-GLIBC_2.2 __errno_location F
+GLIBC_2.2 __libpthread_version_placeholder F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
@@ -18,11 +18,6 @@ ifeq ($(subdir),io)
sysdep_routines += libc-do-syscall
endif
-ifeq ($(subdir),nptl)
-libpthread-sysdep_routines += libc-do-syscall
-libpthread-shared-only-routines += libc-do-syscall
-endif
-
ifeq ($(subdir),stdlib)
gen-as-const-headers += ucontext_i.sym
endif
@@ -36,12 +31,6 @@ CPPFLAGS-divdi3.c = -Din_divdi3_c
endif
endif
-ifeq ($(subdir),nptl)
-# pull in __syscall_error routine
-libpthread-routines += sysdep
-libpthread-shared-only-routines += sysdep
-endif
-
ifeq ($(subdir),rt)
# pull in __syscall_error routine
librt-routines += sysdep
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.1 __libpthread_version_placeholder F
GLIBC_2.1.1 __libpthread_version_placeholder F
GLIBC_2.1.2 __libpthread_version_placeholder F
@@ -1,7 +1,7 @@
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
-GLIBC_2.2 __errno_location F
+GLIBC_2.2 __libpthread_version_placeholder F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
@@ -4,5 +4,4 @@ GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
-GLIBC_2.4 __errno_location F
GLIBC_2.4 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.1 __libpthread_version_placeholder F
GLIBC_2.1.1 __libpthread_version_placeholder F
GLIBC_2.1.2 __libpthread_version_placeholder F
@@ -1,9 +1,3 @@
ifeq ($(subdir),resource)
sysdep_routines += backtrace_linux
endif
-
-ifeq ($(subdir),nptl)
-# pull in __syscall_error routine
-libpthread-routines += sysdep
-libpthread-shared-only-routines += sysdep
-endif
@@ -1,4 +1,4 @@
-GLIBC_2.18 __errno_location F
+GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.18 __errno_location F
+GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.21 __errno_location F
+GLIBC_2.21 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
@@ -25,8 +25,3 @@ tests += $(tests-static)
tests += test-gettimebasefreq
tests += test-powerpc-linux-sysconf
endif
-
-ifeq ($(subdir),nptl)
-libpthread-routines += sysdep
-libpthread-shared-only-routines += sysdep
-endif
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.1 __libpthread_version_placeholder F
GLIBC_2.1.1 __libpthread_version_placeholder F
GLIBC_2.1.2 __libpthread_version_placeholder F
@@ -2,7 +2,7 @@ GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
-GLIBC_2.3 __errno_location F
+GLIBC_2.3 __libpthread_version_placeholder F
GLIBC_2.3.2 __libpthread_version_placeholder F
GLIBC_2.3.3 __libpthread_version_placeholder F
GLIBC_2.3.4 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.17 __errno_location F
+GLIBC_2.17 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
@@ -1 +1 @@
-GLIBC_2.33 __errno_location F
+GLIBC_2.33 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.27 __errno_location F
+GLIBC_2.27 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F
GLIBC_2.31 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.1 __libpthread_version_placeholder F
GLIBC_2.1.1 __libpthread_version_placeholder F
GLIBC_2.1.2 __libpthread_version_placeholder F
@@ -2,7 +2,7 @@ GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.19 __libpthread_version_placeholder F
-GLIBC_2.2 __errno_location F
+GLIBC_2.2 __libpthread_version_placeholder F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
@@ -1,7 +1,7 @@
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
-GLIBC_2.2 __errno_location F
+GLIBC_2.2 __libpthread_version_placeholder F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
@@ -1,7 +1,7 @@
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
-GLIBC_2.2 __errno_location F
+GLIBC_2.2 __libpthread_version_placeholder F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
@@ -14,9 +14,3 @@ endif
ifeq ($(subdir),signal)
sysdep_routines += sigreturn_stub
endif
-
-ifeq ($(subdir),nptl)
-# pull in __syscall_error routine
-libpthread-routines += sysdep sigreturn_stub
-libpthread-shared-only-routines += sysdep sigreturn_stub
-endif
@@ -1,4 +1,4 @@
-GLIBC_2.0 __errno_location F
+GLIBC_2.0 __libpthread_version_placeholder F
GLIBC_2.1 __libpthread_version_placeholder F
GLIBC_2.1.1 __libpthread_version_placeholder F
GLIBC_2.1.2 __libpthread_version_placeholder F
@@ -1,7 +1,7 @@
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
-GLIBC_2.2 __errno_location F
+GLIBC_2.2 __libpthread_version_placeholder F
GLIBC_2.2.3 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
@@ -1,7 +1,7 @@
GLIBC_2.11 __libpthread_version_placeholder F
GLIBC_2.12 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
-GLIBC_2.2.5 __errno_location F
+GLIBC_2.2.5 __libpthread_version_placeholder F
GLIBC_2.2.6 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.3.2 __libpthread_version_placeholder F
@@ -1,4 +1,4 @@
-GLIBC_2.16 __errno_location F
+GLIBC_2.16 __libpthread_version_placeholder F
GLIBC_2.18 __libpthread_version_placeholder F
GLIBC_2.28 __libpthread_version_placeholder F
GLIBC_2.30 __libpthread_version_placeholder F