From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 680893857C67; Tue, 11 May 2021 02:44:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 680893857C67 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] linux: Move funlockfile/_IO_funlockfile into libc X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: e874d3d189f355fdf0e9ef9c0d0f493c6cf767be X-Git-Newrev: 1abc2fba5573205fd0669f82ffd37423a094207a Message-Id: <20210511024400.680893857C67@sourceware.org> Date: Tue, 11 May 2021 02:44:00 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 02:44:00 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1abc2fba5573205fd0669f82ffd37423a094207a commit 1abc2fba5573205fd0669f82ffd37423a094207a Author: Adhemerval Zanella Date: Thu May 6 16:10:28 2021 -0300 linux: Move funlockfile/_IO_funlockfile into libc The nptl version is used as default, since now with symbol always present the single-thread optimization is tricky. Hurd is not change, it is used it own lock scheme (which call _cthreads_funlockfile). Checked on x86_64-linux-gnu. Diff: --- nptl/Makefile | 1 - stdio-common/funlockfile.c | 6 ++--- sysdeps/pthread/funlockfile.c | 30 ---------------------- sysdeps/unix/sysv/linux/aarch64/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/alpha/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/arc/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/arm/be/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/arm/le/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/csky/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/hppa/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/i386/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 2 -- .../sysv/linux/m68k/coldfire/libpthread.abilist | 2 -- .../unix/sysv/linux/m68k/m680x0/libpthread.abilist | 2 -- .../sysv/linux/microblaze/be/libpthread.abilist | 2 -- .../sysv/linux/microblaze/le/libpthread.abilist | 2 -- .../unix/sysv/linux/mips/mips32/libpthread.abilist | 2 -- .../unix/sysv/linux/mips/mips64/libpthread.abilist | 2 -- sysdeps/unix/sysv/linux/nios2/libpthread.abilist | 2 -- .../linux/powerpc/powerpc32/libpthread.abilist | 2 -- .../linux/powerpc/powerpc64/be/libpthread.abilist | 2 -- .../linux/powerpc/powerpc64/le/libpthread.abilist | 2 -- .../unix/sysv/linux/riscv/rv32/libpthread.abilist | 2 -- .../unix/sysv/linux/riscv/rv64/libpthread.abilist | 2 -- .../sysv/linux/s390/s390-32/libpthread.abilist | 2 -- .../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 -- .../sysv/linux/sparc/sparc32/libpthread.abilist | 2 -- .../sysv/linux/sparc/sparc64/libpthread.abilist | 2 -- .../unix/sysv/linux/x86_64/64/libpthread.abilist | 2 -- .../unix/sysv/linux/x86_64/x32/libpthread.abilist | 2 -- 32 files changed, 3 insertions(+), 92 deletions(-) diff --git a/nptl/Makefile b/nptl/Makefile index 64ae68238d..7b3c56f32c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -179,7 +179,6 @@ libpthread-routines = \ cleanup \ cleanup_defer \ events \ - funlockfile \ libpthread-compat \ nptl-init \ nptlfreeres \ diff --git a/stdio-common/funlockfile.c b/stdio-common/funlockfile.c index 50f2f99948..961fa3d250 100644 --- a/stdio-common/funlockfile.c +++ b/stdio-common/funlockfile.c @@ -17,13 +17,13 @@ . */ #include - -#undef _IO_funlockfile +#include +#include void __funlockfile (FILE *stream) { - /* Do nothing. Using this version does not do any locking. */ + _IO_lock_unlock (*stream->_lock); } weak_alias (__funlockfile, _IO_funlockfile) weak_alias (__funlockfile, funlockfile); diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c deleted file mode 100644 index 0ee5cb6451..0000000000 --- a/sysdeps/pthread/funlockfile.c +++ /dev/null @@ -1,30 +0,0 @@ -/* 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 -#include - - -void -__funlockfile (FILE *stream) -{ - _IO_lock_unlock (*stream->_lock); -} -strong_alias (__funlockfile, _IO_funlockfile) -weak_alias (__funlockfile, funlockfile) diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index ffbd77cedf..36f05e77dd 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.17 _IO_funlockfile F GLIBC_2.17 __errno_location F GLIBC_2.17 __pthread_register_cancel F GLIBC_2.17 __pthread_register_cancel_defer F GLIBC_2.17 __pthread_unregister_cancel F GLIBC_2.17 __pthread_unregister_cancel_restore F -GLIBC_2.17 funlockfile F GLIBC_2.17 pthread_attr_getaffinity_np F GLIBC_2.17 pthread_attr_getguardsize F GLIBC_2.17 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 3110c6df17..ad0ae35282 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index 7de7a4899e..83b55dfdb2 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.32 _IO_funlockfile F GLIBC_2.32 __errno_location F GLIBC_2.32 __pthread_register_cancel F GLIBC_2.32 __pthread_register_cancel_defer F GLIBC_2.32 __pthread_unregister_cancel F GLIBC_2.32 __pthread_unregister_cancel_restore F -GLIBC_2.32 funlockfile F GLIBC_2.32 pthread_attr_getaffinity_np F GLIBC_2.32 pthread_attr_getguardsize F GLIBC_2.32 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index 3da5d28656..af98ddd266 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -8,14 +8,12 @@ GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_join F GLIBC_2.30 __libpthread_version_placeholder F GLIBC_2.31 pthread_clockjoin_np F -GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F -GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F GLIBC_2.4 pthread_attr_getguardsize F GLIBC_2.4 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index 3da5d28656..af98ddd266 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -8,14 +8,12 @@ GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_join F GLIBC_2.30 __libpthread_version_placeholder F GLIBC_2.31 pthread_clockjoin_np F -GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F -GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F GLIBC_2.4 pthread_attr_getguardsize F GLIBC_2.4 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index 6e86cd96cd..ae0b322740 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.29 _IO_funlockfile F GLIBC_2.29 __errno_location F GLIBC_2.29 __pthread_register_cancel F GLIBC_2.29 __pthread_register_cancel_defer F GLIBC_2.29 __pthread_unregister_cancel F GLIBC_2.29 __pthread_unregister_cancel_restore F -GLIBC_2.29 funlockfile F GLIBC_2.29 pthread_attr_getaffinity_np F GLIBC_2.29 pthread_attr_getguardsize F GLIBC_2.29 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index 6dbe47e566..2a41f3b961 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -3,9 +3,7 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index e50fac2320..d8f19bb5b4 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index c136f64653..c905c119be 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -3,9 +3,7 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index 3da5d28656..af98ddd266 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -8,14 +8,12 @@ GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_join F GLIBC_2.30 __libpthread_version_placeholder F GLIBC_2.31 pthread_clockjoin_np F -GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 __pthread_register_cancel F GLIBC_2.4 __pthread_register_cancel_defer F GLIBC_2.4 __pthread_unregister_cancel F GLIBC_2.4 __pthread_unregister_cancel_restore F -GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F GLIBC_2.4 pthread_attr_getguardsize F GLIBC_2.4 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index e50fac2320..d8f19bb5b4 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index fd9fa8e1bf..fd957d6642 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.18 _IO_funlockfile F GLIBC_2.18 __errno_location F GLIBC_2.18 __pthread_register_cancel F GLIBC_2.18 __pthread_register_cancel_defer F GLIBC_2.18 __pthread_unregister_cancel F GLIBC_2.18 __pthread_unregister_cancel_restore F -GLIBC_2.18 funlockfile F GLIBC_2.18 pthread_attr_getaffinity_np F GLIBC_2.18 pthread_attr_getguardsize F GLIBC_2.18 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index fd9fa8e1bf..fd957d6642 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.18 _IO_funlockfile F GLIBC_2.18 __errno_location F GLIBC_2.18 __pthread_register_cancel F GLIBC_2.18 __pthread_register_cancel_defer F GLIBC_2.18 __pthread_unregister_cancel F GLIBC_2.18 __pthread_unregister_cancel_restore F -GLIBC_2.18 funlockfile F GLIBC_2.18 pthread_attr_getaffinity_np F GLIBC_2.18 pthread_attr_getguardsize F GLIBC_2.18 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index a607c10506..fe9d706889 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index a607c10506..fe9d706889 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index bfaf7b18cc..5497256770 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.21 _IO_funlockfile F GLIBC_2.21 __errno_location F GLIBC_2.21 __pthread_register_cancel F GLIBC_2.21 __pthread_register_cancel_defer F GLIBC_2.21 __pthread_unregister_cancel F GLIBC_2.21 __pthread_unregister_cancel_restore F -GLIBC_2.21 funlockfile F GLIBC_2.21 pthread_attr_getaffinity_np F GLIBC_2.21 pthread_attr_getguardsize F GLIBC_2.21 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index b7292ba735..b15a84fd3e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index ddd982e470..b3994cd280 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -6,9 +6,7 @@ GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.28 thrd_create F GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_join F -GLIBC_2.3 _IO_funlockfile F GLIBC_2.3 __errno_location F -GLIBC_2.3 funlockfile F GLIBC_2.3 pthread_attr_getguardsize F GLIBC_2.3 pthread_attr_getstack F GLIBC_2.3 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index ffbd77cedf..36f05e77dd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.17 _IO_funlockfile F GLIBC_2.17 __errno_location F GLIBC_2.17 __pthread_register_cancel F GLIBC_2.17 __pthread_register_cancel_defer F GLIBC_2.17 __pthread_unregister_cancel F GLIBC_2.17 __pthread_unregister_cancel_restore F -GLIBC_2.17 funlockfile F GLIBC_2.17 pthread_attr_getaffinity_np F GLIBC_2.17 pthread_attr_getguardsize F GLIBC_2.17 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist index 2f492d0934..91e3afa737 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.33 _IO_funlockfile F GLIBC_2.33 __errno_location F GLIBC_2.33 __pthread_register_cancel F GLIBC_2.33 __pthread_register_cancel_defer F GLIBC_2.33 __pthread_unregister_cancel F GLIBC_2.33 __pthread_unregister_cancel_restore F -GLIBC_2.33 funlockfile F GLIBC_2.33 pthread_attr_getaffinity_np F GLIBC_2.33 pthread_attr_getguardsize F GLIBC_2.33 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index 53363c9eca..b7bd70768f 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.27 _IO_funlockfile F GLIBC_2.27 __errno_location F GLIBC_2.27 __pthread_register_cancel F GLIBC_2.27 __pthread_register_cancel_defer F GLIBC_2.27 __pthread_unregister_cancel F GLIBC_2.27 __pthread_unregister_cancel_restore F -GLIBC_2.27 funlockfile F GLIBC_2.27 pthread_attr_getaffinity_np F GLIBC_2.27 pthread_attr_getguardsize F GLIBC_2.27 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 0a2a1eacfa..8d22b21118 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index d105c7fc36..92336b6560 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -4,9 +4,7 @@ GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F GLIBC_2.19 __libpthread_version_placeholder F -GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index 6dbe47e566..2a41f3b961 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -3,9 +3,7 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index 6dbe47e566..2a41f3b961 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -3,9 +3,7 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index 3110c6df17..ad0ae35282 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -1,6 +1,4 @@ -GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F GLIBC_2.0 pthread_detach F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index c136f64653..c905c119be 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -3,9 +3,7 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F GLIBC_2.2 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 25f59472dd..06c5f0e4af 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -3,9 +3,7 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_setattr_default_np F -GLIBC_2.2.5 _IO_funlockfile F GLIBC_2.2.5 __errno_location F -GLIBC_2.2.5 funlockfile F GLIBC_2.2.5 pthread_attr_getguardsize F GLIBC_2.2.5 pthread_attr_getstack F GLIBC_2.2.5 pthread_attr_getstackaddr F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index 0fba7f100d..298d3185bb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -1,10 +1,8 @@ -GLIBC_2.16 _IO_funlockfile F GLIBC_2.16 __errno_location F GLIBC_2.16 __pthread_register_cancel F GLIBC_2.16 __pthread_register_cancel_defer F GLIBC_2.16 __pthread_unregister_cancel F GLIBC_2.16 __pthread_unregister_cancel_restore F -GLIBC_2.16 funlockfile F GLIBC_2.16 pthread_attr_getaffinity_np F GLIBC_2.16 pthread_attr_getguardsize F GLIBC_2.16 pthread_attr_getstack F