From patchwork Thu Jun 3 23:17:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43713 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 89029399000B for ; Thu, 3 Jun 2021 23:42:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89029399000B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622763772; bh=5X9dSdMWBWTHBjw+ClDb1z8vExXTMST7JtyxXyiZWpk=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=jYPQOuDeOvEKYvRrBmic0HxEWnzHk4r0h+TH+D+g8w0w6u7TDIm1LtwIx7Bd4iB0E Jkc1ghpo62I8FzlRQHuxGNLnUO8TTydEixz5f5P/vf8Nj3Fgj/f6UUE1a1+JUB0Q9J kJvqHx6/BmBtxNJ3dpc11HNxg9IwUVMxXM7+Z3cE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id CA0EE3990437 for ; Thu, 3 Jun 2021 23:17:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA0EE3990437 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-4odTp6ATPOaMqVyE6j_NgQ-1; Thu, 03 Jun 2021 19:17:39 -0400 X-MC-Unique: 4odTp6ATPOaMqVyE6j_NgQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDA79801817 for ; Thu, 3 Jun 2021 23:17:38 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 651CF60BD8 for ; Thu, 3 Jun 2021 23:17:37 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 32/35] Linux: Move timer_getoverrun from librt to libc In-Reply-To: References: X-From-Line: 344dd871b30ad2fbb29a61f8f6fdf654b1fc02a1 Mon Sep 17 00:00:00 2001 Message-Id: <344dd871b30ad2fbb29a61f8f6fdf654b1fc02a1.1622761829.git.fweimer@redhat.com> Date: Fri, 04 Jun 2021 01:17:35 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The symbol was moved using scripts/move-symbol-to-libc.py. The way the ABI intransition is implemented is changed with this commit: the implementation is now consolidated in one file with a TIMER_T_WAS_INT_COMPAT check. --- rt/Makefile | 2 +- rt/Versions | 4 +- sysdeps/unix/sysv/linux/Versions | 1 + sysdeps/unix/sysv/linux/aarch64/libc.abilist | 2 + sysdeps/unix/sysv/linux/aarch64/librt.abilist | 1 - sysdeps/unix/sysv/linux/alpha/Versions | 2 +- sysdeps/unix/sysv/linux/alpha/libc.abilist | 3 ++ sysdeps/unix/sysv/linux/alpha/librt.abilist | 2 - .../unix/sysv/linux/alpha/timer_getoverr.c | 1 - sysdeps/unix/sysv/linux/arc/libc.abilist | 2 + sysdeps/unix/sysv/linux/arc/librt.abilist | 1 - sysdeps/unix/sysv/linux/arm/be/libc.abilist | 2 + sysdeps/unix/sysv/linux/arm/be/librt.abilist | 1 - sysdeps/unix/sysv/linux/arm/le/libc.abilist | 2 + sysdeps/unix/sysv/linux/arm/le/librt.abilist | 1 - sysdeps/unix/sysv/linux/csky/libc.abilist | 2 + sysdeps/unix/sysv/linux/csky/librt.abilist | 1 - sysdeps/unix/sysv/linux/hppa/libc.abilist | 2 + sysdeps/unix/sysv/linux/hppa/librt.abilist | 1 - sysdeps/unix/sysv/linux/i386/libc.abilist | 2 + sysdeps/unix/sysv/linux/i386/librt.abilist | 1 - sysdeps/unix/sysv/linux/ia64/Versions | 2 +- sysdeps/unix/sysv/linux/ia64/libc.abilist | 3 ++ sysdeps/unix/sysv/linux/ia64/librt.abilist | 2 - sysdeps/unix/sysv/linux/ia64/timer_getoverr.c | 1 - sysdeps/unix/sysv/linux/kernel-posix-timers.h | 2 + .../sysv/linux/m68k/coldfire/libc.abilist | 2 + .../sysv/linux/m68k/coldfire/librt.abilist | 1 - .../unix/sysv/linux/m68k/m680x0/libc.abilist | 2 + .../unix/sysv/linux/m68k/m680x0/librt.abilist | 1 - .../sysv/linux/microblaze/be/libc.abilist | 2 + .../sysv/linux/microblaze/be/librt.abilist | 1 - .../sysv/linux/microblaze/le/libc.abilist | 2 + .../sysv/linux/microblaze/le/librt.abilist | 1 - .../sysv/linux/mips/mips32/fpu/libc.abilist | 2 + .../unix/sysv/linux/mips/mips32/librt.abilist | 1 - .../sysv/linux/mips/mips32/nofpu/libc.abilist | 2 + .../unix/sysv/linux/mips/mips64/librt.abilist | 1 - .../sysv/linux/mips/mips64/n32/libc.abilist | 2 + .../sysv/linux/mips/mips64/n64/libc.abilist | 2 + sysdeps/unix/sysv/linux/nios2/libc.abilist | 2 + sysdeps/unix/sysv/linux/nios2/librt.abilist | 1 - .../linux/powerpc/powerpc32/fpu/libc.abilist | 2 + .../linux/powerpc/powerpc32/librt.abilist | 1 - .../powerpc/powerpc32/nofpu/libc.abilist | 2 + .../sysv/linux/powerpc/powerpc64/Versions | 2 +- .../linux/powerpc/powerpc64/be/libc.abilist | 3 ++ .../linux/powerpc/powerpc64/be/librt.abilist | 2 - .../linux/powerpc/powerpc64/le/libc.abilist | 2 + .../linux/powerpc/powerpc64/le/librt.abilist | 1 - .../linux/powerpc/powerpc64/timer_getoverr.c | 1 - .../unix/sysv/linux/riscv/rv32/libc.abilist | 2 + .../unix/sysv/linux/riscv/rv32/librt.abilist | 1 - .../unix/sysv/linux/riscv/rv64/libc.abilist | 2 + .../unix/sysv/linux/riscv/rv64/librt.abilist | 1 - .../unix/sysv/linux/s390/s390-32/libc.abilist | 2 + .../sysv/linux/s390/s390-32/librt.abilist | 1 - sysdeps/unix/sysv/linux/s390/s390-64/Versions | 2 +- .../unix/sysv/linux/s390/s390-64/libc.abilist | 3 ++ .../sysv/linux/s390/s390-64/librt.abilist | 2 - .../sysv/linux/s390/s390-64/timer_getoverr.c | 1 - sysdeps/unix/sysv/linux/sh/be/libc.abilist | 2 + sysdeps/unix/sysv/linux/sh/be/librt.abilist | 1 - sysdeps/unix/sysv/linux/sh/le/libc.abilist | 2 + sysdeps/unix/sysv/linux/sh/le/librt.abilist | 1 - .../sysv/linux/sparc/sparc32/libc.abilist | 2 + .../sysv/linux/sparc/sparc32/librt.abilist | 1 - .../unix/sysv/linux/sparc/sparc64/Versions | 2 +- .../sysv/linux/sparc/sparc64/libc.abilist | 3 ++ .../sysv/linux/sparc/sparc64/librt.abilist | 2 - .../sysv/linux/sparc/sparc64/timer_getoverr.c | 1 - sysdeps/unix/sysv/linux/timer_getoverr.c | 32 ++++++++++++---- .../unix/sysv/linux/x86_64/64/libc.abilist | 3 ++ .../unix/sysv/linux/x86_64/64/librt.abilist | 2 - sysdeps/unix/sysv/linux/x86_64/Versions | 2 +- .../unix/sysv/linux/x86_64/timer_getoverr.c | 38 ------------------- .../unix/sysv/linux/x86_64/x32/libc.abilist | 2 + .../unix/sysv/linux/x86_64/x32/librt.abilist | 1 - 78 files changed, 107 insertions(+), 94 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/ia64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c delete mode 100644 sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c diff --git a/rt/Makefile b/rt/Makefile index 2d0ad75f69..2c386da431 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,7 +30,6 @@ routines = \ librt-routines = \ librt-compat \ - timer_getoverr \ timer_gettime \ timer_settime \ @@ -63,6 +62,7 @@ $(librt-routines-var) += \ mq_unlink \ timer_create \ timer_delete \ + timer_getoverr \ tests := tst-shm tst-timer tst-timer2 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ diff --git a/rt/Versions b/rt/Versions index fca804148c..de78be15dc 100644 --- a/rt/Versions +++ b/rt/Versions @@ -24,6 +24,7 @@ libc { %if PTHREAD_IN_LIBC timer_create; timer_delete; + timer_getoverrun; %endif shm_open; shm_unlink; @@ -85,6 +86,7 @@ libc { mq_unlink; timer_create; timer_delete; + timer_getoverrun; %endif shm_open; shm_unlink; @@ -131,8 +133,8 @@ librt { %if !PTHREAD_IN_LIBC timer_create; timer_delete; -%endif timer_getoverrun; +%endif timer_gettime; timer_settime; } diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 573415ef3b..af1cd38302 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -124,6 +124,7 @@ libc { # Changed timer_t. Only used by some 64-bit targets. timer_create; timer_delete; + timer_getoverrun; } GLIBC_2.3.4 { sched_getaffinity; sched_setaffinity; diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index c4b0749b3f..07e7aa7cb7 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -2008,6 +2008,7 @@ GLIBC_2.17 timegm F GLIBC_2.17 timelocal F GLIBC_2.17 timer_create F GLIBC_2.17 timer_delete F +GLIBC_2.17 timer_getoverrun F GLIBC_2.17 timerfd_create F GLIBC_2.17 timerfd_gettime F GLIBC_2.17 timerfd_settime F @@ -2531,6 +2532,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/aarch64/librt.abilist b/sysdeps/unix/sysv/linux/aarch64/librt.abilist index 34768d1472..493768f440 100644 --- a/sysdeps/unix/sysv/linux/aarch64/librt.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.17 timer_getoverrun F GLIBC_2.17 timer_gettime F GLIBC_2.17 timer_settime F diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions index d4bd056f64..dd5b365d77 100644 --- a/sysdeps/unix/sysv/linux/alpha/Versions +++ b/sysdeps/unix/sysv/linux/alpha/Versions @@ -104,7 +104,7 @@ librt { } GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 3b1b10870c..44dfa719d1 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2095,6 +2095,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 vfwprintf F GLIBC_2.2 vfwscanf F @@ -2357,6 +2358,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F +GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.4 _OtsAddX F GLIBC_2.3.4 _OtsConvertFloatTX F GLIBC_2.3.4 _OtsConvertFloatXT F @@ -2627,6 +2629,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/alpha/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist index 3b744cf5a1..34d42d122b 100644 --- a/sysdeps/unix/sysv/linux/alpha/librt.abilist +++ b/sysdeps/unix/sysv/linux/alpha/librt.abilist @@ -1,9 +1,7 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3 __librt_version_placeholder F -GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c b/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index f3b60500e8..af6b26565d 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1942,6 +1942,7 @@ GLIBC_2.32 timegm F GLIBC_2.32 timelocal F GLIBC_2.32 timer_create F GLIBC_2.32 timer_delete F +GLIBC_2.32 timer_getoverrun F GLIBC_2.32 timerfd_create F GLIBC_2.32 timerfd_gettime F GLIBC_2.32 timerfd_settime F @@ -2290,6 +2291,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist index 7bc7c57bf0..14ae3d7c65 100644 --- a/sysdeps/unix/sysv/linux/arc/librt.abilist +++ b/sysdeps/unix/sysv/linux/arc/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.32 timer_getoverrun F GLIBC_2.32 timer_gettime F GLIBC_2.32 timer_settime F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index e50811516d..0792cf7e31 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -355,6 +355,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F @@ -2273,6 +2274,7 @@ GLIBC_2.4 timegm F GLIBC_2.4 timelocal F GLIBC_2.4 timer_create F GLIBC_2.4 timer_delete F +GLIBC_2.4 timer_getoverrun F GLIBC_2.4 times F GLIBC_2.4 timezone D 0x4 GLIBC_2.4 tmpfile F diff --git a/sysdeps/unix/sysv/linux/arm/be/librt.abilist b/sysdeps/unix/sysv/linux/arm/be/librt.abilist index f9c27d7913..b4895847aa 100644 --- a/sysdeps/unix/sysv/linux/arm/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/librt.abilist @@ -1,4 +1,3 @@ -GLIBC_2.4 timer_getoverrun F GLIBC_2.4 timer_gettime F GLIBC_2.4 timer_settime F GLIBC_2.7 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index 22793bf139..efface2982 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -352,6 +352,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F @@ -2270,6 +2271,7 @@ GLIBC_2.4 timegm F GLIBC_2.4 timelocal F GLIBC_2.4 timer_create F GLIBC_2.4 timer_delete F +GLIBC_2.4 timer_getoverrun F GLIBC_2.4 times F GLIBC_2.4 timezone D 0x4 GLIBC_2.4 tmpfile F diff --git a/sysdeps/unix/sysv/linux/arm/le/librt.abilist b/sysdeps/unix/sysv/linux/arm/le/librt.abilist index f9c27d7913..b4895847aa 100644 --- a/sysdeps/unix/sysv/linux/arm/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/librt.abilist @@ -1,4 +1,3 @@ -GLIBC_2.4 timer_getoverrun F GLIBC_2.4 timer_gettime F GLIBC_2.4 timer_settime F GLIBC_2.7 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist index 20c8d77ad1..bc37dc3577 100644 --- a/sysdeps/unix/sysv/linux/csky/libc.abilist +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist @@ -2032,6 +2032,7 @@ GLIBC_2.29 timegm F GLIBC_2.29 timelocal F GLIBC_2.29 timer_create F GLIBC_2.29 timer_delete F +GLIBC_2.29 timer_getoverrun F GLIBC_2.29 timerfd_create F GLIBC_2.29 timerfd_gettime F GLIBC_2.29 timerfd_settime F @@ -2474,6 +2475,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/csky/librt.abilist b/sysdeps/unix/sysv/linux/csky/librt.abilist index 19de53f9ad..e1fdee6b16 100644 --- a/sysdeps/unix/sysv/linux/csky/librt.abilist +++ b/sysdeps/unix/sysv/linux/csky/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.29 timer_getoverrun F GLIBC_2.29 timer_gettime F GLIBC_2.29 timer_settime F diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist index 5ec5d10912..fddc79b9c5 100644 --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist @@ -1746,6 +1746,7 @@ GLIBC_2.2 timegm F GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x4 GLIBC_2.2 tmpfile F @@ -2427,6 +2428,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/hppa/librt.abilist b/sysdeps/unix/sysv/linux/hppa/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/hppa/librt.abilist +++ b/sysdeps/unix/sysv/linux/hppa/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index 231b2601a3..8db3a38d21 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -2108,6 +2108,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 versionsort64 F GLIBC_2.2 vfwprintf F @@ -2611,6 +2612,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/i386/librt.abilist b/sysdeps/unix/sysv/linux/i386/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/i386/librt.abilist +++ b/sysdeps/unix/sysv/linux/i386/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions index 29b0d98cc6..1d09fca7e3 100644 --- a/sysdeps/unix/sysv/linux/ia64/Versions +++ b/sysdeps/unix/sysv/linux/ia64/Versions @@ -30,7 +30,7 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index 6673c5f715..c9cd0370c5 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -1767,6 +1767,7 @@ GLIBC_2.2 timegm F GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x8 GLIBC_2.2 tmpfile F @@ -2222,6 +2223,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F +GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2465,6 +2467,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/ia64/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist index 74a4971070..c56040a5f9 100644 --- a/sysdeps/unix/sysv/linux/ia64/librt.abilist +++ b/sysdeps/unix/sysv/linux/ia64/librt.abilist @@ -1,8 +1,6 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/ia64/timer_getoverr.c b/sysdeps/unix/sysv/linux/ia64/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/kernel-posix-timers.h b/sysdeps/unix/sysv/linux/kernel-posix-timers.h index 99a2937458..a976b028e0 100644 --- a/sysdeps/unix/sysv/linux/kernel-posix-timers.h +++ b/sysdeps/unix/sysv/linux/kernel-posix-timers.h @@ -52,6 +52,8 @@ extern __typeof (timer_create) __timer_create; libc_hidden_proto (__timer_create) extern __typeof (timer_delete) __timer_delete; libc_hidden_proto (__timer_delete) +extern __typeof (timer_getoverrun) __timer_getoverrun; +libc_hidden_proto (__timer_getoverrun) /* Type of timers in the kernel. */ typedef int kernel_timer_t; diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 5a614614ff..d88486ac21 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -356,6 +356,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F @@ -2253,6 +2254,7 @@ GLIBC_2.4 timegm F GLIBC_2.4 timelocal F GLIBC_2.4 timer_create F GLIBC_2.4 timer_delete F +GLIBC_2.4 timer_getoverrun F GLIBC_2.4 times F GLIBC_2.4 timezone D 0x4 GLIBC_2.4 tmpfile F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist index f9c27d7913..b4895847aa 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist @@ -1,4 +1,3 @@ -GLIBC_2.4 timer_getoverrun F GLIBC_2.4 timer_gettime F GLIBC_2.4 timer_settime F GLIBC_2.7 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index f535986d22..3ed327327c 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -2064,6 +2064,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 versionsort64 F GLIBC_2.2 vfwprintf F @@ -2554,6 +2555,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist index b388529f33..8645e96419 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist @@ -2012,6 +2012,7 @@ GLIBC_2.18 timegm F GLIBC_2.18 timelocal F GLIBC_2.18 timer_create F GLIBC_2.18 timer_delete F +GLIBC_2.18 timer_getoverrun F GLIBC_2.18 timerfd_create F GLIBC_2.18 timerfd_gettime F GLIBC_2.18 timerfd_settime F @@ -2525,6 +2526,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist index 2a70b5df18..f32831ffaf 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.18 timer_getoverrun F GLIBC_2.18 timer_gettime F GLIBC_2.18 timer_settime F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist index e7a54683bd..c3e9839ef8 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist @@ -2012,6 +2012,7 @@ GLIBC_2.18 timegm F GLIBC_2.18 timelocal F GLIBC_2.18 timer_create F GLIBC_2.18 timer_delete F +GLIBC_2.18 timer_getoverrun F GLIBC_2.18 timerfd_create F GLIBC_2.18 timerfd_gettime F GLIBC_2.18 timerfd_settime F @@ -2522,6 +2523,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist index 2a70b5df18..f32831ffaf 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.18 timer_getoverrun F GLIBC_2.18 timer_gettime F GLIBC_2.18 timer_settime F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index f626859e72..ee96a63a6e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -1995,6 +1995,7 @@ GLIBC_2.2 tcgetsid F GLIBC_2.2 tdestroy F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 tmpfile F GLIBC_2.2 tmpfile64 F GLIBC_2.2 truncate64 F @@ -2519,6 +2520,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist index 00fd77bbab..a92565949e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist @@ -1,4 +1,3 @@ -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 2857d72362..91ed2f20bb 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -1993,6 +1993,7 @@ GLIBC_2.2 tcgetsid F GLIBC_2.2 tdestroy F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 tmpfile F GLIBC_2.2 tmpfile64 F GLIBC_2.2 truncate64 F @@ -2517,6 +2518,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/librt.abilist index 00fd77bbab..a92565949e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/librt.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/librt.abilist @@ -1,4 +1,3 @@ -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index d69903a236..75f1c4eac0 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -1991,6 +1991,7 @@ GLIBC_2.2 tcgetsid F GLIBC_2.2 tdestroy F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 tmpfile F GLIBC_2.2 tmpfile64 F GLIBC_2.2 truncate64 F @@ -2525,6 +2526,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index cea7a13c44..e9710b4079 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -1987,6 +1987,7 @@ GLIBC_2.2 tcgetsid F GLIBC_2.2 tdestroy F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 tmpfile F GLIBC_2.2 tmpfile64 F GLIBC_2.2 truncate64 F @@ -2519,6 +2520,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist index fc8f4b2a34..a8d3150c9f 100644 --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist @@ -2054,6 +2054,7 @@ GLIBC_2.21 timegm F GLIBC_2.21 timelocal F GLIBC_2.21 timer_create F GLIBC_2.21 timer_delete F +GLIBC_2.21 timer_getoverrun F GLIBC_2.21 timerfd_create F GLIBC_2.21 timerfd_gettime F GLIBC_2.21 timerfd_settime F @@ -2564,6 +2565,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/nios2/librt.abilist b/sysdeps/unix/sysv/linux/nios2/librt.abilist index 926b8661b7..d874b0cfee 100644 --- a/sysdeps/unix/sysv/linux/nios2/librt.abilist +++ b/sysdeps/unix/sysv/linux/nios2/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.21 timer_getoverrun F GLIBC_2.21 timer_gettime F GLIBC_2.21 timer_settime F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist index 3a3453029b..7a91e15100 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist @@ -2069,6 +2069,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 vfwprintf F GLIBC_2.2 vfwscanf F @@ -2581,6 +2582,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist index 2ba21f757a..948c535117 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist @@ -2073,6 +2073,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 vfwprintf F GLIBC_2.2 vfwscanf F @@ -2614,6 +2615,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions index 4eb22c11ac..a69927d41d 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions @@ -29,7 +29,7 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 66694044a4..71b1ccd398 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -1888,6 +1888,7 @@ GLIBC_2.3 timegm F GLIBC_2.3 timelocal F GLIBC_2.3 timer_create F GLIBC_2.3 timer_delete F +GLIBC_2.3 timer_getoverrun F GLIBC_2.3 times F GLIBC_2.3 timezone D 0x8 GLIBC_2.3 tmpfile F @@ -2166,6 +2167,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F +GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2429,6 +2431,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist index 914203b043..dd8b2ad6ef 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist @@ -1,7 +1,5 @@ -GLIBC_2.3 timer_getoverrun F GLIBC_2.3 timer_gettime F GLIBC_2.3 timer_settime F -GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 7ca6196a98..e32bd31860 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -2096,6 +2096,7 @@ GLIBC_2.17 timegm F GLIBC_2.17 timelocal F GLIBC_2.17 timer_create F GLIBC_2.17 timer_delete F +GLIBC_2.17 timer_getoverrun F GLIBC_2.17 timerfd_create F GLIBC_2.17 timerfd_gettime F GLIBC_2.17 timerfd_settime F @@ -2727,6 +2728,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist index 34768d1472..493768f440 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.17 timer_getoverrun F GLIBC_2.17 timer_gettime F GLIBC_2.17 timer_settime F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist index bef6b3bffe..c9f803d38c 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist @@ -1952,6 +1952,7 @@ GLIBC_2.33 timegm F GLIBC_2.33 timelocal F GLIBC_2.33 timer_create F GLIBC_2.33 timer_delete F +GLIBC_2.33 timer_getoverrun F GLIBC_2.33 timerfd_create F GLIBC_2.33 timerfd_gettime F GLIBC_2.33 timerfd_settime F @@ -2292,6 +2293,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist index 09bbee0960..de338094e1 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.33 timer_getoverrun F GLIBC_2.33 timer_gettime F GLIBC_2.33 timer_settime F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist index 16c290c4e4..86f2c9c940 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist @@ -2018,6 +2018,7 @@ GLIBC_2.27 timegm F GLIBC_2.27 timelocal F GLIBC_2.27 timer_create F GLIBC_2.27 timer_delete F +GLIBC_2.27 timer_getoverrun F GLIBC_2.27 timerfd_create F GLIBC_2.27 timerfd_gettime F GLIBC_2.27 timerfd_settime F @@ -2492,6 +2493,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist index 8e1d8b21fe..624ab969d8 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.27 timer_getoverrun F GLIBC_2.27 timer_gettime F GLIBC_2.27 timer_settime F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 74afe6a900..18bda14ede 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -2067,6 +2067,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 versionsort64 F GLIBC_2.2 vfwprintf F @@ -2579,6 +2580,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Versions b/sysdeps/unix/sysv/linux/s390/s390-64/Versions index 5989ac75a9..e7f968fcdf 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/Versions +++ b/sysdeps/unix/sysv/linux/s390/s390-64/Versions @@ -9,7 +9,7 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index 30cc1dc7c9..fcf90947ab 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -1763,6 +1763,7 @@ GLIBC_2.2 timegm F GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x8 GLIBC_2.2 tmpfile F @@ -2212,6 +2213,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F +GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2466,6 +2468,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist index 34e8d31133..35dc39d27d 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist @@ -1,7 +1,5 @@ -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c b/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/sysdeps/unix/sysv/linux/s390/s390-64/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist index c14ecf0792..de7372052a 100644 --- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist @@ -1750,6 +1750,7 @@ GLIBC_2.2 timegm F GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x4 GLIBC_2.2 tmpfile F @@ -2434,6 +2435,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/sh/be/librt.abilist b/sysdeps/unix/sysv/linux/sh/be/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/sh/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/sh/be/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist index 8a8cd2fbf3..65fe13865a 100644 --- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist @@ -1750,6 +1750,7 @@ GLIBC_2.2 timegm F GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x4 GLIBC_2.2 tmpfile F @@ -2431,6 +2432,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/sh/le/librt.abilist b/sysdeps/unix/sysv/linux/sh/le/librt.abilist index 421fa4f34b..22e5dd0ec9 100644 --- a/sysdeps/unix/sysv/linux/sh/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/sh/le/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index b4c7658329..36b056d6b1 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -2062,6 +2062,7 @@ GLIBC_2.2 swprintf F GLIBC_2.2 swscanf F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 ungetwc F GLIBC_2.2 vfwprintf F GLIBC_2.2 vfwscanf F @@ -2574,6 +2575,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist index 2db0b41152..b0c70d8b2a 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions index 358081399a..d04738fafc 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions @@ -14,7 +14,7 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index d67359a267..2a69656050 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -1793,6 +1793,7 @@ GLIBC_2.2 timegm F GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F +GLIBC_2.2 timer_getoverrun F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x8 GLIBC_2.2 tmpfile F @@ -2246,6 +2247,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F +GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2488,6 +2490,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist index 3b744cf5a1..34d42d122b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist @@ -1,9 +1,7 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3 __librt_version_placeholder F -GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/timer_getoverr.c b/sysdeps/unix/sysv/linux/timer_getoverr.c index b997290768..accec3757d 100644 --- a/sysdeps/unix/sysv/linux/timer_getoverr.c +++ b/sysdeps/unix/sysv/linux/timer_getoverr.c @@ -20,17 +20,33 @@ #include #include #include - - -#ifdef timer_getoverrun_alias -# define timer_getoverrun timer_getoverrun_alias -#endif - +#include int -timer_getoverrun (timer_t timerid) +___timer_getoverrun (timer_t timerid) { -#undef timer_getoverrun kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid); return INLINE_SYSCALL_CALL (timer_getoverrun, ktimerid); } +versioned_symbol (libc, ___timer_getoverrun, timer_getoverrun, GLIBC_2_34); +libc_hidden_ver (___timer_getoverrun, __timer_getoverrun) + +#if TIMER_T_WAS_INT_COMPAT +# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3_3, GLIBC_2_34) +compat_symbol (librt, ___timer_getoverrun, timer_getoverrun, GLIBC_2_3_3); +# endif + +# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) +int +__timer_getoverrun_old (int timerid) +{ + return __timer_getoverrun (__timer_compat_list[timerid]); +} +compat_symbol (librt, __timer_getoverrun_old, timer_getoverrun, GLIBC_2_2); +# endif /* OTHER_SHLIB_COMPAT */ + +#else /* !TIMER_T_WAS_INT_COMPAT */ +# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34) +compat_symbol (librt, ___timer_getoverrun, timer_getoverrun, GLIBC_2_2); +# endif +#endif /* !TIMER_T_WAS_INT_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 2af1d79de7..0fc491c64d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -1762,6 +1762,7 @@ GLIBC_2.2.5 timegm F GLIBC_2.2.5 timelocal F GLIBC_2.2.5 timer_create F GLIBC_2.2.5 timer_delete F +GLIBC_2.2.5 timer_getoverrun F GLIBC_2.2.5 times F GLIBC_2.2.5 timezone D 0x8 GLIBC_2.2.5 tmpfile F @@ -2200,6 +2201,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F +GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2444,6 +2446,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist index 13a2bf2022..379fa6930c 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/librt.abilist @@ -1,7 +1,5 @@ -GLIBC_2.2.5 timer_getoverrun F GLIBC_2.2.5 timer_gettime F GLIBC_2.2.5 timer_settime F -GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/x86_64/Versions b/sysdeps/unix/sysv/linux/x86_64/Versions index c4d1c5fb79..a97b6c7413 100644 --- a/sysdeps/unix/sysv/linux/x86_64/Versions +++ b/sysdeps/unix/sysv/linux/x86_64/Versions @@ -11,7 +11,7 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c b/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c deleted file mode 100644 index fb6e631a00..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2003-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2003. - - 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; see the file COPYING.LIB. If - not, see . */ - -#include -#include "compat-timer.h" - - -#define timer_getoverrun_alias __timer_getoverrun_new -#include - -#undef timer_getoverrun -versioned_symbol (librt, __timer_getoverrun_new, timer_getoverrun, - GLIBC_2_3_3); - - -#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3) -int -__timer_getoverrun_old (int timerid) -{ - return __timer_getoverrun_new (__timer_compat_list[timerid]); -} -compat_symbol (librt, __timer_getoverrun_old, timer_getoverrun, GLIBC_2_2); -#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist index c2e52cf10a..a2d178081e 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist @@ -2013,6 +2013,7 @@ GLIBC_2.16 timegm F GLIBC_2.16 timelocal F GLIBC_2.16 timer_create F GLIBC_2.16 timer_delete F +GLIBC_2.16 timer_getoverrun F GLIBC_2.16 timerfd_create F GLIBC_2.16 timerfd_gettime F GLIBC_2.16 timerfd_settime F @@ -2546,6 +2547,7 @@ GLIBC_2.34 thrd_exit F GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F +GLIBC_2.34 timer_getoverrun F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist index 4b3e816fdd..0b969910ba 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.16 timer_getoverrun F GLIBC_2.16 timer_gettime F GLIBC_2.16 timer_settime F