From 49e182c7376b0fa30c18d0b7003a8e84624494c0 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 21 May 2021 22:35:01 +0200 Subject: nptl: Remove remaining code from libpthread Only the placeholder compatibility symbols are left now. The __errno_location symbol was removed (moved) using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella --- 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 ----- sysdeps/unix/sysv/linux/aarch64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/alpha/Makefile | 6 ------ sysdeps/unix/sysv/linux/alpha/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/arc/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/arm/Makefile | 5 ----- sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/csky/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/hppa/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/i386/Makefile | 11 ----------- sysdeps/unix/sysv/linux/i386/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist | 1 - sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/microblaze/Makefile | 6 ------ sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/nios2/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/powerpc/Makefile | 5 ----- sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist | 2 +- .../unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 2 +- .../unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/sh/be/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/sh/le/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/sparc/Makefile | 6 ------ sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 2 +- sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 2 +- 47 files changed, 26 insertions(+), 114 deletions(-) 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 (limited to 'sysdeps') 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 7b83522..0000000 --- a/sysdeps/arm/nptl-aeabi_unwind_cpp_pr1.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/arm/nptl/Makefile b/sysdeps/arm/nptl/Makefile index 5e4905d..44154bf 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 diff --git a/sysdeps/ia64/nptl/Makefile b/sysdeps/ia64/nptl/Makefile index d8a8fc4..d99cfd5 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 diff --git a/sysdeps/mips/Makefile b/sysdeps/mips/Makefile index 6ad69e9..19e6a57 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) diff --git a/sysdeps/mips/nptl/Makefile b/sysdeps/mips/nptl/Makefile index 87ba580..329a57a 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 diff --git a/sysdeps/mips/nptl/nptl-sysdep.S b/sysdeps/mips/nptl/nptl-sysdep.S deleted file mode 100644 index 3f5c2a3..0000000 --- a/sysdeps/mips/nptl/nptl-sysdep.S +++ /dev/null @@ -1,2 +0,0 @@ -/* Pull in __syscall_error. */ -#include diff --git a/sysdeps/nptl/Makefile b/sysdeps/nptl/Makefile index 632cd36..0707f13 100644 --- a/sysdeps/nptl/Makefile +++ b/sysdeps/nptl/Makefile @@ -16,10 +16,6 @@ # License along with the GNU C Library; if not, see # . -ifeq ($(subdir),nptl) -libpthread-sysdep_routines += errno-loc -endif - ifeq ($(subdir),rt) librt-sysdep_routines += timer_routines diff --git a/sysdeps/riscv/nptl/Makefile b/sysdeps/riscv/nptl/Makefile index 85ef9cf..cca67db 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 diff --git a/sysdeps/riscv/nptl/nptl-sysdep.S b/sysdeps/riscv/nptl/nptl-sysdep.S deleted file mode 100644 index 3f5c2a3..0000000 --- a/sysdeps/riscv/nptl/nptl-sysdep.S +++ /dev/null @@ -1,2 +0,0 @@ -/* Pull in __syscall_error. */ -#include diff --git a/sysdeps/s390/nptl/Makefile b/sysdeps/s390/nptl/Makefile index d8a8fc4..d99cfd5 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 diff --git a/sysdeps/sparc/Makefile b/sysdeps/sparc/Makefile index c123b52..1be9a3d 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 diff --git a/sysdeps/sparc/nptl/Makefile b/sysdeps/sparc/nptl/Makefile index 5372867..81bddf6 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 diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 14ada15..cebf7c6 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 92484bb..d7c7d7f 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 diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 47cbcf3..051caff 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 c426481..cd90b49 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 abdf01f..32db854 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 diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index f8ebb4c..1774f41 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 f8ebb4c..1774f41 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 f7649b8..8ce9efc 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 f1adf37..35b6df4 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 da716e2..26e0a88 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 @@ -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 diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 47cbcf3..051caff 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 f1adf37..35b6df4 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 f8ebb4c..1774f41 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 47cbcf3..051caff 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 d178bc6..6145532 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 diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index c99c8b0..419561d 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 c99c8b0..419561d 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 2d0b9e3..eac5591 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 2d0b9e3..eac5591 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 4d8ff6a..714dfd9 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 06f1328..733557b 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 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index e545bcc..5623c6a 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 e10c836..3246752 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 14ada15..cebf7c6 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 7318877..d883569 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 35a6a20..fb24121 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 ac212e9..40ce2f1 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 e0feab3..08ef7c4 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 f1adf37..35b6df4 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 f1adf37..35b6df4 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 1475039..e0056c9 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 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 47cbcf3..051caff 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 f1adf37..35b6df4 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 ec4e3c0..c94ae20 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 cc6e073..38308e4 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 -- cgit v1.1