From patchwork Mon May 10 17:04:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 43317 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0F2D7397282D; Mon, 10 May 2021 17:04:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F2D7397282D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620666276; bh=z8LhJJGLXLhji73MHy9xe0gfi+OiTqblBp6uudxRj9E=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=PY7C1c6jhdHKvLkeKl01lV6gAP/q5IrbzOujwuXwPIaS5m3bkwQ2Bf+C46x4bibcY /+7M5hFrVToXCZ0DS4VLzZCA8CivzPXwa4MwiQKWSTZBHHw0ZEyLQJnESL8hbuIQPn og9o1OneraHrF58yWfGfDM2wM7+GZ6Ln48ACuGKY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) by sourceware.org (Postfix) with ESMTPS id E9459385740D for ; Mon, 10 May 2021 17:04:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E9459385740D Received: by mail-qv1-xf2f.google.com with SMTP id 5so4755521qvk.0 for ; Mon, 10 May 2021 10:04:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=z8LhJJGLXLhji73MHy9xe0gfi+OiTqblBp6uudxRj9E=; b=Ioe4PFOX4bgtxysIBd4+AGkKgd9qTtMnr33KmqVB6i9AyDpvb+Aoqt5AbfN2m6YNBZ /HIpuzZtXOBdAjZmYd5+VLo9+jPQIUc4vSGCyB/c3oodhMuPJsjFUmAqcCS2O9mODsZx 3gYvOUUKGDmxi/oR5d3CzigH+DpbZBDs3gKenID7cOX4dB3GGtUoivCTVwmoD92LotOS f9sXGsXRbXyzHYeLounVuKZK0M5CzjRi0/i8AqbR1YVW5zDrGa9c8NS4/w+U0oZ/DDwB KsBOgPyhxsmOYO1ERcdcfM0fNZ3e717suG5IDAhJ6sVbtw1zrFKdj4qgxXV9q/RTD7wH RK2g== X-Gm-Message-State: AOAM530wueSw9V76fcugYmXVqXQ4uLlYMLFtjXqao3b/ALcZL/EoAxSd 4bQwNkmF0FGoY3NtLws/Huc3cc1UKUtpWg== X-Google-Smtp-Source: ABdhPJwfHDIaNT9dG8VRXErM3Ee3spngsjtICFffo0BOlwt8EEhfuJXPA8TGPLCwxP76eO6RL4YNAg== X-Received: by 2002:a0c:c447:: with SMTP id t7mr24826731qvi.60.1620666271024; Mon, 10 May 2021 10:04:31 -0700 (PDT) Received: from birita.. ([177.194.37.86]) by smtp.googlemail.com with ESMTPSA id g64sm11780564qkf.41.2021.05.10.10.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 10:04:30 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 1/4] linux: Move flockfile/_IO_flockfile into libc Date: Mon, 10 May 2021 14:04:23 -0300 Message-Id: <20210510170426.2533768-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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_flockfile). Checked on x86_64-linux-gnu. --- nptl/Makefile | 2 -- stdio-common/flockfile.c | 6 ++-- sysdeps/pthread/flockfile.c | 31 ------------------- .../sysv/linux/aarch64/libpthread.abilist | 2 -- .../unix/sysv/linux/alpha/libpthread.abilist | 2 -- .../unix/sysv/linux/arc/libpthread.abilist | 2 -- .../unix/sysv/linux/arm/be/libpthread.abilist | 2 -- .../unix/sysv/linux/arm/le/libpthread.abilist | 2 -- .../unix/sysv/linux/csky/libpthread.abilist | 2 -- .../unix/sysv/linux/hppa/libpthread.abilist | 2 -- .../unix/sysv/linux/i386/libpthread.abilist | 2 -- .../unix/sysv/linux/ia64/libpthread.abilist | 2 -- .../linux/m68k/coldfire/libpthread.abilist | 2 -- .../sysv/linux/m68k/m680x0/libpthread.abilist | 2 -- .../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 -- .../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 -- .../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 -- 32 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 sysdeps/pthread/flockfile.c diff --git a/nptl/Makefile b/nptl/Makefile index f7723cb808..bc5824cd8e 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -179,7 +179,6 @@ libpthread-routines = \ cleanup \ cleanup_defer \ events \ - flockfile \ ftrylockfile \ funlockfile \ libpthread-compat \ @@ -447,7 +446,6 @@ extra-objs += $(crti-objs) $(crtn-objs) extra-objs += pt-crti.o endif -CFLAGS-flockfile.c += $(libio-mtsafe) CFLAGS-ftrylockfile.c += $(libio-mtsafe) CFLAGS-funlockfile.c += $(libio-mtsafe) diff --git a/stdio-common/flockfile.c b/stdio-common/flockfile.c index 0bc856a465..a66e0a731e 100644 --- a/stdio-common/flockfile.c +++ b/stdio-common/flockfile.c @@ -17,13 +17,13 @@ . */ #include - -#undef _IO_flockfile +#include void __flockfile (FILE *stream) { - /* Do nothing. Using this version does not do any locking. */ + stream->_flags2 |= _IO_FLAGS2_NEED_LOCK; + _IO_lock_lock (*stream->_lock); } weak_alias (__flockfile, flockfile); weak_alias (__flockfile, _IO_flockfile) diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c deleted file mode 100644 index c67d6c8535..0000000000 --- a/sysdeps/pthread/flockfile.c +++ /dev/null @@ -1,31 +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 -__flockfile (FILE *stream) -{ - stream->_flags2 |= _IO_FLAGS2_NEED_LOCK; - _IO_lock_lock (*stream->_lock); -} -strong_alias (__flockfile, _IO_flockfile) -weak_alias (__flockfile, flockfile) diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index b4f0fdd999..b5a21ad7cd 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.17 _IO_flockfile F GLIBC_2.17 _IO_ftrylockfile F GLIBC_2.17 _IO_funlockfile F GLIBC_2.17 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.17 ftrylockfile F GLIBC_2.17 funlockfile F GLIBC_2.17 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index c2017537e2..d88a55c5dc 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index bc072be61f..ddda1cb0b8 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.32 _IO_flockfile F GLIBC_2.32 _IO_ftrylockfile F GLIBC_2.32 _IO_funlockfile F GLIBC_2.32 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.32 ftrylockfile F GLIBC_2.32 funlockfile F GLIBC_2.32 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index 5b52c456fb..ae1defcddc 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist @@ -8,7 +8,6 @@ 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_flockfile F GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F @@ -17,7 +16,6 @@ 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 flockfile F GLIBC_2.4 ftrylockfile F GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index 5b52c456fb..ae1defcddc 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist @@ -8,7 +8,6 @@ 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_flockfile F GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F @@ -17,7 +16,6 @@ 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 flockfile F GLIBC_2.4 ftrylockfile F GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index d55f09a9fe..760a569b51 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.29 _IO_flockfile F GLIBC_2.29 _IO_ftrylockfile F GLIBC_2.29 _IO_funlockfile F GLIBC_2.29 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.29 ftrylockfile F GLIBC_2.29 funlockfile F GLIBC_2.29 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index 2c4a7041b6..4ff101d7f2 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -3,11 +3,9 @@ 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_flockfile F GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 1cbc49b937..36d415aef5 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index 6b87a988d4..3c59353815 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -3,11 +3,9 @@ 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_flockfile F GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index 5b52c456fb..ae1defcddc 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -8,7 +8,6 @@ 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_flockfile F GLIBC_2.4 _IO_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F @@ -17,7 +16,6 @@ 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 flockfile F GLIBC_2.4 ftrylockfile F GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 1cbc49b937..36d415aef5 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index ee29730057..5c6c7b229c 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.18 _IO_flockfile F GLIBC_2.18 _IO_ftrylockfile F GLIBC_2.18 _IO_funlockfile F GLIBC_2.18 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.18 ftrylockfile F GLIBC_2.18 funlockfile F GLIBC_2.18 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index ee29730057..5c6c7b229c 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.18 _IO_flockfile F GLIBC_2.18 _IO_ftrylockfile F GLIBC_2.18 _IO_funlockfile F GLIBC_2.18 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.18 ftrylockfile F GLIBC_2.18 funlockfile F GLIBC_2.18 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index e523996633..1d36022ee2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index e523996633..1d36022ee2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 059b21f854..5611822c38 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.21 _IO_flockfile F GLIBC_2.21 _IO_ftrylockfile F GLIBC_2.21 _IO_funlockfile F GLIBC_2.21 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.21 ftrylockfile F GLIBC_2.21 funlockfile F GLIBC_2.21 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index 84312f522b..aa24808b1e 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 2d5583ebe8..5f5abdae73 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -6,11 +6,9 @@ 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_flockfile F GLIBC_2.3 _IO_ftrylockfile F GLIBC_2.3 _IO_funlockfile F GLIBC_2.3 __errno_location F -GLIBC_2.3 flockfile F GLIBC_2.3 ftrylockfile F GLIBC_2.3 funlockfile F GLIBC_2.3 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index b4f0fdd999..b5a21ad7cd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.17 _IO_flockfile F GLIBC_2.17 _IO_ftrylockfile F GLIBC_2.17 _IO_funlockfile F GLIBC_2.17 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.17 ftrylockfile F GLIBC_2.17 funlockfile F GLIBC_2.17 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist index cc35881f1a..f0493d8973 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.33 _IO_flockfile F GLIBC_2.33 _IO_ftrylockfile F GLIBC_2.33 _IO_funlockfile F GLIBC_2.33 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.33 ftrylockfile F GLIBC_2.33 funlockfile F GLIBC_2.33 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index 6946ced1b9..c0279888a0 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.27 _IO_flockfile F GLIBC_2.27 _IO_ftrylockfile F GLIBC_2.27 _IO_funlockfile F GLIBC_2.27 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.27 ftrylockfile F GLIBC_2.27 funlockfile F GLIBC_2.27 pthread_attr_getaffinity_np F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 0c6df4a437..286aedf9ca 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index d287d8fe7a..35248d9303 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -4,11 +4,9 @@ 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_flockfile F GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index 2c4a7041b6..4ff101d7f2 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -3,11 +3,9 @@ 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_flockfile F GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index 2c4a7041b6..4ff101d7f2 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -3,11 +3,9 @@ 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_flockfile F GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index c2017537e2..d88a55c5dc 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -1,8 +1,6 @@ -GLIBC_2.0 _IO_flockfile F GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 flockfile F GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index 6b87a988d4..3c59353815 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -3,11 +3,9 @@ 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_flockfile F GLIBC_2.2 _IO_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 flockfile F GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index cea092874a..732e55148d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -3,11 +3,9 @@ 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_flockfile F GLIBC_2.2.5 _IO_ftrylockfile F GLIBC_2.2.5 _IO_funlockfile F GLIBC_2.2.5 __errno_location F -GLIBC_2.2.5 flockfile F GLIBC_2.2.5 ftrylockfile F GLIBC_2.2.5 funlockfile F GLIBC_2.2.5 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index 394748f198..22262d9ceb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -1,4 +1,3 @@ -GLIBC_2.16 _IO_flockfile F GLIBC_2.16 _IO_ftrylockfile F GLIBC_2.16 _IO_funlockfile F GLIBC_2.16 __errno_location F @@ -6,7 +5,6 @@ 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 flockfile F GLIBC_2.16 ftrylockfile F GLIBC_2.16 funlockfile F GLIBC_2.16 pthread_attr_getaffinity_np F