From 273a2a2ae8b097672cdc8e9888548b134955af42 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 28 Jun 2021 09:51:00 +0200 Subject: Linux: Move timer_create, timer_delete from librt to libc The symbols were moved using scripts/move-symbol-to-libc.py. timer_create and timer_delete are tied together via the int/timer_t compatibility code. 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: Adhemerval Zanella --- sysdeps/unix/sysv/linux/sparc/sparc64/Versions | 2 +- sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 6 ++++++ sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist | 4 ---- sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c | 1 - sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c (limited to 'sysdeps/unix/sysv/linux/sparc/sparc64') diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions index 33b6779ec5..358081399a 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_create; timer_delete; timer_getoverrun; timer_gettime; + timer_getoverrun; 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 a6dc7f2e40..6ee552611b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -1791,6 +1791,8 @@ GLIBC_2.2 tfind F GLIBC_2.2 time F 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 times F GLIBC_2.2 timezone D 0x8 GLIBC_2.2 tmpfile F @@ -2242,6 +2244,8 @@ GLIBC_2.3.3 strtoll_l F GLIBC_2.3.3 strtoull_l F 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.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2484,6 +2488,8 @@ GLIBC_2.34 thrd_create F GLIBC_2.34 thrd_detach F 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 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 8592c90bdf..3b744cf5a1 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist @@ -1,12 +1,8 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_create F -GLIBC_2.2 timer_delete 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_create F -GLIBC_2.3.3 timer_delete F GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c deleted file mode 100644 index d307135003..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c deleted file mode 100644 index 2dd94f5c7a..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c +++ /dev/null @@ -1 +0,0 @@ -#include -- cgit 1.4.1