aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/ia64
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-28 09:51:00 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-28 09:51:00 +0200
commitdf6d227e69082c5cab33b60aa676aebf08b7585e (patch)
tree691811c64b55d6705a433064beee645ac61c386c /sysdeps/unix/sysv/linux/ia64
parent273a2a2ae8b097672cdc8e9888548b134955af42 (diff)
downloadglibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar
glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar.gz
glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar.bz2
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/ia64')
-rw-r--r--sysdeps/unix/sysv/linux/ia64/Versions2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/libc.abilist3
-rw-r--r--sysdeps/unix/sysv/linux/ia64/librt.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/timer_getoverr.c1
4 files changed, 4 insertions, 4 deletions
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 4cf1da5b62..984b58be61 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
@@ -2467,6 +2469,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 <sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>