From patchwork Mon May 10 17:04:24 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: 1476591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=SaHy25OQ; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Ff6qH0RnXz9sWq for ; Tue, 11 May 2021 03:04:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9DCE23857439; Mon, 10 May 2021 17:04:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9DCE23857439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620666277; bh=5q0ApDlsCKulAoN15Z5P+smWTn8xg8AmneZ23sHUaEY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=SaHy25OQAwgANH14oJRTd2A41QgT/PGEHfvPH4E08ehdFflO4KRAaeebQYdpulkKC qmvU6FCE/MCLS2Z2HzrAXhCngjJJwohL4gCbBHrkYO9H9bbn7pPvfUSRqA5NUSl8Mj 3LlMrkt9/MG9frqhFEWeASXg+6D92xxFz0ddy0J8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by sourceware.org (Postfix) with ESMTPS id 40CB03857439 for ; Mon, 10 May 2021 17:04:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 40CB03857439 Received: by mail-qv1-xf2c.google.com with SMTP id h1so8702300qvv.10 for ; Mon, 10 May 2021 10:04:33 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=5q0ApDlsCKulAoN15Z5P+smWTn8xg8AmneZ23sHUaEY=; b=euffuGMYreBi2ENs2U94V4yXKYhN1bqyIpmMcSl06/+ONuEC6qapYaGO56etVwMRss +vEbPpoUQL2iE7CCFp847pw0ZCR4oMECH12rYLjNqQXLni6vpXz6NHyMhE7VNF/p10Qa JSUp92C6ZwrYUzwI6APyEjjDRurhfXvGYLnYPOOO2+mb4SzVgCPV3PwS4KYuMsl3bGIN FxjHXUHgp/KKKKAvGivUodSzenWXcK8Bl7u/uOW3S4q2ara2ald0y+YxrGSbyk2BMKKs FjRnBvV2si4r+vbXzMgPG6AI1fgkvmLQZNhDm8nJE2hz1G4v9uPUC8qMNoSUha23313o rZKg== X-Gm-Message-State: AOAM533jL9n2LlVIqbPdH5iH5fuDK9QhrJw6V7peDwybM3pLZ3BHN6Z2 VuQRaTGuNXF9u/L8Pbv5IBAIT6/LdiHDkA== X-Google-Smtp-Source: ABdhPJwO1vS0I80ZTpDxe6bfuH4C6/ZKfftuS8FjZP4SqRsSyhVm5QRG7z3JSsSJRMeilOdDC72nVw== X-Received: by 2002:a0c:e601:: with SMTP id z1mr24655702qvm.62.1620666272379; Mon, 10 May 2021 10:04:32 -0700 (PDT) Received: from birita.. ([177.194.37.86]) by smtp.googlemail.com with ESMTPSA id g64sm11780564qkf.41.2021.05.10.10.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 10:04:32 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/4] linux: Move ftrylockfile/_IO_ftrylockfile into libc Date: Mon, 10 May 2021 14:04:24 -0300 Message-Id: <20210510170426.2533768-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210510170426.2533768-1-adhemerval.zanella@linaro.org> References: <20210510170426.2533768-1-adhemerval.zanella@linaro.org> 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_ftrylockfile). Checked on x86_64-linux-gnu. --- nptl/Makefile | 1 - stdio-common/ftrylockfile.c | 7 ++--- sysdeps/pthread/ftrylockfile.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/ftrylockfile.c diff --git a/nptl/Makefile b/nptl/Makefile index bc5824cd8e..64ae68238d 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -179,7 +179,6 @@ libpthread-routines = \ cleanup \ cleanup_defer \ events \ - ftrylockfile \ funlockfile \ libpthread-compat \ nptl-init \ diff --git a/stdio-common/ftrylockfile.c b/stdio-common/ftrylockfile.c index 4f7e2dd617..f7e2ef6137 100644 --- a/stdio-common/ftrylockfile.c +++ b/stdio-common/ftrylockfile.c @@ -17,14 +17,13 @@ . */ #include - -#undef _IO_ftrylockfile +#include +#include int __ftrylockfile (FILE *stream) { - /* Do nothing. Using this version does not do any locking. */ - return 1; + return _IO_lock_trylock (*stream->_lock); } weak_alias (__ftrylockfile, ftrylockfile); weak_alias (__ftrylockfile, _IO_ftrylockfile) diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c deleted file mode 100644 index 5138005bdc..0000000000 --- a/sysdeps/pthread/ftrylockfile.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 -#include - - -int -__ftrylockfile (FILE *stream) -{ - return _IO_lock_trylock (*stream->_lock); -} -strong_alias (__ftrylockfile, _IO_ftrylockfile) -weak_alias (__ftrylockfile, ftrylockfile) diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index b5a21ad7cd..ffbd77cedf 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.17 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.17 funlockfile F GLIBC_2.17 pthread_attr_getaffinity_np F GLIBC_2.17 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index d88a55c5dc..3110c6df17 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index ddda1cb0b8..7de7a4899e 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.32 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.32 funlockfile F GLIBC_2.32 pthread_attr_getaffinity_np F GLIBC_2.32 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist index ae1defcddc..3da5d28656 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_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F @@ -16,7 +15,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 ftrylockfile F GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F GLIBC_2.4 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist index ae1defcddc..3da5d28656 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_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F @@ -16,7 +15,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 ftrylockfile F GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F GLIBC_2.4 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index 760a569b51..6e86cd96cd 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.29 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.29 funlockfile F GLIBC_2.29 pthread_attr_getaffinity_np F GLIBC_2.29 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index 4ff101d7f2..6dbe47e566 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -3,10 +3,8 @@ 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_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 36d415aef5..e50fac2320 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index 3c59353815..c136f64653 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -3,10 +3,8 @@ 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_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index ae1defcddc..3da5d28656 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_ftrylockfile F GLIBC_2.4 _IO_funlockfile F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F @@ -16,7 +15,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 ftrylockfile F GLIBC_2.4 funlockfile F GLIBC_2.4 pthread_attr_getaffinity_np F GLIBC_2.4 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 36d415aef5..e50fac2320 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index 5c6c7b229c..fd9fa8e1bf 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.18 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.18 funlockfile F GLIBC_2.18 pthread_attr_getaffinity_np F GLIBC_2.18 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index 5c6c7b229c..fd9fa8e1bf 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.18 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.18 funlockfile F GLIBC_2.18 pthread_attr_getaffinity_np F GLIBC_2.18 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 1d36022ee2..a607c10506 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 1d36022ee2..a607c10506 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 5611822c38..bfaf7b18cc 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.21 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.21 funlockfile F GLIBC_2.21 pthread_attr_getaffinity_np F GLIBC_2.21 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index aa24808b1e..b7292ba735 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 5f5abdae73..ddd982e470 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -6,10 +6,8 @@ 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_ftrylockfile F GLIBC_2.3 _IO_funlockfile F GLIBC_2.3 __errno_location F -GLIBC_2.3 ftrylockfile F GLIBC_2.3 funlockfile F GLIBC_2.3 pthread_attr_getguardsize F GLIBC_2.3 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index b5a21ad7cd..ffbd77cedf 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.17 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.17 funlockfile F GLIBC_2.17 pthread_attr_getaffinity_np F GLIBC_2.17 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist index f0493d8973..2f492d0934 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.33 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.33 funlockfile F GLIBC_2.33 pthread_attr_getaffinity_np F GLIBC_2.33 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index c0279888a0..53363c9eca 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.27 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.27 funlockfile F GLIBC_2.27 pthread_attr_getaffinity_np F GLIBC_2.27 pthread_attr_getguardsize F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 286aedf9ca..0a2a1eacfa 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index 35248d9303..d105c7fc36 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -4,10 +4,8 @@ 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_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist index 4ff101d7f2..6dbe47e566 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist @@ -3,10 +3,8 @@ 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_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist index 4ff101d7f2..6dbe47e566 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist @@ -3,10 +3,8 @@ 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_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index d88a55c5dc..3110c6df17 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -1,7 +1,5 @@ -GLIBC_2.0 _IO_ftrylockfile F GLIBC_2.0 _IO_funlockfile F GLIBC_2.0 __errno_location F -GLIBC_2.0 ftrylockfile F GLIBC_2.0 funlockfile F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index 3c59353815..c136f64653 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -3,10 +3,8 @@ 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_ftrylockfile F GLIBC_2.2 _IO_funlockfile F GLIBC_2.2 __errno_location F -GLIBC_2.2 ftrylockfile F GLIBC_2.2 funlockfile F GLIBC_2.2 pthread_attr_getguardsize F GLIBC_2.2 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 732e55148d..25f59472dd 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -3,10 +3,8 @@ 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_ftrylockfile F GLIBC_2.2.5 _IO_funlockfile F GLIBC_2.2.5 __errno_location F -GLIBC_2.2.5 ftrylockfile F GLIBC_2.2.5 funlockfile F GLIBC_2.2.5 pthread_attr_getguardsize F GLIBC_2.2.5 pthread_attr_getstack F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index 22262d9ceb..0fba7f100d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -1,11 +1,9 @@ -GLIBC_2.16 _IO_ftrylockfile F 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 ftrylockfile F GLIBC_2.16 funlockfile F GLIBC_2.16 pthread_attr_getaffinity_np F GLIBC_2.16 pthread_attr_getguardsize F