From: Adhemerval Zanella Date: Mon, 15 Mar 2021 14:02:21 +0000 (-0300) Subject: nptl: Move system to libc X-Git-Tag: glibc-2.34~805 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5ddd583da7ee8928eebfa1d7eee69b557deec9c;p=thirdparty%2Fglibc.git nptl: Move system to libc The libc version is identical and built with same flags. Checked on x86_64-linux-gnu. --- diff --git a/nptl/Makefile b/nptl/Makefile index 9befd09df8a..d3704401fbc 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -114,7 +114,6 @@ libpthread-routines = \ pt-interp \ pt-longjmp \ pt-raise \ - pt-system \ pthread_attr_getaffinity \ pthread_attr_getguardsize \ pthread_attr_getstack \ @@ -296,8 +295,6 @@ CFLAGS-send.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-sigsuspend.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-fdatasync.c += -fexceptions -fasynchronous-unwind-tables -CFLAGS-pt-system.c += -fexceptions - CFLAGS-futex-internal.c += -fexceptions -fasynchronous-unwind-tables LDLIBS-tst-once5 = -lstdc++ diff --git a/nptl/Versions b/nptl/Versions index 58d1ff29b4a..be7a8e68cc2 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -173,7 +173,6 @@ libpthread { send; sigaction; siglongjmp; - system; } GLIBC_2.1 { diff --git a/nptl/pt-system.c b/nptl/pt-system.c deleted file mode 100644 index 29d4b85bc66..00000000000 --- a/nptl/pt-system.c +++ /dev/null @@ -1,45 +0,0 @@ -/* ABI compatibility for 'system' symbol in libpthread ABI. - Copyright (C) 2002-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 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 - . */ - -#include -#include - -/* libpthread once had its own 'system', though there was no apparent - reason for it. There is no use in having a separate symbol in - libpthread, but the historical ABI requires it. For static linking, - there is no need to provide anything here--the libc version will be - linked in. For shared library ABI compatibility, there must be a - 'system' symbol in libpthread.so. - - With an IFUNC resolver, it would be possible to avoid the indirection, - but the IFUNC resolver might run before the __libc_system symbol has - been relocated, in which case the IFUNC resolver would not be able to - provide the correct address. */ - -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22) - -static int __attribute__ ((used)) -system_compat (const char *line) -{ - return __libc_system (line); -} -strong_alias (system_compat, system_alias) -compat_symbol (libpthread, system_alias, system, GLIBC_2_0); - -#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index e7151c22b22..bbd24afae2b 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -165,7 +165,6 @@ GLIBC_2.17 sem_wait F GLIBC_2.17 send F GLIBC_2.17 sigaction F GLIBC_2.17 siglongjmp F -GLIBC_2.17 system F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index d7896883ded..ec2128b5ab6 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F GLIBC_2.1 __libc_current_sigrtmin F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index e035da62e48..6abba5736df 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -194,4 +194,3 @@ GLIBC_2.4 sem_wait F GLIBC_2.4 send F GLIBC_2.4 sigaction F GLIBC_2.4 siglongjmp F -GLIBC_2.4 system F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index e035da62e48..6abba5736df 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -194,4 +194,3 @@ GLIBC_2.4 sem_wait F GLIBC_2.4 send F GLIBC_2.4 sigaction F GLIBC_2.4 siglongjmp F -GLIBC_2.4 system F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index db3a338b646..8c729752d00 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -145,7 +145,6 @@ GLIBC_2.2 sem_wait F GLIBC_2.2 send F GLIBC_2.2 sigaction F GLIBC_2.2 siglongjmp F -GLIBC_2.2 system F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 16d260f10e6..aa748acf8f0 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F GLIBC_2.1 __libc_current_sigrtmin F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index 8c1c1a410e3..479dfb394dd 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -145,7 +145,6 @@ GLIBC_2.2 sem_wait F GLIBC_2.2 send F GLIBC_2.2 sigaction F GLIBC_2.2 siglongjmp F -GLIBC_2.2 system F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index e035da62e48..6abba5736df 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -194,4 +194,3 @@ GLIBC_2.4 sem_wait F GLIBC_2.4 send F GLIBC_2.4 sigaction F GLIBC_2.4 siglongjmp F -GLIBC_2.4 system F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 16d260f10e6..aa748acf8f0 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F GLIBC_2.1 __libc_current_sigrtmin F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index edb07d4c27d..a1f250b9f50 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -167,7 +167,6 @@ GLIBC_2.18 sem_wait F GLIBC_2.18 send F GLIBC_2.18 sigaction F GLIBC_2.18 siglongjmp F -GLIBC_2.18 system F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F GLIBC_2.28 cnd_destroy F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index edb07d4c27d..a1f250b9f50 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -167,7 +167,6 @@ GLIBC_2.18 sem_wait F GLIBC_2.18 send F GLIBC_2.18 sigaction F GLIBC_2.18 siglongjmp F -GLIBC_2.18 system F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F GLIBC_2.28 cnd_destroy F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 430b3b27347..9c35d0da80f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.11 pthread_sigqueue F GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_mutex_consistent F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 430b3b27347..9c35d0da80f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.11 pthread_sigqueue F GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_mutex_consistent F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index a54ce2564ae..afdbd3d2866 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -167,7 +167,6 @@ GLIBC_2.21 sem_wait F GLIBC_2.21 send F GLIBC_2.21 sigaction F GLIBC_2.21 siglongjmp F -GLIBC_2.21 system F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F GLIBC_2.28 cnd_destroy F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 72214252700..9c173663abd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F GLIBC_2.1 __libc_current_sigrtmin F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 27209507ca3..3d14cbccfeb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -165,7 +165,6 @@ GLIBC_2.3 sem_wait F GLIBC_2.3 send F GLIBC_2.3 sigaction F GLIBC_2.3 siglongjmp F -GLIBC_2.3 system F GLIBC_2.3.2 pthread_cond_broadcast F GLIBC_2.3.2 pthread_cond_signal F GLIBC_2.3.2 pthread_cond_timedwait F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index e7151c22b22..bbd24afae2b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -165,7 +165,6 @@ GLIBC_2.17 sem_wait F GLIBC_2.17 send F GLIBC_2.17 sigaction F GLIBC_2.17 siglongjmp F -GLIBC_2.17 system F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 96f1604b71b..aeeeae51a3c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F GLIBC_2.1 __libc_current_sigrtmin F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index 0e0548f08e6..105842b87e9 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -147,7 +147,6 @@ GLIBC_2.2 sem_wait F GLIBC_2.2 send F GLIBC_2.2 sigaction F GLIBC_2.2 siglongjmp F -GLIBC_2.2 system F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index db3a338b646..8c729752d00 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -145,7 +145,6 @@ GLIBC_2.2 sem_wait F GLIBC_2.2 send F GLIBC_2.2 sigaction F GLIBC_2.2 siglongjmp F -GLIBC_2.2 system F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index db3a338b646..8c729752d00 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -145,7 +145,6 @@ GLIBC_2.2 sem_wait F GLIBC_2.2 send F GLIBC_2.2 sigaction F GLIBC_2.2 siglongjmp F -GLIBC_2.2 system F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index d7896883ded..ec2128b5ab6 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -68,7 +68,6 @@ GLIBC_2.0 sem_wait F GLIBC_2.0 send F GLIBC_2.0 sigaction F GLIBC_2.0 siglongjmp F -GLIBC_2.0 system F GLIBC_2.1 __libc_allocate_rtsig F GLIBC_2.1 __libc_current_sigrtmax F GLIBC_2.1 __libc_current_sigrtmin F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index 8c1c1a410e3..479dfb394dd 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -145,7 +145,6 @@ GLIBC_2.2 sem_wait F GLIBC_2.2 send F GLIBC_2.2 sigaction F GLIBC_2.2 siglongjmp F -GLIBC_2.2 system F GLIBC_2.2.3 __libpthread_version_placeholder F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index f911712d2fd..0211160097e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -145,7 +145,6 @@ GLIBC_2.2.5 sem_wait F GLIBC_2.2.5 send F GLIBC_2.2.5 sigaction F GLIBC_2.2.5 siglongjmp F -GLIBC_2.2.5 system F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 call_once F GLIBC_2.28 cnd_broadcast F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index de3749d4275..e79b5d6e289 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -165,7 +165,6 @@ GLIBC_2.16 sem_wait F GLIBC_2.16 send F GLIBC_2.16 sigaction F GLIBC_2.16 siglongjmp F -GLIBC_2.16 system F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.28 call_once F