diff options
author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:00 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:00 +0200 |
commit | df6d227e69082c5cab33b60aa676aebf08b7585e (patch) | |
tree | 691811c64b55d6705a433064beee645ac61c386c /sysdeps/unix/sysv/linux/x86_64 | |
parent | 273a2a2ae8b097672cdc8e9888548b134955af42 (diff) | |
download | glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar.gz glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar.xz glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.zip |
Linux: Move timer_getoverrun from librt to libc
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. Reviewed-by: Adhemerva Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/librt.abilist | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/Versions | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c | 38 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist | 1 |
6 files changed, 6 insertions, 42 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index 377d35a04f..92f4369765 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 @@ -2446,6 +2448,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 <drepper@redhat.com>, 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 <https://www.gnu.org/licenses/>. */ - -#include <shlib-compat.h> -#include "compat-timer.h" - - -#define timer_getoverrun_alias __timer_getoverrun_new -#include <sysdeps/unix/sysv/linux/timer_getoverr.c> - -#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 620f35836c..25b177fda0 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 @@ -2548,6 +2549,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 |